diff --git a/pom.xml b/pom.xml index 8e9827b..6f79408 100644 --- a/pom.xml +++ b/pom.xml @@ -3,24 +3,24 @@ 4.0.0 cqframework.info qicore - 0.0.2-SNAPSHOT + 0.0.3 QI Core Interfaces and Adapters Java logical interfaces and corresponding HAPI FHIR implementation adapters for the FHIR QI Core profile set ca.uhn.hapi.fhir hapi-fhir-base - 2.2 + 3.7.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.2 + 3.7.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.2 + 3.7.0 ch.qos.logback diff --git a/src/main/java/org/cqf/qicore/dstu3/AdapterFactory.java b/src/main/java/org/cqf/qicore/dstu3/AdapterFactory.java index 959a47f..78e0c2e 100644 --- a/src/main/java/org/cqf/qicore/dstu3/AdapterFactory.java +++ b/src/main/java/org/cqf/qicore/dstu3/AdapterFactory.java @@ -1,5 +1,7 @@ package org.cqf.qicore.dstu3; +import ca.uhn.fhir.model.api.IResource; +import org.hl7.fhir.dstu3.model.Bundle; import org.slf4j.LoggerFactory; import java.util.List; @@ -14,9 +16,9 @@ public class AdapterFactory static public final Logger LOGGER = LoggerFactory .getLogger(AdapterFactory.class); - public static Map adapt(ca.uhn.fhir.model.api.Bundle bundle) { + public static Map adapt(org.hl7.fhir.dstu3.model.Bundle bundle) { Map> adapteeMap = new java.util.HashMap<>(); - for (ca.uhn.fhir.model.api.BundleEntry entry : bundle.getEntries()) { + for (Bundle.BundleEntryComponent entry : bundle.getEntry()) { Object adapter = adapt(entry.getResource()); if (adapter != null) { List list = adapteeMap.get(entry.getResource().getClass() @@ -32,11 +34,11 @@ public static Map adapt(ca.uhn.fhir.model.api.Bundle bundle) { return adapteeMap; } - public static Object adapt(ca.uhn.fhir.model.api.IResource resource) + public static Object adapt(org.hl7.fhir.dstu3.model.Resource resource) { Object adapter = null; - String adapterName = resource.getResourceName() + "Adapter"; - String resourceName = resource.getResourceName(); + String adapterName = resource.getResourceType().name() + "Adapter"; + String resourceName = resource.getResourceType().name(); try { Class clazz = Class.forName(GENERATED_PACKAGE_PREFIX + adapterName); @@ -55,4 +57,4 @@ public static Object adapt(ca.uhn.fhir.model.api.IResource resource) } return adapter; } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoreallergyintolerance.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoreallergyintolerance.java index 4d8db54..4f37d1b 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoreallergyintolerance.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoreallergyintolerance.java @@ -129,12 +129,8 @@ public Iqicoreallergyintolerance setCriticalityElement( public boolean hasCategory(); -// public boolean hasCategoryElement(); - public List> getCategory(); -// public Enumeration getCategoryElement(); - public Iqicoreallergyintolerance setCategory( List> param); @@ -255,4 +251,4 @@ public Iqicoreallergyintolerance setPatientAdapterTarget( public Iqicoreallergyintolerance setIdElement(IdType param); public Iqicoreallergyintolerance setId(String param); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicorecommunication.java b/src/main/java/org/cqf/qicore/dstu3/Iqicorecommunication.java index 849ed3d..343f068 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicorecommunication.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicorecommunication.java @@ -70,15 +70,15 @@ public qicorecommunicationAdapter addPayload( public Communication.CommunicationPayloadComponent addPayload(); - public List getReason(); + public List getReasonCode(); - public Iqicorecommunication setReason(List param); + public Iqicorecommunication setReasonCode(List param); - public boolean hasReason(); + public boolean hasReasonCode(); - public Iqicorecommunication addReason(CodeableConcept param); + public Iqicorecommunication addReasonCode(CodeableConcept param); - public CodeableConcept addReason(); + public CodeableConcept addReasonCode(); public List getNote(); @@ -115,7 +115,7 @@ public Iqicorecommunication setSubjectAdapterTarget( public boolean hasParent(); - public List getParent(); + public Reference getParent(); public CodeableConcept getReasonNotPerformed(); @@ -139,9 +139,9 @@ public Iqicorecommunication setStatus( public Iqicorecommunication setStatusElement( Enumeration param); - public CodeableConcept getCategory(); + public List getCategory(); - public Iqicorecommunication setCategory(CodeableConcept param); + public Iqicorecommunication setCategory(List param); public boolean hasCategory(); @@ -270,4 +270,4 @@ public Iqicorecommunication setSenderAdapterTarget( public boolean hasBasedOn(); public List getBasedOn(); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicorecommunicationrequest.java b/src/main/java/org/cqf/qicore/dstu3/Iqicorecommunicationrequest.java index e83e862..d62382e 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicorecommunicationrequest.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicorecommunicationrequest.java @@ -131,9 +131,9 @@ public qicorecommunicationrequestAdapter addPayload( public CommunicationRequest.CommunicationRequestPayloadComponent addPayload(); - public CodeableConcept getPriority(); + public CommunicationRequest.CommunicationPriority getPriority(); - public Iqicorecommunicationrequest setPriority(CodeableConcept param); + public Iqicorecommunicationrequest setPriority(CommunicationRequest.CommunicationPriority param); public boolean hasPriority(); @@ -200,9 +200,9 @@ public Iqicorecommunicationrequest setStatusElement( public Identifier addIdentifier(); - public CodeableConcept getCategory(); + public List getCategory(); - public Iqicorecommunicationrequest setCategory(CodeableConcept param); + public Iqicorecommunicationrequest setCategory(List param); public boolean hasCategory(); @@ -269,17 +269,17 @@ public Iqicorecommunicationrequest setSenderAdapterTarget( public Iqicorecommunicationrequest setSenderAdapterTarget( qicoreorganizationAdapter param); - public Type getScheduled(); + public Type getOccurrence(); - public Iqicorecommunicationrequest setScheduled(Type param); + public Iqicorecommunicationrequest setOccurrence(Type param); - public DateTimeType getScheduledDateTimeType(); + public DateTimeType getOccurrenceDateTimeType(); - public boolean hasScheduledDateTimeType(); + public boolean hasOccurrenceDateTimeType(); - public Period getScheduledPeriod(); + public Period getOccurrencePeriod(); - public boolean hasScheduledPeriod(); + public boolean hasOccurrencePeriod(); public boolean hasId(); @@ -293,13 +293,13 @@ public Iqicorecommunicationrequest setSenderAdapterTarget( public Iqicorecommunicationrequest setId(String param); - public List getReason(); + public List getReasonCode(); - public Iqicorecommunicationrequest setReason(List param); + public Iqicorecommunicationrequest setReasonCode(List param); - public boolean hasReason(); + public boolean hasReasonCode(); - public Iqicorecommunicationrequest addReason(CodeableConcept param); + public Iqicorecommunicationrequest addReasonCode(CodeableConcept param); public CodeableConcept addReason(); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicorecondition.java b/src/main/java/org/cqf/qicore/dstu3/Iqicorecondition.java index cae3e48..53eeba3 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicorecondition.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicorecondition.java @@ -26,7 +26,6 @@ import org.hl7.fhir.dstu3.model.Enumeration; import org.hl7.fhir.dstu3.model.Annotation; import org.hl7.fhir.dstu3.model.IdType; -import org.hl7.fhir.dstu3.model.DateType; import java.util.Date; @@ -255,11 +254,11 @@ public Iqicorecondition setClinicalStatusElement( public boolean hasAssertedDateElement(); - public DateType getAssertedDateElement(); + public DateTimeType getAssertedDateElement(); public Date getAssertedDate(); - public Iqicorecondition setAssertedDateElement(DateType param); + public Iqicorecondition setAssertedDateElement(DateTimeType param); public Iqicorecondition setAssertedDate(Date param); @@ -300,4 +299,4 @@ public Iqicorecondition setVerificationStatusElement( public StringType getOnsetStringType(); public boolean hasOnsetStringType(); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoredevice.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoredevice.java index 0f85148..f6d289c 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoredevice.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoredevice.java @@ -101,11 +101,11 @@ public interface Iqicoredevice public Identifier addIdentifier(); - public Identifier getUdiCarrier(); + public Device.DeviceUdiComponent getUdiCarrier(); - public Iqicoredevice setUdiCarrier(Identifier param); + public Iqicoredevice setUdiCarrier(Device.DeviceUdiComponent param); - public boolean hasUdiCarrier(); + public boolean hasUdi(); public boolean hasOwner(); @@ -161,13 +161,13 @@ public interface Iqicoredevice public boolean hasStatusElement(); - public Device.DeviceStatus getStatus(); + public Device.FHIRDeviceStatus getStatus(); - public Enumeration getStatusElement(); + public Enumeration getStatusElement(); - public Iqicoredevice setStatus(Device.DeviceStatus param); + public Iqicoredevice setStatus(Device.FHIRDeviceStatus param); - public Iqicoredevice setStatusElement(Enumeration param); + public Iqicoredevice setStatusElement(Enumeration param); public CodeableConcept getType(); @@ -228,4 +228,4 @@ public interface Iqicoredevice public Iqicoredevice addNote(Annotation param); public Annotation addNote(); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicorediagnosticreport.java b/src/main/java/org/cqf/qicore/dstu3/Iqicorediagnosticreport.java index 199ab8b..0b89cfa 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicorediagnosticreport.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicorediagnosticreport.java @@ -88,21 +88,6 @@ public qicorediagnosticreportAdapter addImage( public DiagnosticReport.DiagnosticReportImageComponent addImage(); - public boolean hasEncounter(); - - public Reference getEncounter(); - - public Iqicorediagnosticreport setEncounter(Reference param); - - public Encounter getEncounterTarget(); - - public Iqicorediagnosticreport setEncounterTarget(Encounter param); - - public qicoreencounterAdapter getEncounterAdapterTarget(); - - public Iqicorediagnosticreport setEncounterAdapterTarget( - qicoreencounterAdapter param); - public List getPresentedForm(); public Iqicorediagnosticreport setPresentedForm(List param); @@ -232,11 +217,9 @@ public Iqicorediagnosticreport setStatusElement( public boolean hasPerformer(); - public List getPerformerPractitionerTarget(); - - public List getPerformer(); + public List getPerformer(); - public List getPerformerOrganizationTarget(); + public Resource getContextTarget(); public boolean hasResult(); @@ -254,15 +237,21 @@ public Iqicorediagnosticreport setStatusElement( public Iqicorediagnosticreport setImplicitRules(String param); - public boolean hasRequest(); + public boolean hasBasedOn(); + + public List getBasedOnCarePlanTarget(); + + public List getBasedOn(); + + public List getBasedOnImmunizationRecommendationTarget(); - public List getRequestDiagnosticRequestTarget(); + public List getBasedOnMedicationRequestTarget(); - public List getRequest(); + public List getBasedOnNutritionOrderTarget(); - public List getRequestProcedureRequestTarget(); + public List getBasedOnProcedureRequestTarget(); - public List getRequestReferralRequestTarget(); + public List getBasedOnReferralRequestTarget(); public Type getEffective(); @@ -285,4 +274,4 @@ public Iqicorediagnosticreport setStatusElement( public Iqicorediagnosticreport addCodedDiagnosis(CodeableConcept param); public CodeableConcept addCodedDiagnosis(); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicorediagnosticrequest.java b/src/main/java/org/cqf/qicore/dstu3/Iqicorediagnosticrequest.java deleted file mode 100644 index 4c84190..0000000 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicorediagnosticrequest.java +++ /dev/null @@ -1,309 +0,0 @@ -package org.cqf.qicore.dstu3; - -import org.hl7.fhir.dstu3.model.DiagnosticRequest; -import org.hl7.fhir.dstu3.model.DiagnosticRequest.DiagnosticRequestIntent; -import org.hl7.fhir.dstu3.model.*; - -import java.util.List; - -import org.hl7.fhir.dstu3.model.CodeableConcept; -import org.hl7.fhir.dstu3.model.Reference; -import org.hl7.fhir.dstu3.model.Resource; -import org.hl7.fhir.dstu3.model.Patient; -import org.hl7.fhir.dstu3.model.Group; -import org.hl7.fhir.dstu3.model.Location; -import org.hl7.fhir.dstu3.model.Device; -import org.hl7.fhir.dstu3.model.Annotation; -import org.hl7.fhir.dstu3.model.IdType; - -import java.lang.String; - -import org.hl7.fhir.dstu3.model.Encounter; -import org.hl7.fhir.dstu3.model.Identifier; -import org.hl7.fhir.dstu3.model.Practitioner; -import org.hl7.fhir.dstu3.model.Organization; -import org.hl7.fhir.dstu3.model.RelatedPerson; -import org.hl7.fhir.dstu3.model.CodeType; -import org.hl7.fhir.dstu3.model.Type; -import org.hl7.fhir.dstu3.model.DateTimeType; -import org.hl7.fhir.dstu3.model.Period; -import org.hl7.fhir.dstu3.model.Timing; -import org.hl7.fhir.dstu3.model.UriType; -import org.hl7.fhir.dstu3.model.Enumeration; - -public interface Iqicorediagnosticrequest -{ - - public DiagnosticRequest getAdaptee(); - - public void setAdaptee(DiagnosticRequest param); - - public CodeableConcept getPerformerType(); - - public Iqicorediagnosticrequest setPerformerType(CodeableConcept param); - - public boolean hasPerformerType(); - - public Reference getSubject(); - - public Resource getSubjectTarget(); - - public boolean hasSubject(); - - public Reference getSubjectPatient(); - - public Iqicorediagnosticrequest setSubject(Reference param); - - public Patient getSubjectPatientTarget(); - - public Iqicorediagnosticrequest setSubjectTarget(Patient param); - - public qicorepatientAdapter getSubjectPatientAdapterTarget(); - - public Iqicorediagnosticrequest setSubjectAdapterTarget( - qicorepatientAdapter param); - - public Reference getSubjectGroup(); - - public Group getSubjectGroupTarget(); - - public Iqicorediagnosticrequest setSubjectTarget(Group param); - - public Reference getSubjectLocation(); - - public Location getSubjectLocationTarget(); - - public Iqicorediagnosticrequest setSubjectTarget(Location param); - - public qicorelocationAdapter getSubjectLocationAdapterTarget(); - - public Iqicorediagnosticrequest setSubjectAdapterTarget( - qicorelocationAdapter param); - - public Reference getSubjectDevice(); - - public Device getSubjectDeviceTarget(); - - public Iqicorediagnosticrequest setSubjectTarget(Device param); - - public qicoredeviceAdapter getSubjectDeviceAdapterTarget(); - - public Iqicorediagnosticrequest setSubjectAdapterTarget( - qicoredeviceAdapter param); - - public List getNote(); - - public Iqicorediagnosticrequest setNote(List param); - - public boolean hasNote(); - - public Iqicorediagnosticrequest addNote(Annotation param); - - public Annotation addNote(); - - public CodeableConcept getCode(); - - public Iqicorediagnosticrequest setCode(CodeableConcept param); - - public boolean hasCode(); - - public boolean hasRelevantHistory(); - - public List getRelevantHistory(); - - public List getReasonCode(); - - public Iqicorediagnosticrequest setReasonCode(List param); - - public boolean hasReasonCode(); - - public Iqicorediagnosticrequest addReasonCode(CodeableConcept param); - - public CodeableConcept addReasonCode(); - - public boolean hasId(); - - public boolean hasIdElement(); - - public IdType getIdElement(); - - public String getId(); - - public Iqicorediagnosticrequest setIdElement(IdType param); - - public Iqicorediagnosticrequest setId(String param); - - public boolean hasContext(); - - public Reference getContext(); - - public Iqicorediagnosticrequest setContext(Reference param); - - public Encounter getContextTarget(); - - public Iqicorediagnosticrequest setContextTarget(Encounter param); - - public qicoreencounterAdapter getContextAdapterTarget(); - - public Iqicorediagnosticrequest setContextAdapterTarget( - qicoreencounterAdapter param); - - public List getIdentifier(); - - public Iqicorediagnosticrequest setIdentifier(List param); - - public boolean hasIdentifier(); - - public Iqicorediagnosticrequest addIdentifier(Identifier param); - - public Identifier addIdentifier(); - - public Reference getPerformer(); - - public Resource getPerformerTarget(); - - public boolean hasPerformer(); - - public Reference getPerformerPractitioner(); - - public Iqicorediagnosticrequest setPerformer(Reference param); - - public Practitioner getPerformerPractitionerTarget(); - - public Iqicorediagnosticrequest setPerformerTarget(Practitioner param); - - public Reference getPerformerOrganization(); - - public Organization getPerformerOrganizationTarget(); - - public Iqicorediagnosticrequest setPerformerTarget(Organization param); - - public Reference getPerformerPatient(); - - public Patient getPerformerPatientTarget(); - - public Iqicorediagnosticrequest setPerformerTarget(Patient param); - - public Reference getPerformerDevice(); - - public Device getPerformerDeviceTarget(); - - public Iqicorediagnosticrequest setPerformerTarget(Device param); - - public Reference getPerformerRelatedPerson(); - - public RelatedPerson getPerformerRelatedPersonTarget(); - - public Iqicorediagnosticrequest setPerformerTarget(RelatedPerson param); - - public Enumeration getIntentElement(); - - public Iqicorediagnosticrequest setIntentElement(Enumeration param); - - public boolean hasIntent(); - - public Identifier getRequisition(); - - public Iqicorediagnosticrequest setRequisition(Identifier param); - - public boolean hasRequisition(); - - public boolean hasLanguage(); - - public boolean hasLanguageElement(); - - public CodeType getLanguageElement(); - - public String getLanguage(); - - public Iqicorediagnosticrequest setLanguageElement(CodeType param); - - public Iqicorediagnosticrequest setLanguage(String param); - - public boolean hasRequester(); - - public Reference getRequester(); - - public Iqicorediagnosticrequest setRequester(Reference param); - - public Practitioner getRequesterTarget(); - - public Iqicorediagnosticrequest setRequesterTarget(Practitioner param); - - public qicorepractitionerAdapter getRequesterAdapterTarget(); - - public Iqicorediagnosticrequest setRequesterAdapterTarget( - qicorepractitionerAdapter param); - - public boolean hasReplaces(); - - public List getReplaces(); - - public boolean hasBasedOn(); - - public List getBasedOn(); - - public boolean hasDefinition(); - - public List getDefinition(); - - public Type getOccurrence(); - - public Iqicorediagnosticrequest setOccurrence(Type param); - - public DateTimeType getOccurrenceDateTimeType(); - - public boolean hasOccurrenceDateTimeType(); - - public Period getOccurrencePeriod(); - - public boolean hasOccurrencePeriod(); - - public Timing getOccurrenceTiming(); - - public boolean hasOccurrenceTiming(); - - public boolean hasImplicitRules(); - - public boolean hasImplicitRulesElement(); - - public UriType getImplicitRulesElement(); - - public String getImplicitRules(); - - public Iqicorediagnosticrequest setImplicitRulesElement(UriType param); - - public Iqicorediagnosticrequest setImplicitRules(String param); - - public boolean hasSupportingInformation(); - - public List getSupportingInformationObservationTarget(); - - public List getSupportingInformation(); - - public List getSupportingInformationConditionTarget(); - - public List getSupportingInformationDocumentReferenceTarget(); - - public List getContained(); - - public Iqicorediagnosticrequest setContained(List param); - - public boolean hasContained(); - - public Iqicorediagnosticrequest addContained(Resource param); - - public boolean hasStatus(); - - public boolean hasStatusElement(); - - public DiagnosticRequest.DiagnosticRequestStatus getStatus(); - - public Enumeration getStatusElement(); - - public Iqicorediagnosticrequest setStatus( - DiagnosticRequest.DiagnosticRequestStatus param); - - public Iqicorediagnosticrequest setStatusElement( - Enumeration param); -} \ No newline at end of file diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoreencounter.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoreencounter.java index c9f0cdb..ec3925d 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoreencounter.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoreencounter.java @@ -40,13 +40,7 @@ public interface Iqicoreencounter public List getIncomingReferral(); - public boolean hasIndication(); - - public List getIndicationConditionTarget(); - - public List getIndication(); - - public List getIndicationProcedureTarget(); + public boolean hasDiagnosis(); public boolean hasEpisodeOfCare(); @@ -100,17 +94,17 @@ public qicoreencounterAdapter addParticipant( public Encounter.EncounterParticipantComponent addParticipant(); - public List getStatusHistory(); + public List getStatusHistory(); public qicoreencounterAdapter setStatusHistory( - List param); + List param); public boolean hasStatusHistory(); public qicoreencounterAdapter addStatusHistory( - Encounter.EncounterStatusHistoryComponent param); + Encounter.StatusHistoryComponent param); - public Encounter.EncounterStatusHistoryComponent addStatusHistory(); + public Encounter.StatusHistoryComponent addStatusHistory(); public List getContained(); @@ -265,4 +259,4 @@ public Iqicoreencounter setServiceProviderAdapterTarget( public Iqicoreencounter setStatusElement( Enumeration param); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoregoal.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoregoal.java index 258c85e..f714597 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoregoal.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoregoal.java @@ -78,15 +78,13 @@ public interface Iqicoregoal public Annotation addNote(); - public List getOutcome(); + public List getOutcomeCode(); - public qicoregoalAdapter setOutcome(List param); + public boolean hasOutcomeCode(); - public boolean hasOutcome(); + public qicoregoalAdapter setOutcomeCode(List param); - public qicoregoalAdapter addOutcome(Goal.GoalOutcomeComponent param); - - public Goal.GoalOutcomeComponent addOutcome(); + public qicoregoalAdapter addOutcomeCode(CodeableConcept param); public List getIdentifier(); @@ -160,27 +158,15 @@ public interface Iqicoregoal public Iqicoregoal setId(String param); - public Type getTarget(); - - public Iqicoregoal setTarget(Type param); - - public DateType getTargetDateType(); - - public boolean hasTargetDateType(); - - public Duration getTargetDuration(); - - public boolean hasTargetDuration(); - - public List getStatusReason(); + public Goal.GoalTargetComponent getTarget(); - public Iqicoregoal setStatusReason(List param); + public Iqicoregoal setTarget(Goal.GoalTargetComponent param); - public boolean hasStatusReason(); + public StringType getStatusReasonElement(); - public Iqicoregoal addStatusReason(CodeableConcept param); + public Iqicoregoal setStatusReasonElement(StringType param); - public CodeableConcept addStatusReason(); + public boolean hasStatusReasonElement(); public boolean hasImplicitRules(); @@ -216,7 +202,7 @@ public interface Iqicoregoal public List getAddressesMedicationStatementTarget(); - public List getAddressesNutritionRequestTarget(); + public List getAddressesNutritionOrderTarget(); public List getAddressesProcedureRequestTarget(); @@ -273,4 +259,4 @@ public interface Iqicoregoal public Iqicoregoal addCategory(CodeableConcept param); public CodeableConcept addCategory(); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoreimagingstudy.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoreimagingstudy.java index f8e1a1e..7206fba 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoreimagingstudy.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoreimagingstudy.java @@ -32,18 +32,6 @@ public interface Iqicoreimagingstudy public void setAdaptee(ImagingStudy param); - public List getBaseLocation(); - - public qicoreimagingstudyAdapter setBaseLocation( - List param); - - public boolean hasBaseLocation(); - - public qicoreimagingstudyAdapter addBaseLocation( - ImagingStudy.StudyBaseLocationComponent param); - - public ImagingStudy.StudyBaseLocationComponent addBaseLocation(); - public boolean hasPatient(); public Reference getPatient(); @@ -165,10 +153,6 @@ public Iqicoreimagingstudy setAvailabilityElement( public boolean hasAccession(); - public boolean hasProcedure(); - - public List getProcedure(); - public Range getRadiationDose(); public Iqicoreimagingstudy setRadiationDose(Range param); @@ -250,4 +234,4 @@ public Iqicoreimagingstudy setReferrerAdapterTarget( public Iqicoreimagingstudy addModalityList(Coding param); public Coding addModalityList(); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoreimmunization.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoreimmunization.java index d0c937b..97fcc78 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoreimmunization.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoreimmunization.java @@ -39,21 +39,6 @@ public interface Iqicoreimmunization public void setAdaptee(Immunization param); - public boolean hasRequester(); - - public Reference getRequester(); - - public Iqicoreimmunization setRequester(Reference param); - - public Practitioner getRequesterTarget(); - - public Iqicoreimmunization setRequesterTarget(Practitioner param); - - public qicorepractitionerAdapter getRequesterAdapterTarget(); - - public Iqicoreimmunization setRequesterAdapterTarget( - qicorepractitionerAdapter param); - public boolean hasLocation(); public Reference getLocation(); @@ -195,17 +180,17 @@ public Iqicoreimmunization setEncounterAdapterTarget( public boolean hasRoute(); - public boolean hasWasNotGiven(); + public boolean hasNotGiven(); - public boolean hasWasNotGivenElement(); + public boolean hasNotGivenElement(); - public BooleanType getWasNotGivenElement(); + public BooleanType getNotGivenElement(); - public Boolean getWasNotGiven(); + public Boolean getNotGiven(); - public Iqicoreimmunization setWasNotGivenElement(BooleanType param); + public Iqicoreimmunization setNotGivenElement(BooleanType param); - public Iqicoreimmunization setWasNotGiven(Boolean param); + public Iqicoreimmunization setNotGiven(Boolean param); public boolean hasPatient(); @@ -222,20 +207,11 @@ public Iqicoreimmunization setEncounterAdapterTarget( public Iqicoreimmunization setPatientAdapterTarget( qicorepatientAdapter param); - public boolean hasPerformer(); - - public Reference getPerformer(); - - public Iqicoreimmunization setPerformer(Reference param); - - public Practitioner getPerformerTarget(); - - public Iqicoreimmunization setPerformerTarget(Practitioner param); + public boolean hasPractitioner(); - public qicorepractitionerAdapter getPerformerAdapterTarget(); + public List getPractitioner(); - public Iqicoreimmunization setPerformerAdapterTarget( - qicorepractitionerAdapter param); + public Iqicoreimmunization setPractitioner(List param); public CodeableConcept getSite(); @@ -308,4 +284,4 @@ public Iqicoreimmunization setStatusElement( public Iqicoreimmunization addIdentifier(Identifier param); public Identifier addIdentifier(); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoremedication.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoremedication.java index 0d2ee49..50c210a 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoremedication.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoremedication.java @@ -26,13 +26,6 @@ public interface Iqicoremedication public void setAdaptee(Medication param); - public Medication.MedicationProductComponent getProduct(); - - public qicoremedicationAdapter setProduct( - Medication.MedicationProductComponent param); - - public boolean hasProduct(); - public boolean hasImplicitRules(); public boolean hasImplicitRulesElement(); @@ -116,4 +109,4 @@ public Iqicoremedication setManufacturerAdapterTarget( public Iqicoremedication setIdElement(IdType param); public Iqicoremedication setId(String param); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationadministration.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationadministration.java index cfb1a73..5c574e8 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationadministration.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationadministration.java @@ -11,9 +11,7 @@ import org.hl7.fhir.dstu3.model.Reference; import org.hl7.fhir.dstu3.model.Resource; -import org.hl7.fhir.dstu3.model.Practitioner; import org.hl7.fhir.dstu3.model.Patient; -import org.hl7.fhir.dstu3.model.RelatedPerson; import org.hl7.fhir.dstu3.model.CodeableConcept; import org.hl7.fhir.dstu3.model.Annotation; import org.hl7.fhir.dstu3.model.Type; @@ -57,47 +55,11 @@ public qicoremedicationadministrationAdapter setDosage( public Iqicoremedicationadministration setLanguage(String param); - public Reference getPerformer(); - - public Resource getPerformerTarget(); + public List getPerformer(); public boolean hasPerformer(); - public Reference getPerformerPractitioner(); - - public Iqicoremedicationadministration setPerformer(Reference param); - - public Practitioner getPerformerPractitionerTarget(); - - public Iqicoremedicationadministration setPerformerTarget(Practitioner param); - - public qicorepractitionerAdapter getPerformerPractitionerAdapterTarget(); - - public Iqicoremedicationadministration setPerformerAdapterTarget( - qicorepractitionerAdapter param); - - public Reference getPerformerPatient(); - - public Patient getPerformerPatientTarget(); - - public Iqicoremedicationadministration setPerformerTarget(Patient param); - - public qicorepatientAdapter getPerformerPatientAdapterTarget(); - - public Iqicoremedicationadministration setPerformerAdapterTarget( - qicorepatientAdapter param); - - public Reference getPerformerRelatedPerson(); - - public RelatedPerson getPerformerRelatedPersonTarget(); - - public Iqicoremedicationadministration setPerformerTarget( - RelatedPerson param); - - public qicorerelatedpersonAdapter getPerformerRelatedPersonAdapterTarget(); - - public Iqicoremedicationadministration setPerformerAdapterTarget( - qicorerelatedpersonAdapter param); + public Iqicoremedicationadministration setPerformer(List param); public List getEventHistory(); @@ -148,16 +110,16 @@ public Iqicoremedicationadministration addReasonNotGiven( public Annotation addNote(); - public List getReasonGiven(); + public List getReasonCode(); - public Iqicoremedicationadministration setReasonGiven( + public Iqicoremedicationadministration setReasonCode( List param); public boolean hasReasonGiven(); - public Iqicoremedicationadministration addReasonGiven(CodeableConcept param); + public Iqicoremedicationadministration addReasonCode(CodeableConcept param); - public CodeableConcept addReasonGiven(); + public CodeableConcept addReasonCode(); public Type getMedication(); @@ -292,4 +254,4 @@ public Iqicoremedicationadministration setPrescriptionAdapterTarget( public Iqicoremedicationadministration setImplicitRulesElement(UriType param); public Iqicoremedicationadministration setImplicitRules(String param); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationdispense.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationdispense.java index 30c9618..dc409ce 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationdispense.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationdispense.java @@ -1,32 +1,13 @@ package org.cqf.qicore.dstu3; -import org.hl7.fhir.dstu3.model.MedicationDispense; +import org.hl7.fhir.dstu3.model.*; import java.util.List; -import org.hl7.fhir.dstu3.model.IntegerType; -import org.hl7.fhir.dstu3.model.Reference; -import org.hl7.fhir.dstu3.model.Practitioner; -import org.hl7.fhir.dstu3.model.Annotation; -import org.hl7.fhir.dstu3.model.Resource; -import org.hl7.fhir.dstu3.model.Enumeration; -import org.hl7.fhir.dstu3.model.SimpleQuantity; -import org.hl7.fhir.dstu3.model.Organization; -import org.hl7.fhir.dstu3.model.CodeType; - import java.lang.String; -import org.hl7.fhir.dstu3.model.Patient; -import org.hl7.fhir.dstu3.model.IdType; -import org.hl7.fhir.dstu3.model.UriType; import org.hl7.fhir.dstu3.model.MedicationDispense.MedicationDispenseSubstitutionComponent; -import org.hl7.fhir.dstu3.model.Period; -import org.hl7.fhir.dstu3.model.CodeableConcept; -import org.hl7.fhir.dstu3.model.DosageInstruction; -import org.hl7.fhir.dstu3.model.Identifier; -import org.hl7.fhir.dstu3.model.Location; -import org.hl7.fhir.dstu3.model.Type; -import org.hl7.fhir.dstu3.model.Medication; +import org.hl7.fhir.dstu3.model.Dosage; public interface Iqicoremedicationdispense { @@ -39,20 +20,11 @@ public interface Iqicoremedicationdispense public Iqicoremedicationdispense setRefillsRemaining(IntegerType param); - public boolean hasDispenser(); - - public Reference getDispenser(); - - public Iqicoremedicationdispense setDispenser(Reference param); - - public Practitioner getDispenserTarget(); - - public Iqicoremedicationdispense setDispenserTarget(Practitioner param); + public boolean hasPerformer(); - public qicorepractitionerAdapter getDispenserAdapterTarget(); + public List getPerformer(); - public Iqicoremedicationdispense setDispenserAdapterTarget( - qicorepractitionerAdapter param); + public Iqicoremedicationdispense setPerformer(List param); public List getNote(); @@ -74,17 +46,17 @@ public Iqicoremedicationdispense addWrappedDosageInstruction( public qicoremedicationdispenseDosageInstructionAdapter addWrappedDosageInstruction(); - public List getDosageInstruction(); + public List getDosageInstruction(); public Iqicoremedicationdispense setDosageInstruction( - List param); + List param); public boolean hasDosageInstruction(); public Iqicoremedicationdispense addDosageInstruction( - DosageInstruction param); + Dosage param); - public DosageInstruction addDosageInstruction(); + public Dosage addDosageInstruction(); public List getContained(); @@ -137,17 +109,6 @@ public qicoremedicationdispenseAdapter setSubstitution( public boolean hasSubstitution(); - public boolean hasDispensingOrganization(); - - public Reference getDispensingOrganization(); - - public Iqicoremedicationdispense setDispensingOrganization(Reference param); - - public Organization getDispensingOrganizationTarget(); - - public Iqicoremedicationdispense setDispensingOrganizationTarget( - Organization param); - public boolean hasLanguage(); public boolean hasLanguageElement(); @@ -223,9 +184,9 @@ public Iqicoremedicationdispense setPatientAdapterTarget( public boolean hasType(); - public Identifier getIdentifier(); + public List getIdentifier(); - public Iqicoremedicationdispense setIdentifier(Identifier param); + public Iqicoremedicationdispense setIdentifier(List param); public boolean hasIdentifier(); @@ -261,4 +222,4 @@ public Iqicoremedicationdispense setDestinationAdapterTarget( public Iqicoremedicationdispense setMedication(Reference param); public Iqicoremedicationdispense setMedicationTarget(Medication param); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationrequest.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationrequest.java index 8c4fa9a..dc1af9f 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationrequest.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationrequest.java @@ -13,7 +13,7 @@ import org.hl7.fhir.dstu3.model.Encounter; import org.hl7.fhir.dstu3.model.Resource; import org.hl7.fhir.dstu3.model.CodeableConcept; -import org.hl7.fhir.dstu3.model.DosageInstruction; +import org.hl7.fhir.dstu3.model.Dosage; import org.hl7.fhir.dstu3.model.UriType; import org.hl7.fhir.dstu3.model.Enumeration; import org.hl7.fhir.dstu3.model.Practitioner; @@ -30,9 +30,9 @@ public interface Iqicoremedicationrequest public void setAdaptee(MedicationRequest param); - public List getWrappedDosageInstruction(); + public List getWrappedDosage(); - public Iqicoremedicationrequest setWrappedDosageInstruction( + public Iqicoremedicationrequest setWrappedDosage( List param); public Iqicoremedicationrequest addWrappedDosageInstruction( @@ -40,17 +40,17 @@ public Iqicoremedicationrequest addWrappedDosageInstruction( public qicoremedicationrequestDosageInstructionAdapter addWrappedDosageInstruction(); - public List getDosageInstruction(); + public List getDosageInstruction(); public Iqicoremedicationrequest setDosageInstruction( - List param); + List param); public boolean hasDosageInstruction(); public Iqicoremedicationrequest addDosageInstruction( - DosageInstruction param); + Dosage param); - public DosageInstruction addDosageInstruction(); + public Dosage addDosageInstruction(); public List getNote(); @@ -195,18 +195,11 @@ public Iqicoremedicationrequest setPatientAdapterTarget( public boolean hasCategory(); -// public boolean hasCategoryElement(); - public CodeableConcept getCategory(); - // public Enumeration getCategoryElement(); - public Iqicoremedicationrequest setCategory( CodeableConcept param); - // public Iqicoremedicationorder setCategoryElement( - // Enumeration param); - public Type getMedication(); public Iqicoremedicationrequest setMedication(Type param); @@ -257,4 +250,4 @@ public Iqicoremedicationrequest setPriorPrescriptionTarget( public Iqicoremedicationrequest addIdentifier(Identifier param); public Identifier addIdentifier(); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationstatement.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationstatement.java index 17d45bd..082ec1c 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationstatement.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoremedicationstatement.java @@ -1,7 +1,6 @@ package org.cqf.qicore.dstu3; import org.hl7.fhir.dstu3.model.MedicationStatement; -import org.hl7.fhir.dstu3.model.MedicationStatement.MedicationStatementNotTaken; import java.util.List; @@ -22,12 +21,9 @@ import org.hl7.fhir.dstu3.model.CodeType; import org.hl7.fhir.dstu3.model.Type; import org.hl7.fhir.dstu3.model.DateTimeType; -import org.hl7.fhir.dstu3.model.DosageInstruction; +import org.hl7.fhir.dstu3.model.Dosage; import org.hl7.fhir.dstu3.model.Period; import org.hl7.fhir.dstu3.model.Medication; -import org.hl7.fhir.dstu3.model.BooleanType; - -import java.lang.Boolean; public interface Iqicoremedicationstatement { @@ -58,10 +54,6 @@ public interface Iqicoremedicationstatement public Identifier addIdentifier(); - public boolean hasReasonForUseReference(); - - public List getReasonForUseReference(); - public List getNote(); public Iqicoremedicationstatement setNote(List param); @@ -72,42 +64,21 @@ public interface Iqicoremedicationstatement public Annotation addNote(); - public List getDosage(); + public List getDosage(); public qicoremedicationstatementAdapter setDosage( - List param); + List param); public boolean hasDosage(); public qicoremedicationstatementAdapter addDosage( - DosageInstruction param); + Dosage param); - public DosageInstruction addDosage(); + public Dosage addDosage(); public boolean hasCategory(); - public boolean hasCategoryElement(); - - public MedicationStatement.MedicationStatementCategory getCategory(); - - public Enumeration getCategoryElement(); - - public Iqicoremedicationstatement setCategory( - MedicationStatement.MedicationStatementCategory param); - - public Iqicoremedicationstatement setCategoryElement( - Enumeration param); - - public List getReasonForUseCodeableConcept(); - - public Iqicoremedicationstatement setReasonForUseCodeableConcept( - List param); - - public boolean hasReasonForUseCodeableConcept(); - - public Iqicoremedicationstatement addReasonForUseCodeableConcept(CodeableConcept param); - - public CodeableConcept addReasonForUseCodeableConcept(); + public CodeableConcept getCategory(); public boolean hasId(); @@ -258,15 +229,4 @@ public Iqicoremedicationstatement setReasonNotTaken( public List getDerivedFrom(); - public boolean hasNotTaken(); - - public boolean hasNotTakenElement(); - - public Enumeration getNotTakenElement(); - - public MedicationStatementNotTaken getNotTaken(); - - public Iqicoremedicationstatement setNotTakenElement(Enumeration param); - - public Iqicoremedicationstatement setNotTaken(MedicationStatementNotTaken param); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoreorganization.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoreorganization.java index 292be36..e2c8ffa 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoreorganization.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoreorganization.java @@ -116,9 +116,9 @@ public qicoreorganizationAdapter addContact( public Iqicoreorganization setAlias(List param); - public CodeableConcept getType(); + public List getType(); - public Iqicoreorganization setType(CodeableConcept param); + public Iqicoreorganization setType(List param); public boolean hasType(); @@ -175,4 +175,4 @@ public qicoreorganizationAdapter addContact( public Iqicoreorganization setIdElement(IdType param); public Iqicoreorganization setId(String param); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicorepractitioner.java b/src/main/java/org/cqf/qicore/dstu3/Iqicorepractitioner.java index 6477630..634f202 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicorepractitioner.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicorepractitioner.java @@ -35,18 +35,6 @@ public interface Iqicorepractitioner public void setAdaptee(Practitioner param); - public List getRole(); - - public qicorepractitionerAdapter setRole( - List param); - - public boolean hasRole(); - - public qicorepractitionerAdapter addRole( - Practitioner.PractitionerRoleComponent param); - - public Practitioner.PractitionerRoleComponent addRole(); - public boolean hasActive(); public boolean hasActiveElement(); @@ -203,4 +191,4 @@ public Iqicorepractitioner setGenderElement( public boolean hasContained(); public Iqicorepractitioner addContained(Resource param); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoreprocedure.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoreprocedure.java index 1b899a8..0f97971 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoreprocedure.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoreprocedure.java @@ -11,7 +11,6 @@ import org.hl7.fhir.dstu3.model.Identifier; import org.hl7.fhir.dstu3.model.Resource; import org.hl7.fhir.dstu3.model.CarePlan; -import org.hl7.fhir.dstu3.model.DiagnosticRequest; import org.hl7.fhir.dstu3.model.ProcedureRequest; import org.hl7.fhir.dstu3.model.ReferralRequest; import org.hl7.fhir.dstu3.model.Type; @@ -87,37 +86,23 @@ public qicoreprocedureAdapter addFocalDevice( public Identifier addIdentifier(); - public Reference getRequest(); + public boolean hasBasedOn(); - public Resource getRequestTarget(); + public List getBasedOn(); - public boolean hasRequest(); + public Iqicoreprocedure setBasedOn(List param); - public Reference getRequestCarePlan(); + public List getBasedOnCarePlan(); - public Iqicoreprocedure setRequest(Reference param); + public List getBasedOnCarePlanTarget(); - public CarePlan getRequestCarePlanTarget(); + public List getBasedOnProcedureRequest(); - public Iqicoreprocedure setRequestTarget(CarePlan param); + public List getBasedOnProcedureRequestTarget(); - public Reference getRequestDiagnosticRequest(); + public List getBasedOnReferralRequest(); - public DiagnosticRequest getRequestDiagnosticRequestTarget(); - - public Iqicoreprocedure setRequestTarget(DiagnosticRequest param); - - public Reference getRequestProcedureRequest(); - - public ProcedureRequest getRequestProcedureRequestTarget(); - - public Iqicoreprocedure setRequestTarget(ProcedureRequest param); - - public Reference getRequestReferralRequest(); - - public ReferralRequest getRequestReferralRequestTarget(); - - public Iqicoreprocedure setRequestTarget(ReferralRequest param); + public List getBasedOnReferralRequestTarget(); public CodeableConcept getCategory(); @@ -137,15 +122,13 @@ public qicoreprocedureAdapter addFocalDevice( public boolean hasPerformedPeriod(); - public boolean hasComponent(); - - public List getComponentMedicationAdministrationTarget(); + public List getPartOfMedicationAdministrationTarget(); - public List getComponent(); + public List getPartOf(); - public List getComponentProcedureTarget(); + public List getPartOfProcedureTarget(); - public List getComponentObservationTarget(); + public List getPartOfObservationTarget(); public boolean hasImplicitRules(); @@ -247,17 +230,17 @@ public qicoreprocedureAdapter addPerformer( public Iqicoreprocedure setId(String param); - public boolean hasNotPerformed(); + public boolean hasNotDone(); - public boolean hasNotPerformedElement(); + public boolean hasNotDoneElement(); - public BooleanType getNotPerformedElement(); + public BooleanType getNotDoneElement(); - public Boolean getNotPerformed(); + public Boolean getNotDone(); - public Iqicoreprocedure setNotPerformedElement(BooleanType param); + public Iqicoreprocedure setNotDoneElement(BooleanType param); - public Iqicoreprocedure setNotPerformed(Boolean param); + public Iqicoreprocedure setNotDone(Boolean param); public boolean hasStatus(); @@ -272,15 +255,11 @@ public qicoreprocedureAdapter addPerformer( public Iqicoreprocedure setStatusElement( Enumeration param); - public List getReasonNotPerformed(); - - public Iqicoreprocedure setReasonNotPerformed(List param); - - public boolean hasReasonNotPerformed(); + public CodeableConcept getNotDoneReason(); - public Iqicoreprocedure addReasonNotPerformed(CodeableConcept param); + public Iqicoreprocedure setNotDoneReason(CodeableConcept param); - public CodeableConcept addReasonNotPerformed(); + public boolean hasNotDoneReason(); public List getFollowUp(); @@ -302,15 +281,15 @@ public Iqicoreprocedure setStatusElement( public Iqicoreprocedure setApproachBodySite(List param); - public boolean hasEncounter(); + public boolean hasContext(); - public Reference getEncounter(); + public Reference getContext(); - public Iqicoreprocedure setEncounter(Reference param); + public Iqicoreprocedure setContext(Reference param); - public Encounter getEncounterTarget(); + public Encounter getContextTarget(); - public Iqicoreprocedure setEncounterTarget(Encounter param); + public Iqicoreprocedure setContextTarget(Encounter param); public qicoreencounterAdapter getEncounterAdapterTarget(); @@ -360,4 +339,4 @@ public Iqicoreprocedure setEncounterAdapterTarget( public Iqicoreprocedure addUsedCode(CodeableConcept param); public CodeableConcept addUsedCode(); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicoreprocedurerequest.java b/src/main/java/org/cqf/qicore/dstu3/Iqicoreprocedurerequest.java index 70f302d..6c21e41 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicoreprocedurerequest.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicoreprocedurerequest.java @@ -103,56 +103,42 @@ public Iqicoreprocedurerequest setPriority( public Iqicoreprocedurerequest setPriorityElement( Enumeration param); - public Reference getOrderer(); + public ProcedureRequest.ProcedureRequestRequesterComponent getRequester(); - public Resource getOrdererTarget(); + public boolean hasRequester(); - public boolean hasOrderer(); + public ProcedureRequest.ProcedureRequestRequesterComponent geRequesterPractitioner(); - public Reference getOrdererPractitioner(); + public Iqicoreprocedurerequest setOrderer(ProcedureRequest.ProcedureRequestRequesterComponent param); - public Iqicoreprocedurerequest setOrderer(Reference param); + public qicorepractitionerAdapter getRequesterPractitionerAdapterTarget(); - public Practitioner getOrdererPractitionerTarget(); - - public Iqicoreprocedurerequest setOrdererTarget(Practitioner param); - - public qicorepractitionerAdapter getOrdererPractitionerAdapterTarget(); - - public Iqicoreprocedurerequest setOrdererAdapterTarget( + public Iqicoreprocedurerequest setRequesterAdapterTarget( qicorepractitionerAdapter param); - public Reference getOrdererPatient(); - - public Patient getOrdererPatientTarget(); - - public Iqicoreprocedurerequest setOrdererTarget(Patient param); - - public qicorepatientAdapter getOrdererPatientAdapterTarget(); - - public Iqicoreprocedurerequest setOrdererAdapterTarget( + public Iqicoreprocedurerequest setRequesterAdapterTarget( qicorepatientAdapter param); - public Reference getOrdererRelatedPerson(); + public Reference getRequesterRelatedPerson(); - public RelatedPerson getOrdererRelatedPersonTarget(); + public RelatedPerson getRequesterRelatedPersonTarget(); - public Iqicoreprocedurerequest setOrdererTarget(RelatedPerson param); + public Iqicoreprocedurerequest setRequesterTarget(RelatedPerson param); - public qicorerelatedpersonAdapter getOrdererRelatedPersonAdapterTarget(); + public qicorerelatedpersonAdapter getRequesterRelatedPersonAdapterTarget(); - public Iqicoreprocedurerequest setOrdererAdapterTarget( + public Iqicoreprocedurerequest setRequesterAdapterTarget( qicorerelatedpersonAdapter param); - public Reference getOrdererDevice(); + public Reference getRequesterDevice(); - public Device getOrdererDeviceTarget(); + public Device getRequesterDeviceTarget(); - public Iqicoreprocedurerequest setOrdererTarget(Device param); + public Iqicoreprocedurerequest setRequesterTarget(Device param); - public qicoredeviceAdapter getOrdererDeviceAdapterTarget(); + public qicoredeviceAdapter getRequesterDeviceAdapterTarget(); - public Iqicoreprocedurerequest setOrdererAdapterTarget( + public Iqicoreprocedurerequest setRequesterAdapterTarget( qicoredeviceAdapter param); public CodeType getAppropriatenessScoreCodeType(); @@ -163,23 +149,19 @@ public Iqicoreprocedurerequest setOrdererAdapterTarget( public Iqicoreprocedurerequest setAppropriatenessScore(DecimalType param); - public Type getReason(); - - public Iqicoreprocedurerequest setReason(Type param); - - public CodeableConcept getReasonCodeableConcept(); + public List getReasonCode(); - public boolean hasReasonCodeableConcept(); + public Iqicoreprocedurerequest setReasonCode(List param); - public boolean hasReason(); + public boolean hasReasonCode(); - public Reference getReasonReference(); + public List getReasonReference(); public Condition getReasonTarget(); - public Iqicoreprocedurerequest setReason(Reference param); + public Iqicoreprocedurerequest setReason(List param); - public Iqicoreprocedurerequest setReasonTarget(Condition param); + public Iqicoreprocedurerequest setReasonTarget(List param); public boolean hasStatus(); @@ -220,21 +202,21 @@ public Iqicoreprocedurerequest setSubjectAdapterTarget( public Iqicoreprocedurerequest setSubjectTarget(Group param); - public Type getScheduled(); + public Type getOccurrence(); - public Iqicoreprocedurerequest setScheduled(Type param); + public Iqicoreprocedurerequest setOccurrence(Type param); - public DateTimeType getScheduledDateTimeType(); + public DateTimeType getOccurrenceDateTimeType(); - public boolean hasScheduledDateTimeType(); + public boolean hasOccurrenceDateTimeType(); - public Period getScheduledPeriod(); + public Period getOccurrencePeriod(); - public boolean hasScheduledPeriod(); + public boolean hasOccurrencePeriod(); - public Timing getScheduledTiming(); + public Timing getOccurrenceTiming(); - public boolean hasScheduledTiming(); + public boolean hasOccurrenceTiming(); public List getContained(); @@ -244,13 +226,13 @@ public Iqicoreprocedurerequest setSubjectAdapterTarget( public Iqicoreprocedurerequest addContained(Resource param); - public boolean hasEncounter(); + public boolean hasContext(); - public Reference getEncounter(); + public Reference getContext(); - public Iqicoreprocedurerequest setEncounter(Reference param); + public Iqicoreprocedurerequest setContext(Reference param); - public Encounter getEncounterTarget(); + public Encounter getContextTarget(); public Iqicoreprocedurerequest setEncounterTarget(Encounter param); @@ -352,4 +334,4 @@ public Iqicoreprocedurerequest setPerformerAdapterTarget( public Iqicoreprocedurerequest setCode(CodeableConcept param); public boolean hasCode(); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicorereferralrequest.java b/src/main/java/org/cqf/qicore/dstu3/Iqicorereferralrequest.java index 76de490..3413fa7 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicorereferralrequest.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicorereferralrequest.java @@ -54,21 +54,19 @@ public interface Iqicorereferralrequest public List getBasedOnCarePlanTarget(); - public List getBasedOnDiagnosticRequestTarget(); + public List getBasedOnProcedureRequestTarget(); - public List getBasedOnProcedureRequestTarget(); + public ReferralRequest.ReferralPriority getPriority(); - public CodeableConcept getPriority(); - - public Iqicorereferralrequest setPriority(CodeableConcept param); + public Iqicorereferralrequest setPriority(ReferralRequest.ReferralPriority param); public boolean hasPriority(); - public Identifier getParent(); + public Reference getSubject(); - public Iqicorereferralrequest setParent(Identifier param); + public Iqicorereferralrequest setSubject(Reference param); - public boolean hasParent(); + public boolean hasSubject(); public boolean hasImplicitRules(); @@ -121,14 +119,14 @@ public Iqicorereferralrequest setContextAdapterTarget( public boolean hasStatusElement(); - public ReferralRequest.ReferralStatus getStatus(); + public ReferralRequest.ReferralRequestStatus getStatus(); - public Enumeration getStatusElement(); + public Enumeration getStatusElement(); - public Iqicorereferralrequest setStatus(ReferralRequest.ReferralStatus param); + public Iqicorereferralrequest setStatus(ReferralRequest.ReferralRequestStatus param); public Iqicorereferralrequest setStatusElement( - Enumeration param); + Enumeration param); public List getServiceRequested(); @@ -162,13 +160,13 @@ public Iqicorereferralrequest setPatientAdapterTarget( public boolean hasSpecialty(); - public Period getFulfillmentTime(); + public Period getOccurrencePeriod(); public Iqicorereferralrequest setFulfillmentTime(Period param); - public boolean hasFulfillmentTime(); + public boolean hasOccurrencePeriod(); - public Reference getRequester(); + public ReferralRequest.ReferralRequestRequesterComponent getRequester(); public Resource getRequesterTarget(); @@ -209,18 +207,18 @@ public Iqicorereferralrequest setRequesterAdapterTarget( public Iqicorereferralrequest setRequesterAdapterTarget( qicorepatientAdapter param); - public boolean hasCategory(); + public boolean hasIntent(); - public boolean hasCategoryElement(); + public boolean hasIntentElement(); - public ReferralRequest.ReferralCategory getCategory(); + public ReferralRequest.ReferralCategory getIntent(); - public Enumeration getCategoryElement(); + public Enumeration getIntentElement(); - public Iqicorereferralrequest setCategory( + public Iqicorereferralrequest setIntent( ReferralRequest.ReferralCategory param); - public Iqicorereferralrequest setCategoryElement( + public Iqicorereferralrequest setIntentElement( Enumeration param); public CodeableConcept getRefusalReason(); @@ -247,11 +245,11 @@ public Iqicorereferralrequest setCategoryElement( public List getRecipientOrganizationTarget(); - public CodeableConcept getReason(); + public List getReasonCode(); - public Iqicorereferralrequest setReason(CodeableConcept param); + public Iqicorereferralrequest setReasonCode(List param); - public boolean hasReason(); + public boolean hasReasonCode(); public CodeableConcept getType(); @@ -268,4 +266,4 @@ public Iqicorereferralrequest setCategoryElement( public Iqicorereferralrequest addIdentifier(Identifier param); public Identifier addIdentifier(); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/Iqicorespecimen.java b/src/main/java/org/cqf/qicore/dstu3/Iqicorespecimen.java index db28ce8..e7779c8 100644 --- a/src/main/java/org/cqf/qicore/dstu3/Iqicorespecimen.java +++ b/src/main/java/org/cqf/qicore/dstu3/Iqicorespecimen.java @@ -29,17 +29,17 @@ public interface Iqicorespecimen public void setAdaptee(Specimen param); - public List getTreatment(); + public List getProcessing(); public qicorespecimenAdapter setTreatment( - List param); + List param); - public boolean hasTreatment(); + public boolean hasProcessing(); - public qicorespecimenAdapter addTreatment( - Specimen.SpecimenTreatmentComponent param); + public qicorespecimenAdapter addProcessing( + Specimen.SpecimenProcessingComponent param); - public Specimen.SpecimenTreatmentComponent addTreatment(); + public Specimen.SpecimenProcessingComponent addTreatment(); public boolean hasImplicitRules(); @@ -106,8 +106,6 @@ public Iqicorespecimen addContainer( public boolean hasRequest(); - public List getRequestDiagnosticRequestTarget(); - public List getRequest(); public List getRequestProcedureRequestTarget(); @@ -214,4 +212,4 @@ public Iqicorespecimen setStatusElement( public Iqicorespecimen addNote(Annotation param); public Annotation addNote(); -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoreallergyintoleranceAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoreallergyintoleranceAdapter.java index 7d5c0d1..c18ec5e 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoreallergyintoleranceAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoreallergyintoleranceAdapter.java @@ -408,11 +408,6 @@ public boolean hasCategory() return adaptedClass.hasCategory(); } -// public boolean hasCategoryElement() -// { -// return adaptedClass.hasCategoryElement(); -// } - public List> getCategory() { try @@ -425,18 +420,6 @@ public List> getCategory() } } -// public Enumeration getCategoryElement() -// { -// try -// { -// return adaptedClass.getCategoryElement(); -// } -// catch (Exception e) -// { -// throw new RuntimeException("Error getting CategoryElement", e); -// } -// } - public Iqicoreallergyintolerance setCategory( List> param) { @@ -920,4 +903,4 @@ public Iqicoreallergyintolerance setId(String param) adaptedClass.setId(param); return this; } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoreallergyintoleranceReactionAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoreallergyintoleranceReactionAdapter.java index 653369c..60231bf 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoreallergyintoleranceReactionAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoreallergyintoleranceReactionAdapter.java @@ -36,54 +36,6 @@ public void setAdaptee( this.adaptedClass = param; } - public boolean hasCertainty() - { - return adaptedClass.hasCertainty(); - } - - public boolean hasCertaintyElement() - { - return adaptedClass.hasCertaintyElement(); - } - - public AllergyIntolerance.AllergyIntoleranceCertainty getCertainty() - { - try - { - return adaptedClass.getCertainty(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Certainty", e); - } - } - - public Enumeration getCertaintyElement() - { - try - { - return adaptedClass.getCertaintyElement(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting CertaintyElement", e); - } - } - - public qicoreallergyintoleranceReactionAdapter setCertainty( - AllergyIntolerance.AllergyIntoleranceCertainty param) - { - adaptedClass.setCertainty(param); - return this; - } - - public qicoreallergyintoleranceReactionAdapter setCertaintyElement( - Enumeration param) - { - adaptedClass.setCertaintyElement(param); - return this; - } - public Duration getDuration() { List extensions = adaptedClass @@ -372,4 +324,4 @@ public qicoreallergyintoleranceReactionAdapter setSeverityElement( adaptedClass.setSeverityElement(param); return this; } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicorecommunicationAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicorecommunicationAdapter.java index 25ad1a4..ab00f03 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicorecommunicationAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicorecommunicationAdapter.java @@ -185,11 +185,11 @@ public Communication.CommunicationPayloadComponent addPayload() return adaptedClass.addPayload(); } - public List getReason() + public List getReasonCode() { try { - return adaptedClass.getReason(); + return adaptedClass.getReasonCode(); } catch (Exception e) { @@ -197,26 +197,26 @@ public List getReason() } } - public Iqicorecommunication setReason(List param) + public Iqicorecommunication setReasonCode(List param) { - adaptedClass.setReason(param); + adaptedClass.setReasonCode(param); return this; } - public boolean hasReason() + public boolean hasReasonCode() { - return adaptedClass.hasReason(); + return adaptedClass.hasReasonCode(); } - public Iqicorecommunication addReason(CodeableConcept param) + public Iqicorecommunication addReasonCode(CodeableConcept param) { - adaptedClass.addReason(param); + adaptedClass.addReasonCode(param); return this; } - public CodeableConcept addReason() + public CodeableConcept addReasonCode() { - return adaptedClass.addReason(); + return adaptedClass.addReasonCode(); } public List getNote() @@ -342,12 +342,12 @@ public Iqicorecommunication addContained(Resource param) public boolean hasParent() { - return adaptedClass.hasParent(); + return adaptedClass.hasSubject(); } - public List getParent() + public Reference getParent() { - return adaptedClass.getParent(); + return adaptedClass.getSubject(); } public CodeableConcept getReasonNotPerformed() @@ -437,7 +437,7 @@ public Iqicorecommunication setStatusElement( return this; } - public CodeableConcept getCategory() + public List getCategory() { try { @@ -449,7 +449,7 @@ public CodeableConcept getCategory() } } - public Iqicorecommunication setCategory(CodeableConcept param) + public Iqicorecommunication setCategory(List param) { adaptedClass.setCategory(param); return this; @@ -967,4 +967,4 @@ public List getBasedOn() { return adaptedClass.getBasedOn(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicorecommunicationrequestAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicorecommunicationrequestAdapter.java index b498235..bebfb07 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicorecommunicationrequestAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicorecommunicationrequestAdapter.java @@ -79,7 +79,7 @@ public Reference getRequester() { try { - return adaptedClass.getRequester(); + return adaptedClass.getRequester().getAgent(); } catch (Exception e) { @@ -91,7 +91,7 @@ public Resource getRequesterTarget() { try { - return adaptedClass.getRequesterTarget(); + return adaptedClass.getRequester().getAgentTarget(); } catch (Exception e) { @@ -108,7 +108,7 @@ public Reference getRequesterPatient() { try { - return adaptedClass.getRequester(); + return adaptedClass.getRequester().getAgent(); } catch (Exception e) { @@ -118,30 +118,30 @@ public Reference getRequesterPatient() public Iqicorecommunicationrequest setRequester(Reference param) { - adaptedClass.setRequester(param); + adaptedClass.getRequester().setAgent(param); return this; } public Patient getRequesterPatientTarget() { return (org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getRequesterTarget(); + .getRequester().getAgentTarget(); } public Iqicorecommunicationrequest setRequesterTarget(Patient param) { - adaptedClass.setRequesterTarget(param); + adaptedClass.getRequester().setAgentTarget(param); return this; } public qicorepatientAdapter getRequesterPatientAdapterTarget() { - if (adaptedClass.getRequester().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) + if (adaptedClass.getRequester().getAgentTarget() instanceof org.hl7.fhir.dstu3.model.Patient) { qicorepatientAdapter profiledType = new qicorepatientAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getRequester().getResource()); + .getRequester().getAgentTarget()); return profiledType; } else @@ -153,7 +153,7 @@ public qicorepatientAdapter getRequesterPatientAdapterTarget() public Iqicorecommunicationrequest setRequesterAdapterTarget( qicorepatientAdapter param) { - adaptedClass.setRequesterTarget(param.getAdaptee()); + adaptedClass.getRequester().setAgentTarget(param.getAdaptee()); return this; } @@ -161,7 +161,7 @@ public Reference getRequesterPractitioner() { try { - return adaptedClass.getRequester(); + return adaptedClass.getRequester().getAgent(); } catch (Exception e) { @@ -172,23 +172,23 @@ public Reference getRequesterPractitioner() public Practitioner getRequesterPractitionerTarget() { return (org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getRequesterTarget(); + .getRequester().getAgentTarget(); } public Iqicorecommunicationrequest setRequesterTarget(Practitioner param) { - adaptedClass.setRequesterTarget(param); + adaptedClass.getRequester().setAgentTarget(param); return this; } public qicorepractitionerAdapter getRequesterPractitionerAdapterTarget() { - if (adaptedClass.getRequester().getResource() instanceof org.hl7.fhir.dstu3.model.Practitioner) + if (adaptedClass.getRequester().getAgentTarget() instanceof org.hl7.fhir.dstu3.model.Practitioner) { qicorepractitionerAdapter profiledType = new qicorepractitionerAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getRequester().getResource()); + .getRequester().getAgentTarget()); return profiledType; } else @@ -200,7 +200,7 @@ public qicorepractitionerAdapter getRequesterPractitionerAdapterTarget() public Iqicorecommunicationrequest setRequesterAdapterTarget( qicorepractitionerAdapter param) { - adaptedClass.setRequesterTarget(param.getAdaptee()); + adaptedClass.getRequester().setAgentTarget(param.getAdaptee()); return this; } @@ -208,7 +208,7 @@ public Reference getRequesterRelatedPerson() { try { - return adaptedClass.getRequester(); + return adaptedClass.getRequester().getAgent(); } catch (Exception e) { @@ -219,23 +219,23 @@ public Reference getRequesterRelatedPerson() public RelatedPerson getRequesterRelatedPersonTarget() { return (org.hl7.fhir.dstu3.model.RelatedPerson) adaptedClass - .getRequesterTarget(); + .getRequester().getAgentTarget(); } public Iqicorecommunicationrequest setRequesterTarget(RelatedPerson param) { - adaptedClass.setRequesterTarget(param); + adaptedClass.getRequester().setAgentTarget(param); return this; } public qicorerelatedpersonAdapter getRequesterRelatedPersonAdapterTarget() { - if (adaptedClass.getRequester().getResource() instanceof org.hl7.fhir.dstu3.model.RelatedPerson) + if (adaptedClass.getRequester().getAgentTarget() instanceof org.hl7.fhir.dstu3.model.RelatedPerson) { qicorerelatedpersonAdapter profiledType = new qicorerelatedpersonAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.RelatedPerson) adaptedClass - .getRequester().getResource()); + .getRequester().getAgentTarget()); return profiledType; } else @@ -247,7 +247,7 @@ public qicorerelatedpersonAdapter getRequesterRelatedPersonAdapterTarget() public Iqicorecommunicationrequest setRequesterAdapterTarget( qicorerelatedpersonAdapter param) { - adaptedClass.setRequesterTarget(param.getAdaptee()); + adaptedClass.getRequester().setAgentTarget(param.getAdaptee()); return this; } @@ -442,7 +442,7 @@ public CommunicationRequest.CommunicationRequestPayloadComponent addPayload() return adaptedClass.addPayload(); } - public CodeableConcept getPriority() + public CommunicationRequest.CommunicationPriority getPriority() { try { @@ -454,7 +454,7 @@ public CodeableConcept getPriority() } } - public Iqicorecommunicationrequest setPriority(CodeableConcept param) + public Iqicorecommunicationrequest setPriority(CommunicationRequest.CommunicationPriority param) { adaptedClass.setPriority(param); return this; @@ -700,7 +700,7 @@ public Identifier addIdentifier() return adaptedClass.addIdentifier(); } - public CodeableConcept getCategory() + public List getCategory() { try { @@ -712,7 +712,7 @@ public CodeableConcept getCategory() } } - public Iqicorecommunicationrequest setCategory(CodeableConcept param) + public Iqicorecommunicationrequest setCategory(List param) { adaptedClass.setCategory(param); return this; @@ -992,56 +992,56 @@ public Iqicorecommunicationrequest setSenderAdapterTarget( return this; } - public Type getScheduled() + public Type getOccurrence() { try { - return adaptedClass.getScheduled(); + return adaptedClass.getOccurrence(); } catch (Exception e) { - throw new RuntimeException("Error getting Scheduled", e); + throw new RuntimeException("Error getting Occurrence", e); } } - public Iqicorecommunicationrequest setScheduled(Type param) + public Iqicorecommunicationrequest setOccurrence(Type param) { - adaptedClass.setScheduled(param); + adaptedClass.setOccurrence(param); return this; } - public DateTimeType getScheduledDateTimeType() + public DateTimeType getOccurrenceDateTimeType() { try { - return adaptedClass.getScheduledDateTimeType(); + return adaptedClass.getOccurrenceDateTimeType(); } catch (Exception e) { - throw new RuntimeException("Error getting ScheduledDateTimeType", e); + throw new RuntimeException("Error getting OccurrenceDateTimeType", e); } } - public boolean hasScheduledDateTimeType() + public boolean hasOccurrenceDateTimeType() { - return adaptedClass.hasScheduledDateTimeType(); + return adaptedClass.hasOccurrenceDateTimeType(); } - public Period getScheduledPeriod() + public Period getOccurrencePeriod() { try { - return adaptedClass.getScheduledPeriod(); + return adaptedClass.getOccurrencePeriod(); } catch (Exception e) { - throw new RuntimeException("Error getting ScheduledPeriod", e); + throw new RuntimeException("Error getting OccurrencePeriod", e); } } - public boolean hasScheduledPeriod() + public boolean hasOccurrencePeriod() { - return adaptedClass.hasScheduledPeriod(); + return adaptedClass.hasOccurrencePeriod(); } public boolean hasId() @@ -1090,11 +1090,11 @@ public Iqicorecommunicationrequest setId(String param) return this; } - public List getReason() + public List getReasonCode() { try { - return adaptedClass.getReason(); + return adaptedClass.getReasonCode(); } catch (Exception e) { @@ -1102,25 +1102,25 @@ public List getReason() } } - public Iqicorecommunicationrequest setReason(List param) + public Iqicorecommunicationrequest setReasonCode(List param) { - adaptedClass.setReason(param); + adaptedClass.setReasonCode(param); return this; } - public boolean hasReason() + public boolean hasReasonCode() { - return adaptedClass.hasReason(); + return adaptedClass.hasReasonCode(); } - public Iqicorecommunicationrequest addReason(CodeableConcept param) + public Iqicorecommunicationrequest addReasonCode(CodeableConcept param) { - adaptedClass.addReason(param); + adaptedClass.addReasonCode(param); return this; } public CodeableConcept addReason() { - return adaptedClass.addReason(); + return adaptedClass.addReasonCode(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoreconditionAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoreconditionAdapter.java index 08df153..29c72cb 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoreconditionAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoreconditionAdapter.java @@ -22,7 +22,7 @@ import org.hl7.fhir.dstu3.model.Enumeration; import org.hl7.fhir.dstu3.model.Annotation; import org.hl7.fhir.dstu3.model.IdType; -import org.hl7.fhir.dstu3.model.DateType; + import java.util.Date; public class qicoreconditionAdapter implements Iqicorecondition @@ -897,7 +897,7 @@ public boolean hasAssertedDateElement() return adaptedClass.hasAssertedDateElement(); } - public DateType getAssertedDateElement() + public DateTimeType getAssertedDateElement() { try { @@ -921,7 +921,7 @@ public Date getAssertedDate() } } - public Iqicorecondition setAssertedDateElement(DateType param) + public Iqicorecondition setAssertedDateElement(DateTimeType param) { adaptedClass.setAssertedDateElement(param); return this; @@ -1084,4 +1084,4 @@ public boolean hasOnsetStringType() { return adaptedClass.hasOnsetStringType(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoredeviceAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoredeviceAdapter.java index 353bc97..b7078b1 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoredeviceAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoredeviceAdapter.java @@ -317,11 +317,11 @@ public Identifier addIdentifier() return adaptedClass.addIdentifier(); } - public Identifier getUdiCarrier() + public Device.DeviceUdiComponent getUdiCarrier() { try { - return adaptedClass.getUdiCarrier(); + return adaptedClass.getUdi(); } catch (Exception e) { @@ -329,15 +329,15 @@ public Identifier getUdiCarrier() } } - public Iqicoredevice setUdiCarrier(Identifier param) + public Iqicoredevice setUdiCarrier(Device.DeviceUdiComponent param) { - adaptedClass.setUdiCarrier(param); + adaptedClass.setUdi(param); return this; } - public boolean hasUdiCarrier() + public boolean hasUdi() { - return adaptedClass.hasUdiCarrier(); + return adaptedClass.hasUdi(); } public boolean hasOwner() @@ -545,7 +545,7 @@ public boolean hasStatusElement() return adaptedClass.hasStatusElement(); } - public Device.DeviceStatus getStatus() + public Device.FHIRDeviceStatus getStatus() { try { @@ -557,7 +557,7 @@ public Device.DeviceStatus getStatus() } } - public Enumeration getStatusElement() + public Enumeration getStatusElement() { try { @@ -569,13 +569,13 @@ public Enumeration getStatusElement() } } - public Iqicoredevice setStatus(Device.DeviceStatus param) + public Iqicoredevice setStatus(Device.FHIRDeviceStatus param) { adaptedClass.setStatus(param); return this; } - public Iqicoredevice setStatusElement(Enumeration param) + public Iqicoredevice setStatusElement(Enumeration param) { adaptedClass.setStatusElement(param); return this; @@ -804,4 +804,4 @@ public Annotation addNote() { return adaptedClass.addNote(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicorediagnosticreportAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicorediagnosticreportAdapter.java index 6fa1acf..e7e8517 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicorediagnosticreportAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicorediagnosticreportAdapter.java @@ -242,64 +242,6 @@ public DiagnosticReport.DiagnosticReportImageComponent addImage() return adaptedClass.addImage(); } - public boolean hasEncounter() - { - return adaptedClass.hasEncounter(); - } - - public Reference getEncounter() - { - try - { - return adaptedClass.getEncounter(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Encounter", e); - } - } - - public Iqicorediagnosticreport setEncounter(Reference param) - { - adaptedClass.setEncounter(param); - return this; - } - - public Encounter getEncounterTarget() - { - return (org.hl7.fhir.dstu3.model.Encounter) adaptedClass - .getEncounterTarget(); - } - - public Iqicorediagnosticreport setEncounterTarget(Encounter param) - { - adaptedClass.setEncounterTarget(param); - return this; - } - - public qicoreencounterAdapter getEncounterAdapterTarget() - { - if (adaptedClass.getEncounter().getResource() instanceof org.hl7.fhir.dstu3.model.Encounter) - { - qicoreencounterAdapter profiledType = new qicoreencounterAdapter(); - profiledType - .setAdaptee((org.hl7.fhir.dstu3.model.Encounter) adaptedClass - .getEncounter().getResource()); - return profiledType; - } - else - { - return null; - } - } - - public Iqicorediagnosticreport setEncounterAdapterTarget( - qicoreencounterAdapter param) - { - adaptedClass.setEncounterTarget(param.getAdaptee()); - return this; - } - public List getPresentedForm() { try @@ -793,29 +735,13 @@ public boolean hasPerformer() return adaptedClass.hasPerformer(); } - public List getPerformerPractitionerTarget() { - List items = new java.util.ArrayList<>(); - List resources = adaptedClass - .getPerformerTarget(); - for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.Practitioner) resource); - } - return items; - } - - public List getPerformer() + public List getPerformer() { return adaptedClass.getPerformer(); } - public List getPerformerOrganizationTarget() { - List items = new java.util.ArrayList<>(); - List resources = adaptedClass - .getPerformerTarget(); - for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.Organization) resource); - } - return items; + public Resource getContextTarget() { + return adaptedClass.getContextTarget(); } public boolean hasResult() @@ -874,46 +800,76 @@ public Iqicorediagnosticreport setImplicitRules(String param) return this; } - public boolean hasRequest() + public boolean hasBasedOn() { - return adaptedClass.hasRequest(); + return adaptedClass.hasBasedOn(); } - public List getRequestDiagnosticRequestTarget() { - List items = new java.util.ArrayList<>(); + public List getBasedOnCarePlanTarget() { + List items = new java.util.ArrayList<>(); List resources = adaptedClass - .getRequestTarget(); + .getBasedOnTarget(); for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.DiagnosticRequest) resource); + items.add((org.hl7.fhir.dstu3.model.CarePlan) resource); } return items; } - public List getRequest() + public List getBasedOn() { - return adaptedClass.getRequest(); + return adaptedClass.getBasedOn(); } - public List getRequestProcedureRequestTarget() { - List items = new java.util.ArrayList<>(); + public List getBasedOnImmunizationRecommendationTarget() { + List items = new java.util.ArrayList<>(); List resources = adaptedClass - .getRequestTarget(); + .getBasedOnTarget(); for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.ProcedureRequest) resource); + items.add((org.hl7.fhir.dstu3.model.ImmunizationRecommendation) resource); } return items; } - public List getRequestReferralRequestTarget() { - List items = new java.util.ArrayList<>(); + public List getBasedOnMedicationRequestTarget() { + List items = new java.util.ArrayList<>(); List resources = adaptedClass - .getRequestTarget(); + .getBasedOnTarget(); for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.ReferralRequest) resource); + items.add((org.hl7.fhir.dstu3.model.MedicationRequest) resource); } return items; } + public List getBasedOnNutritionOrderTarget() { + List items = new java.util.ArrayList<>(); + List resources = adaptedClass + .getBasedOnTarget(); + for (org.hl7.fhir.dstu3.model.Resource resource : resources) { + items.add((org.hl7.fhir.dstu3.model.NutritionOrder) resource); + } + return items; + } + + public List getBasedOnProcedureRequestTarget() { + List items = new java.util.ArrayList<>(); + List resources = adaptedClass + .getBasedOnTarget(); + for (org.hl7.fhir.dstu3.model.Resource resource : resources) { + items.add((org.hl7.fhir.dstu3.model.ProcedureRequest) resource); + } + return items; + } + + public List getBasedOnReferralRequestTarget() { + List items = new java.util.ArrayList<>(); + List resources = adaptedClass + .getBasedOnTarget(); + for (org.hl7.fhir.dstu3.model.Resource resource : resources) { + items.add((org.hl7.fhir.dstu3.model.ReferralRequest) resource); + } + return items; + } + public Type getEffective() { try @@ -999,4 +955,4 @@ public CodeableConcept addCodedDiagnosis() { return adaptedClass.addCodedDiagnosis(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicorediagnosticrequestAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicorediagnosticrequestAdapter.java deleted file mode 100644 index 27aaa9d..0000000 --- a/src/main/java/org/cqf/qicore/dstu3/qicorediagnosticrequestAdapter.java +++ /dev/null @@ -1,1083 +0,0 @@ -package org.cqf.qicore.dstu3; - -import org.hl7.fhir.dstu3.model.DiagnosticRequest; -import org.hl7.fhir.dstu3.model.DiagnosticRequest.DiagnosticRequestIntent; -import org.hl7.fhir.dstu3.model.CodeableConcept; -import org.hl7.fhir.dstu3.model.Reference; -import org.hl7.fhir.dstu3.model.Resource; -import org.hl7.fhir.dstu3.model.Patient; -import org.hl7.fhir.dstu3.model.Group; -import org.hl7.fhir.dstu3.model.Location; -import org.hl7.fhir.dstu3.model.Device; -import org.hl7.fhir.dstu3.model.Annotation; -import java.util.List; -import org.hl7.fhir.dstu3.model.IdType; -import java.lang.String; -import org.hl7.fhir.dstu3.model.Encounter; -import org.hl7.fhir.dstu3.model.Identifier; -import org.hl7.fhir.dstu3.model.Practitioner; -import org.hl7.fhir.dstu3.model.Organization; -import org.hl7.fhir.dstu3.model.RelatedPerson; -import org.hl7.fhir.dstu3.model.CodeType; -import org.hl7.fhir.dstu3.model.Type; -import org.hl7.fhir.dstu3.model.DateTimeType; -import org.hl7.fhir.dstu3.model.Period; -import org.hl7.fhir.dstu3.model.Timing; -import org.hl7.fhir.dstu3.model.UriType; -import org.hl7.fhir.dstu3.model.Enumeration; -import org.hl7.fhir.dstu3.model.*; - -public class qicorediagnosticrequestAdapter implements Iqicorediagnosticrequest -{ - - private DiagnosticRequest adaptedClass; - - public qicorediagnosticrequestAdapter() - { - this.adaptedClass = new org.hl7.fhir.dstu3.model.DiagnosticRequest(); - } - - public qicorediagnosticrequestAdapter(DiagnosticRequest adaptee) - { - this.adaptedClass = adaptee; - } - - public DiagnosticRequest getAdaptee() - { - return adaptedClass; - } - - public void setAdaptee(DiagnosticRequest param) - { - this.adaptedClass = param; - } - - public CodeableConcept getPerformerType() - { - try - { - return adaptedClass.getPerformerType(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting PerformerType", e); - } - } - - public Iqicorediagnosticrequest setPerformerType(CodeableConcept param) - { - adaptedClass.setPerformerType(param); - return this; - } - - public boolean hasPerformerType() - { - return adaptedClass.hasPerformerType(); - } - - public Reference getSubject() - { - try - { - return adaptedClass.getSubject(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Subject", e); - } - } - - public Resource getSubjectTarget() - { - try - { - return adaptedClass.getSubjectTarget(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting SubjectTarget", e); - } - } - - public boolean hasSubject() - { - return adaptedClass.hasSubject(); - } - - public Reference getSubjectPatient() - { - try - { - return adaptedClass.getSubject(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Subject", e); - } - } - - public Iqicorediagnosticrequest setSubject(Reference param) - { - adaptedClass.setSubject(param); - return this; - } - - public Patient getSubjectPatientTarget() - { - return (org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getSubjectTarget(); - } - - public Iqicorediagnosticrequest setSubjectTarget(Patient param) - { - adaptedClass.setSubjectTarget(param); - return this; - } - - public qicorepatientAdapter getSubjectPatientAdapterTarget() - { - if (adaptedClass.getSubject().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) - { - qicorepatientAdapter profiledType = new qicorepatientAdapter(); - profiledType - .setAdaptee((org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getSubject().getResource()); - return profiledType; - } - else - { - return null; - } - } - - public Iqicorediagnosticrequest setSubjectAdapterTarget( - qicorepatientAdapter param) - { - adaptedClass.setSubjectTarget(param.getAdaptee()); - return this; - } - - public Reference getSubjectGroup() - { - try - { - return adaptedClass.getSubject(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Subject", e); - } - } - - public Group getSubjectGroupTarget() - { - return (org.hl7.fhir.dstu3.model.Group) adaptedClass.getSubjectTarget(); - } - - public Iqicorediagnosticrequest setSubjectTarget(Group param) - { - adaptedClass.setSubjectTarget(param); - return this; - } - - public Reference getSubjectLocation() - { - try - { - return adaptedClass.getSubject(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Subject", e); - } - } - - public Location getSubjectLocationTarget() - { - return (org.hl7.fhir.dstu3.model.Location) adaptedClass - .getSubjectTarget(); - } - - public Iqicorediagnosticrequest setSubjectTarget(Location param) - { - adaptedClass.setSubjectTarget(param); - return this; - } - - public qicorelocationAdapter getSubjectLocationAdapterTarget() - { - if (adaptedClass.getSubject().getResource() instanceof org.hl7.fhir.dstu3.model.Location) - { - qicorelocationAdapter profiledType = new qicorelocationAdapter(); - profiledType - .setAdaptee((org.hl7.fhir.dstu3.model.Location) adaptedClass - .getSubject().getResource()); - return profiledType; - } - else - { - return null; - } - } - - public Iqicorediagnosticrequest setSubjectAdapterTarget( - qicorelocationAdapter param) - { - adaptedClass.setSubjectTarget(param.getAdaptee()); - return this; - } - - public Reference getSubjectDevice() - { - try - { - return adaptedClass.getSubject(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Subject", e); - } - } - - public Device getSubjectDeviceTarget() - { - return (org.hl7.fhir.dstu3.model.Device) adaptedClass - .getSubjectTarget(); - } - - public Iqicorediagnosticrequest setSubjectTarget(Device param) - { - adaptedClass.setSubjectTarget(param); - return this; - } - - public qicoredeviceAdapter getSubjectDeviceAdapterTarget() - { - if (adaptedClass.getSubject().getResource() instanceof org.hl7.fhir.dstu3.model.Device) - { - qicoredeviceAdapter profiledType = new qicoredeviceAdapter(); - profiledType - .setAdaptee((org.hl7.fhir.dstu3.model.Device) adaptedClass - .getSubject().getResource()); - return profiledType; - } - else - { - return null; - } - } - - public Iqicorediagnosticrequest setSubjectAdapterTarget( - qicoredeviceAdapter param) - { - adaptedClass.setSubjectTarget(param.getAdaptee()); - return this; - } - - public List getNote() - { - try - { - return adaptedClass.getNote(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Note", e); - } - } - - public Iqicorediagnosticrequest setNote(List param) - { - adaptedClass.setNote(param); - return this; - } - - public boolean hasNote() - { - return adaptedClass.hasNote(); - } - - public Iqicorediagnosticrequest addNote(Annotation param) - { - adaptedClass.addNote(param); - return this; - } - - public Annotation addNote() - { - return adaptedClass.addNote(); - } - - public CodeableConcept getCode() - { - try - { - return adaptedClass.getCode(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Code", e); - } - } - - public Iqicorediagnosticrequest setCode(CodeableConcept param) - { - adaptedClass.setCode(param); - return this; - } - - public boolean hasCode() - { - return adaptedClass.hasCode(); - } - - public boolean hasRelevantHistory() - { - return adaptedClass.hasRelevantHistory(); - } - - public List getRelevantHistory() - { - return adaptedClass.getRelevantHistory(); - } - - public List getReasonCode() - { - try - { - return adaptedClass.getReasonCode(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Reason", e); - } - } - - public Iqicorediagnosticrequest setReasonCode(List param) - { - adaptedClass.setReasonCode(param); - return this; - } - - public boolean hasReasonCode() - { - return adaptedClass.hasReasonCode(); - } - - public Iqicorediagnosticrequest addReasonCode(CodeableConcept param) - { - adaptedClass.addReasonCode(param); - return this; - } - - public CodeableConcept addReasonCode() - { - return adaptedClass.addReasonCode(); - } - - public boolean hasId() - { - return adaptedClass.hasId(); - } - - public boolean hasIdElement() - { - return adaptedClass.hasIdElement(); - } - - public IdType getIdElement() - { - try - { - return adaptedClass.getIdElement(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting IdElement", e); - } - } - - public String getId() - { - try - { - return adaptedClass.getId(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Id", e); - } - } - - public Iqicorediagnosticrequest setIdElement(IdType param) - { - adaptedClass.setIdElement(param); - return this; - } - - public Iqicorediagnosticrequest setId(String param) - { - adaptedClass.setId(param); - return this; - } - - public boolean hasContext() - { - return adaptedClass.hasContext(); - } - - public Reference getContext() - { - try - { - return adaptedClass.getContext(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Context", e); - } - } - - public Iqicorediagnosticrequest setContext(Reference param) - { - adaptedClass.setContext(param); - return this; - } - - public Encounter getContextTarget() - { - return (org.hl7.fhir.dstu3.model.Encounter) adaptedClass - .getContextTarget(); - } - - public Iqicorediagnosticrequest setContextTarget(Encounter param) - { - adaptedClass.setContextTarget(param); - return this; - } - - public qicoreencounterAdapter getContextAdapterTarget() - { - if (adaptedClass.getContext().getResource() instanceof org.hl7.fhir.dstu3.model.Encounter) - { - qicoreencounterAdapter profiledType = new qicoreencounterAdapter(); - profiledType - .setAdaptee((org.hl7.fhir.dstu3.model.Encounter) adaptedClass - .getContext().getResource()); - return profiledType; - } - else - { - return null; - } - } - - public Iqicorediagnosticrequest setContextAdapterTarget( - qicoreencounterAdapter param) - { - adaptedClass.setContextTarget(param.getAdaptee()); - return this; - } - - public List getIdentifier() - { - try - { - return adaptedClass.getIdentifier(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Identifier", e); - } - } - - public Iqicorediagnosticrequest setIdentifier(List param) - { - adaptedClass.setIdentifier(param); - return this; - } - - public boolean hasIdentifier() - { - return adaptedClass.hasIdentifier(); - } - - public Iqicorediagnosticrequest addIdentifier(Identifier param) - { - adaptedClass.addIdentifier(param); - return this; - } - - public Identifier addIdentifier() - { - return adaptedClass.addIdentifier(); - } - - public Reference getPerformer() - { - try - { - return adaptedClass.getPerformer(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Performer", e); - } - } - - public Resource getPerformerTarget() - { - try - { - return adaptedClass.getPerformerTarget(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting PerformerTarget", e); - } - } - - public boolean hasPerformer() - { - return adaptedClass.hasPerformer(); - } - - public Reference getPerformerPractitioner() - { - try - { - return adaptedClass.getPerformer(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Performer", e); - } - } - - public Iqicorediagnosticrequest setPerformer(Reference param) - { - adaptedClass.setPerformer(param); - return this; - } - - public Practitioner getPerformerPractitionerTarget() - { - return (org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getPerformerTarget(); - } - - public Iqicorediagnosticrequest setPerformerTarget(Practitioner param) - { - adaptedClass.setPerformerTarget(param); - return this; - } - - public Reference getPerformerOrganization() - { - try - { - return adaptedClass.getPerformer(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Performer", e); - } - } - - public Organization getPerformerOrganizationTarget() - { - return (org.hl7.fhir.dstu3.model.Organization) adaptedClass - .getPerformerTarget(); - } - - public Iqicorediagnosticrequest setPerformerTarget(Organization param) - { - adaptedClass.setPerformerTarget(param); - return this; - } - - public Reference getPerformerPatient() - { - try - { - return adaptedClass.getPerformer(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Performer", e); - } - } - - public Patient getPerformerPatientTarget() - { - return (org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getPerformerTarget(); - } - - public Iqicorediagnosticrequest setPerformerTarget(Patient param) - { - adaptedClass.setPerformerTarget(param); - return this; - } - - public Reference getPerformerDevice() - { - try - { - return adaptedClass.getPerformer(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Performer", e); - } - } - - public Device getPerformerDeviceTarget() - { - return (org.hl7.fhir.dstu3.model.Device) adaptedClass - .getPerformerTarget(); - } - - public Iqicorediagnosticrequest setPerformerTarget(Device param) - { - adaptedClass.setPerformerTarget(param); - return this; - } - - public Reference getPerformerRelatedPerson() - { - try - { - return adaptedClass.getPerformer(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Performer", e); - } - } - - public RelatedPerson getPerformerRelatedPersonTarget() - { - return (org.hl7.fhir.dstu3.model.RelatedPerson) adaptedClass - .getPerformerTarget(); - } - - public Iqicorediagnosticrequest setPerformerTarget(RelatedPerson param) - { - adaptedClass.setPerformerTarget(param); - return this; - } - - public Enumeration getIntentElement() - { - try - { - return adaptedClass.getIntentElement(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Stage", e); - } - } - - public Iqicorediagnosticrequest setIntentElement(Enumeration param) - { - adaptedClass.setIntentElement(param); - return this; - } - - public boolean hasIntent() - { - return adaptedClass.hasIntent(); - } - - public Identifier getRequisition() - { - try - { - return adaptedClass.getRequisition(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Requisition", e); - } - } - - public Iqicorediagnosticrequest setRequisition(Identifier param) - { - adaptedClass.setRequisition(param); - return this; - } - - public boolean hasRequisition() - { - return adaptedClass.hasRequisition(); - } - - public boolean hasLanguage() - { - return adaptedClass.hasLanguage(); - } - - public boolean hasLanguageElement() - { - return adaptedClass.hasLanguageElement(); - } - - public CodeType getLanguageElement() - { - try - { - return adaptedClass.getLanguageElement(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting LanguageElement", e); - } - } - - public String getLanguage() - { - try - { - return adaptedClass.getLanguage(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Language", e); - } - } - - public Iqicorediagnosticrequest setLanguageElement(CodeType param) - { - adaptedClass.setLanguageElement(param); - return this; - } - - public Iqicorediagnosticrequest setLanguage(String param) - { - adaptedClass.setLanguage(param); - return this; - } - - public boolean hasRequester() - { - return adaptedClass.hasRequester(); - } - - public Reference getRequester() - { - try - { - return adaptedClass.getRequester(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Requester", e); - } - } - - public Iqicorediagnosticrequest setRequester(Reference param) - { - adaptedClass.setRequester(param); - return this; - } - - public Practitioner getRequesterTarget() - { - return (org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getRequesterTarget(); - } - - public Iqicorediagnosticrequest setRequesterTarget(Practitioner param) - { - adaptedClass.setRequesterTarget(param); - return this; - } - - public qicorepractitionerAdapter getRequesterAdapterTarget() - { - if (adaptedClass.getRequester().getResource() instanceof org.hl7.fhir.dstu3.model.Practitioner) - { - qicorepractitionerAdapter profiledType = new qicorepractitionerAdapter(); - profiledType - .setAdaptee((org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getRequester().getResource()); - return profiledType; - } - else - { - return null; - } - } - - public Iqicorediagnosticrequest setRequesterAdapterTarget( - qicorepractitionerAdapter param) - { - adaptedClass.setRequesterTarget(param.getAdaptee()); - return this; - } - - public boolean hasReplaces() - { - return adaptedClass.hasReplaces(); - } - - public List getReplaces() - { - return adaptedClass.getReplaces(); - } - - public boolean hasBasedOn() - { - return adaptedClass.hasBasedOn(); - } - - public List getBasedOn() - { - return adaptedClass.getBasedOn(); - } - - public boolean hasDefinition() - { - return adaptedClass.hasDefinition(); - } - - public List getDefinition() - { - return adaptedClass.getDefinition(); - } - - public Type getOccurrence() - { - try - { - return adaptedClass.getOccurrence(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Occurrence", e); - } - } - - public Iqicorediagnosticrequest setOccurrence(Type param) - { - adaptedClass.setOccurrence(param); - return this; - } - - public DateTimeType getOccurrenceDateTimeType() - { - try - { - return adaptedClass.getOccurrenceDateTimeType(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting OccurrenceDateTimeType", - e); - } - } - - public boolean hasOccurrenceDateTimeType() - { - return adaptedClass.hasOccurrenceDateTimeType(); - } - - public Period getOccurrencePeriod() - { - try - { - return adaptedClass.getOccurrencePeriod(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting OccurrencePeriod", e); - } - } - - public boolean hasOccurrencePeriod() - { - return adaptedClass.hasOccurrencePeriod(); - } - - public Timing getOccurrenceTiming() - { - try - { - return adaptedClass.getOccurrenceTiming(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting OccurrenceTiming", e); - } - } - - public boolean hasOccurrenceTiming() - { - return adaptedClass.hasOccurrenceTiming(); - } - - public boolean hasImplicitRules() - { - return adaptedClass.hasImplicitRules(); - } - - public boolean hasImplicitRulesElement() - { - return adaptedClass.hasImplicitRulesElement(); - } - - public UriType getImplicitRulesElement() - { - try - { - return adaptedClass.getImplicitRulesElement(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting ImplicitRulesElement", e); - } - } - - public String getImplicitRules() - { - try - { - return adaptedClass.getImplicitRules(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting ImplicitRules", e); - } - } - - public Iqicorediagnosticrequest setImplicitRulesElement(UriType param) - { - adaptedClass.setImplicitRulesElement(param); - return this; - } - - public Iqicorediagnosticrequest setImplicitRules(String param) - { - adaptedClass.setImplicitRules(param); - return this; - } - - public boolean hasSupportingInformation() - { - return adaptedClass.hasSupportingInformation(); - } - - public List getSupportingInformationObservationTarget() { - List items = new java.util.ArrayList<>(); - List resources = adaptedClass - .getSupportingInformationTarget(); - for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.Observation) resource); - } - return items; - } - - public List getSupportingInformation() - { - return adaptedClass.getSupportingInformation(); - } - - public List getSupportingInformationConditionTarget() { - List items = new java.util.ArrayList<>(); - List resources = adaptedClass - .getSupportingInformationTarget(); - for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.Condition) resource); - } - return items; - } - - public List getSupportingInformationDocumentReferenceTarget() { - List items = new java.util.ArrayList<>(); - List resources = adaptedClass - .getSupportingInformationTarget(); - for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.DocumentReference) resource); - } - return items; - } - - public List getContained() - { - try - { - return adaptedClass.getContained(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Contained", e); - } - } - - public Iqicorediagnosticrequest setContained(List param) - { - adaptedClass.setContained(param); - return this; - } - - public boolean hasContained() - { - return adaptedClass.hasContained(); - } - - public Iqicorediagnosticrequest addContained(Resource param) - { - adaptedClass.addContained(param); - return this; - } - - public boolean hasStatus() - { - return adaptedClass.hasStatus(); - } - - public boolean hasStatusElement() - { - return adaptedClass.hasStatusElement(); - } - - public DiagnosticRequest.DiagnosticRequestStatus getStatus() - { - try - { - return adaptedClass.getStatus(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Status", e); - } - } - - public Enumeration getStatusElement() - { - try - { - return adaptedClass.getStatusElement(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting StatusElement", e); - } - } - - public Iqicorediagnosticrequest setStatus( - DiagnosticRequest.DiagnosticRequestStatus param) - { - adaptedClass.setStatus(param); - return this; - } - - public Iqicorediagnosticrequest setStatusElement( - Enumeration param) - { - adaptedClass.setStatusElement(param); - return this; - } -} \ No newline at end of file diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoreencounterAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoreencounterAdapter.java index 30999e3..0ff8aff 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoreencounterAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoreencounterAdapter.java @@ -77,36 +77,11 @@ public List getIncomingReferral() return adaptedClass.getIncomingReferral(); } - public boolean hasIndication() + public boolean hasDiagnosis() { - return adaptedClass.hasIndication(); + return adaptedClass.hasDiagnosis(); } - public List getIndicationConditionTarget() { - List items = new java.util.ArrayList<>(); - List resources = adaptedClass - .getIndicationTarget(); - for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.Condition) resource); - } - return items; - } - - public List getIndication() - { - return adaptedClass.getIndication(); - } - - public List getIndicationProcedureTarget() { - List items = new java.util.ArrayList<>(); - List resources = adaptedClass - .getIndicationTarget(); - for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.Procedure) resource); - } - return items; - } - public boolean hasEpisodeOfCare() { return adaptedClass.hasEpisodeOfCare(); @@ -301,7 +276,7 @@ public Encounter.EncounterParticipantComponent addParticipant() return adaptedClass.addParticipant(); } - public List getStatusHistory() + public List getStatusHistory() { try { @@ -314,7 +289,7 @@ public List getStatusHistory() } public qicoreencounterAdapter setStatusHistory( - List param) + List param) { adaptedClass.setStatusHistory(param); return this; @@ -326,13 +301,13 @@ public boolean hasStatusHistory() } public qicoreencounterAdapter addStatusHistory( - Encounter.EncounterStatusHistoryComponent param) + Encounter.StatusHistoryComponent param) { adaptedClass.addStatusHistory(param); return this; } - public Encounter.EncounterStatusHistoryComponent addStatusHistory() + public Encounter.StatusHistoryComponent addStatusHistory() { return adaptedClass.addStatusHistory(); } @@ -759,14 +734,14 @@ public boolean hasPriority() public boolean hasPatient() { - return adaptedClass.hasPatient(); + return adaptedClass.hasSubject(); } public Reference getPatient() { try { - return adaptedClass.getPatient(); + return adaptedClass.getSubject(); } catch (Exception e) { @@ -776,30 +751,30 @@ public Reference getPatient() public Iqicoreencounter setPatient(Reference param) { - adaptedClass.setPatient(param); + adaptedClass.setSubject(param); return this; } public Patient getPatientTarget() { return (org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getPatientTarget(); + .getSubjectTarget(); } public Iqicoreencounter setPatientTarget(Patient param) { - adaptedClass.setPatientTarget(param); + adaptedClass.setSubjectTarget(param); return this; } public qicorepatientAdapter getPatientAdapterTarget() { - if (adaptedClass.getPatient().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) + if (adaptedClass.getSubject().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) { qicorepatientAdapter profiledType = new qicorepatientAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getPatient().getResource()); + .getSubject().getResource()); return profiledType; } else @@ -810,7 +785,7 @@ public qicorepatientAdapter getPatientAdapterTarget() public Iqicoreencounter setPatientAdapterTarget(qicorepatientAdapter param) { - adaptedClass.setPatientTarget(param.getAdaptee()); + adaptedClass.setSubjectTarget(param.getAdaptee()); return this; } @@ -906,4 +881,4 @@ public Iqicoreencounter setStatusElement( adaptedClass.setStatusElement(param); return this; } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoregoalAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoregoalAdapter.java index 22012f3..168ffc1 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoregoalAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoregoalAdapter.java @@ -213,11 +213,11 @@ public Annotation addNote() return adaptedClass.addNote(); } - public List getOutcome() + public List getOutcomeCode() { try { - return adaptedClass.getOutcome(); + return adaptedClass.getOutcomeCode(); } catch (Exception e) { @@ -225,28 +225,23 @@ public List getOutcome() } } - public qicoregoalAdapter setOutcome(List param) + public qicoregoalAdapter setOutcomeCode(List param) { - adaptedClass.setOutcome(param); + adaptedClass.setOutcomeCode(param); return this; } - public boolean hasOutcome() + public boolean hasOutcomeCode() { - return adaptedClass.hasOutcome(); + return adaptedClass.hasOutcomeCode(); } - public qicoregoalAdapter addOutcome(Goal.GoalOutcomeComponent param) + public qicoregoalAdapter addOutcomeCode(CodeableConcept param) { - adaptedClass.addOutcome(param); + adaptedClass.addOutcomeCode(param); return this; } - public Goal.GoalOutcomeComponent addOutcome() - { - return adaptedClass.addOutcome(); - } - public List getIdentifier() { try @@ -549,7 +544,7 @@ public Iqicoregoal setId(String param) return this; } - public Type getTarget() + public Goal.GoalTargetComponent getTarget() { try { @@ -561,51 +556,17 @@ public Type getTarget() } } - public Iqicoregoal setTarget(Type param) + public Iqicoregoal setTarget(Goal.GoalTargetComponent param) { adaptedClass.setTarget(param); return this; } - public DateType getTargetDateType() - { - try - { - return adaptedClass.getTargetDateType(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting TargetDateType", e); - } - } - - public boolean hasTargetDateType() - { - return adaptedClass.hasTargetDateType(); - } - - public Duration getTargetDuration() - { - try - { - return adaptedClass.getTargetDuration(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting TargetDuration", e); - } - } - - public boolean hasTargetDuration() - { - return adaptedClass.hasTargetDuration(); - } - - public List getStatusReason() + public StringType getStatusReasonElement() { try { - return adaptedClass.getStatusReason(); + return adaptedClass.getStatusReasonElement(); } catch (Exception e) { @@ -613,28 +574,17 @@ public List getStatusReason() } } - public Iqicoregoal setStatusReason(List param) + public Iqicoregoal setStatusReasonElement(StringType param) { - adaptedClass.setStatusReason(param); + adaptedClass.setStatusReasonElement(param); return this; } - public boolean hasStatusReason() + public boolean hasStatusReasonElement() { return adaptedClass.hasStatusReason(); } - public Iqicoregoal addStatusReason(CodeableConcept param) - { - adaptedClass.addStatusReason(param); - return this; - } - - public CodeableConcept addStatusReason() - { - return adaptedClass.addStatusReason(); - } - public boolean hasImplicitRules() { return adaptedClass.hasImplicitRules(); @@ -767,12 +717,12 @@ public List getAddressesMedicationStatementTarget() { return items; } - public List getAddressesNutritionRequestTarget() { - List items = new java.util.ArrayList<>(); + public List getAddressesNutritionOrderTarget() { + List items = new java.util.ArrayList<>(); List resources = adaptedClass .getAddressesTarget(); for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.NutritionRequest) resource); + items.add((org.hl7.fhir.dstu3.model.NutritionOrder) resource); } return items; } @@ -1009,4 +959,4 @@ public CodeableConcept addCategory() { return adaptedClass.addCategory(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoreimagingstudyAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoreimagingstudyAdapter.java index ac455ee..df6071e 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoreimagingstudyAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoreimagingstudyAdapter.java @@ -48,42 +48,6 @@ public void setAdaptee(ImagingStudy param) this.adaptedClass = param; } - public List getBaseLocation() - { - try - { - return adaptedClass.getBaseLocation(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting BaseLocation", e); - } - } - - public qicoreimagingstudyAdapter setBaseLocation( - List param) - { - adaptedClass.setBaseLocation(param); - return this; - } - - public boolean hasBaseLocation() - { - return adaptedClass.hasBaseLocation(); - } - - public qicoreimagingstudyAdapter addBaseLocation( - ImagingStudy.StudyBaseLocationComponent param) - { - adaptedClass.addBaseLocation(param); - return this; - } - - public ImagingStudy.StudyBaseLocationComponent addBaseLocation() - { - return adaptedClass.addBaseLocation(); - } - public boolean hasPatient() { return adaptedClass.hasPatient(); @@ -539,16 +503,6 @@ public boolean hasAccession() return adaptedClass.hasAccession(); } - public boolean hasProcedure() - { - return adaptedClass.hasProcedure(); - } - - public List getProcedure() - { - return adaptedClass.getProcedure(); - } - public Range getRadiationDose() { List extensions = adaptedClass @@ -877,4 +831,4 @@ public Coding addModalityList() { return adaptedClass.addModalityList(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoreimmunizationAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoreimmunizationAdapter.java index 7cdd661..1fc94fa 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoreimmunizationAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoreimmunizationAdapter.java @@ -49,64 +49,6 @@ public void setAdaptee(Immunization param) this.adaptedClass = param; } - public boolean hasRequester() - { - return adaptedClass.hasRequester(); - } - - public Reference getRequester() - { - try - { - return adaptedClass.getRequester(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Requester", e); - } - } - - public Iqicoreimmunization setRequester(Reference param) - { - adaptedClass.setRequester(param); - return this; - } - - public Practitioner getRequesterTarget() - { - return (org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getRequesterTarget(); - } - - public Iqicoreimmunization setRequesterTarget(Practitioner param) - { - adaptedClass.setRequesterTarget(param); - return this; - } - - public qicorepractitionerAdapter getRequesterAdapterTarget() - { - if (adaptedClass.getRequester().getResource() instanceof org.hl7.fhir.dstu3.model.Practitioner) - { - qicorepractitionerAdapter profiledType = new qicorepractitionerAdapter(); - profiledType - .setAdaptee((org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getRequester().getResource()); - return profiledType; - } - else - { - return null; - } - } - - public Iqicoreimmunization setRequesterAdapterTarget( - qicorepractitionerAdapter param) - { - adaptedClass.setRequesterTarget(param.getAdaptee()); - return this; - } - public boolean hasLocation() { return adaptedClass.hasLocation(); @@ -624,21 +566,21 @@ public boolean hasRoute() return adaptedClass.hasRoute(); } - public boolean hasWasNotGiven() + public boolean hasNotGiven() { - return adaptedClass.hasWasNotGiven(); + return adaptedClass.hasNotGiven(); } - public boolean hasWasNotGivenElement() + public boolean hasNotGivenElement() { - return adaptedClass.hasWasNotGivenElement(); + return adaptedClass.hasNotGivenElement(); } - public BooleanType getWasNotGivenElement() + public BooleanType getNotGivenElement() { try { - return adaptedClass.getWasNotGivenElement(); + return adaptedClass.getNotGivenElement(); } catch (Exception e) { @@ -646,27 +588,27 @@ public BooleanType getWasNotGivenElement() } } - public Boolean getWasNotGiven() + public Boolean getNotGiven() { try { - return adaptedClass.getWasNotGiven(); + return adaptedClass.getNotGiven(); } catch (Exception e) { - throw new RuntimeException("Error getting WasNotGiven", e); + throw new RuntimeException("Error getting NotGiven", e); } } - public Iqicoreimmunization setWasNotGivenElement(BooleanType param) + public Iqicoreimmunization setNotGivenElement(BooleanType param) { - adaptedClass.setWasNotGivenElement(param); + adaptedClass.setNotGivenElement(param); return this; } - public Iqicoreimmunization setWasNotGiven(Boolean param) + public Iqicoreimmunization setNotGiven(Boolean param) { - adaptedClass.setWasNotGiven(param); + adaptedClass.setNotGiven(param); return this; } @@ -728,16 +670,16 @@ public Iqicoreimmunization setPatientAdapterTarget( return this; } - public boolean hasPerformer() + public boolean hasPractitioner() { - return adaptedClass.hasPerformer(); + return adaptedClass.hasPractitioner(); } - public Reference getPerformer() + public List getPractitioner() { try { - return adaptedClass.getPerformer(); + return adaptedClass.getPractitioner(); } catch (Exception e) { @@ -745,44 +687,9 @@ public Reference getPerformer() } } - public Iqicoreimmunization setPerformer(Reference param) - { - adaptedClass.setPerformer(param); - return this; - } - - public Practitioner getPerformerTarget() - { - return (org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getPerformerTarget(); - } - - public Iqicoreimmunization setPerformerTarget(Practitioner param) - { - adaptedClass.setPerformerTarget(param); - return this; - } - - public qicorepractitionerAdapter getPerformerAdapterTarget() - { - if (adaptedClass.getPerformer().getResource() instanceof org.hl7.fhir.dstu3.model.Practitioner) - { - qicorepractitionerAdapter profiledType = new qicorepractitionerAdapter(); - profiledType - .setAdaptee((org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getPerformer().getResource()); - return profiledType; - } - else - { - return null; - } - } - - public Iqicoreimmunization setPerformerAdapterTarget( - qicorepractitionerAdapter param) + public Iqicoreimmunization setPractitioner(List param) { - adaptedClass.setPerformerTarget(param.getAdaptee()); + adaptedClass.setPractitioner(param); return this; } @@ -1050,4 +957,4 @@ public Identifier addIdentifier() { return adaptedClass.addIdentifier(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationAdapter.java index cd9c95c..1352962 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationAdapter.java @@ -38,30 +38,6 @@ public void setAdaptee(Medication param) this.adaptedClass = param; } - public Medication.MedicationProductComponent getProduct() - { - try - { - return adaptedClass.getProduct(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Product", e); - } - } - - public qicoremedicationAdapter setProduct( - Medication.MedicationProductComponent param) - { - adaptedClass.setProduct(param); - return this; - } - - public boolean hasProduct() - { - return adaptedClass.hasProduct(); - } - public boolean hasImplicitRules() { return adaptedClass.hasImplicitRules(); @@ -379,4 +355,4 @@ public Iqicoremedication setId(String param) adaptedClass.setId(param); return this; } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationIngredientAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationIngredientAdapter.java index eaa57a8..ac6f0b3 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationIngredientAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationIngredientAdapter.java @@ -14,25 +14,25 @@ public class qicoremedicationIngredientAdapter { - private Medication.MedicationProductIngredientComponent adaptedClass; + private Medication.MedicationIngredientComponent adaptedClass; public qicoremedicationIngredientAdapter() { - this.adaptedClass = new org.hl7.fhir.dstu3.model.Medication.MedicationProductIngredientComponent(); + this.adaptedClass = new org.hl7.fhir.dstu3.model.Medication.MedicationIngredientComponent(); } public qicoremedicationIngredientAdapter( - Medication.MedicationProductIngredientComponent adaptee) + Medication.MedicationIngredientComponent adaptee) { this.adaptedClass = adaptee; } - public Medication.MedicationProductIngredientComponent getAdaptee() + public Medication.MedicationIngredientComponent getAdaptee() { return adaptedClass; } - public void setAdaptee(Medication.MedicationProductIngredientComponent param) + public void setAdaptee(Medication.MedicationIngredientComponent param) { this.adaptedClass = param; } @@ -219,4 +219,4 @@ public boolean hasAmount() { return adaptedClass.hasAmount(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationadministrationAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationadministrationAdapter.java index 3726e45..87b1174 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationadministrationAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationadministrationAdapter.java @@ -5,9 +5,8 @@ import java.lang.String; import org.hl7.fhir.dstu3.model.Reference; import org.hl7.fhir.dstu3.model.Resource; -import org.hl7.fhir.dstu3.model.Practitioner; import org.hl7.fhir.dstu3.model.Patient; -import org.hl7.fhir.dstu3.model.RelatedPerson; + import java.util.List; import org.hl7.fhir.dstu3.model.CodeableConcept; import org.hl7.fhir.dstu3.model.Annotation; @@ -120,7 +119,7 @@ public Iqicoremedicationadministration setLanguage(String param) return this; } - public Reference getPerformer() + public List getPerformer() { try { @@ -132,171 +131,17 @@ public Reference getPerformer() } } - public Resource getPerformerTarget() - { - try - { - return adaptedClass.getPerformerTarget(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting PerformerTarget", e); - } - } - public boolean hasPerformer() { return adaptedClass.hasPerformer(); } - public Reference getPerformerPractitioner() - { - try - { - return adaptedClass.getPerformer(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Performer", e); - } - } - - public Iqicoremedicationadministration setPerformer(Reference param) + public Iqicoremedicationadministration setPerformer(List param) { adaptedClass.setPerformer(param); return this; } - public Practitioner getPerformerPractitionerTarget() - { - return (org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getPerformerTarget(); - } - - public Iqicoremedicationadministration setPerformerTarget(Practitioner param) - { - adaptedClass.setPerformerTarget(param); - return this; - } - - public qicorepractitionerAdapter getPerformerPractitionerAdapterTarget() - { - if (adaptedClass.getPerformer().getResource() instanceof org.hl7.fhir.dstu3.model.Practitioner) - { - qicorepractitionerAdapter profiledType = new qicorepractitionerAdapter(); - profiledType - .setAdaptee((org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getPerformer().getResource()); - return profiledType; - } - else - { - return null; - } - } - - public Iqicoremedicationadministration setPerformerAdapterTarget( - qicorepractitionerAdapter param) - { - adaptedClass.setPerformerTarget(param.getAdaptee()); - return this; - } - - public Reference getPerformerPatient() - { - try - { - return adaptedClass.getPerformer(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Performer", e); - } - } - - public Patient getPerformerPatientTarget() - { - return (org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getPerformerTarget(); - } - - public Iqicoremedicationadministration setPerformerTarget(Patient param) - { - adaptedClass.setPerformerTarget(param); - return this; - } - - public qicorepatientAdapter getPerformerPatientAdapterTarget() - { - if (adaptedClass.getPerformer().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) - { - qicorepatientAdapter profiledType = new qicorepatientAdapter(); - profiledType - .setAdaptee((org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getPerformer().getResource()); - return profiledType; - } - else - { - return null; - } - } - - public Iqicoremedicationadministration setPerformerAdapterTarget( - qicorepatientAdapter param) - { - adaptedClass.setPerformerTarget(param.getAdaptee()); - return this; - } - - public Reference getPerformerRelatedPerson() - { - try - { - return adaptedClass.getPerformer(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Performer", e); - } - } - - public RelatedPerson getPerformerRelatedPersonTarget() - { - return (org.hl7.fhir.dstu3.model.RelatedPerson) adaptedClass - .getPerformerTarget(); - } - - public Iqicoremedicationadministration setPerformerTarget( - RelatedPerson param) - { - adaptedClass.setPerformerTarget(param); - return this; - } - - public qicorerelatedpersonAdapter getPerformerRelatedPersonAdapterTarget() - { - if (adaptedClass.getPerformer().getResource() instanceof org.hl7.fhir.dstu3.model.RelatedPerson) - { - qicorerelatedpersonAdapter profiledType = new qicorerelatedpersonAdapter(); - profiledType - .setAdaptee((org.hl7.fhir.dstu3.model.RelatedPerson) adaptedClass - .getPerformer().getResource()); - return profiledType; - } - else - { - return null; - } - } - - public Iqicoremedicationadministration setPerformerAdapterTarget( - qicorerelatedpersonAdapter param) - { - adaptedClass.setPerformerTarget(param.getAdaptee()); - return this; - } - public List getEventHistory() { try @@ -335,14 +180,14 @@ public Reference addEventHistory() public boolean hasPatient() { - return adaptedClass.hasPatient(); + return adaptedClass.hasSubject(); } public Reference getPatient() { try { - return adaptedClass.getPatient(); + return adaptedClass.getSubject(); } catch (Exception e) { @@ -352,30 +197,30 @@ public Reference getPatient() public Iqicoremedicationadministration setPatient(Reference param) { - adaptedClass.setPatient(param); + adaptedClass.setSubject(param); return this; } public Patient getPatientTarget() { return (org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getPatientTarget(); + .getSubjectTarget(); } public Iqicoremedicationadministration setPatientTarget(Patient param) { - adaptedClass.setPatientTarget(param); + adaptedClass.setSubjectTarget(param); return this; } public qicorepatientAdapter getPatientAdapterTarget() { - if (adaptedClass.getPatient().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) + if (adaptedClass.getSubject().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) { qicorepatientAdapter profiledType = new qicorepatientAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getPatient().getResource()); + .getSubject().getResource()); return profiledType; } else @@ -387,7 +232,7 @@ public qicorepatientAdapter getPatientAdapterTarget() public Iqicoremedicationadministration setPatientAdapterTarget( qicorepatientAdapter param) { - adaptedClass.setPatientTarget(param.getAdaptee()); + adaptedClass.setSubjectTarget(param.getAdaptee()); return this; } @@ -461,11 +306,11 @@ public Annotation addNote() return adaptedClass.addNote(); } - public List getReasonGiven() + public List getReasonCode() { try { - return adaptedClass.getReasonGiven(); + return adaptedClass.getReasonCode(); } catch (Exception e) { @@ -473,27 +318,27 @@ public List getReasonGiven() } } - public Iqicoremedicationadministration setReasonGiven( + public Iqicoremedicationadministration setReasonCode( List param) { - adaptedClass.setReasonGiven(param); + adaptedClass.setReasonCode(param); return this; } public boolean hasReasonGiven() { - return adaptedClass.hasReasonGiven(); + return adaptedClass.hasReasonCode(); } - public Iqicoremedicationadministration addReasonGiven(CodeableConcept param) + public Iqicoremedicationadministration addReasonCode(CodeableConcept param) { - adaptedClass.addReasonGiven(param); + adaptedClass.addReasonCode(param); return this; } - public CodeableConcept addReasonGiven() + public CodeableConcept addReasonCode() { - return adaptedClass.addReasonGiven(); + return adaptedClass.addReasonCode(); } public Type getMedication() @@ -789,14 +634,14 @@ public List getDevice() public boolean hasEncounter() { - return adaptedClass.hasEncounter(); + return adaptedClass.hasContext(); } public Reference getEncounter() { try { - return adaptedClass.getEncounter(); + return adaptedClass.getContext(); } catch (Exception e) { @@ -806,30 +651,30 @@ public Reference getEncounter() public Iqicoremedicationadministration setEncounter(Reference param) { - adaptedClass.setEncounter(param); + adaptedClass.setContext(param); return this; } public Encounter getEncounterTarget() { return (org.hl7.fhir.dstu3.model.Encounter) adaptedClass - .getEncounterTarget(); + .getContextTarget(); } public Iqicoremedicationadministration setEncounterTarget(Encounter param) { - adaptedClass.setEncounterTarget(param); + adaptedClass.setContextTarget(param); return this; } public qicoreencounterAdapter getEncounterAdapterTarget() { - if (adaptedClass.getEncounter().getResource() instanceof org.hl7.fhir.dstu3.model.Encounter) + if (adaptedClass.getContext().getResource() instanceof org.hl7.fhir.dstu3.model.Encounter) { qicoreencounterAdapter profiledType = new qicoreencounterAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Encounter) adaptedClass - .getEncounter().getResource()); + .getContext().getResource()); return profiledType; } else @@ -841,7 +686,7 @@ public qicoreencounterAdapter getEncounterAdapterTarget() public Iqicoremedicationadministration setEncounterAdapterTarget( qicoreencounterAdapter param) { - adaptedClass.setEncounterTarget(param.getAdaptee()); + adaptedClass.setContextTarget(param.getAdaptee()); return this; } @@ -997,4 +842,4 @@ public Iqicoremedicationadministration setImplicitRules(String param) adaptedClass.setImplicitRules(param); return this; } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationdispenseAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationdispenseAdapter.java index b74bf3f..546ffcc 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationdispenseAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationdispenseAdapter.java @@ -1,28 +1,12 @@ package org.cqf.qicore.dstu3; -import org.hl7.fhir.dstu3.model.MedicationDispense; -import org.hl7.fhir.dstu3.model.IntegerType; +import org.hl7.fhir.dstu3.model.*; + import java.util.List; -import org.hl7.fhir.dstu3.model.Reference; -import org.hl7.fhir.dstu3.model.Practitioner; -import org.hl7.fhir.dstu3.model.Annotation; -import org.hl7.fhir.dstu3.model.Resource; -import org.hl7.fhir.dstu3.model.Enumeration; -import org.hl7.fhir.dstu3.model.SimpleQuantity; -import org.hl7.fhir.dstu3.model.Organization; -import org.hl7.fhir.dstu3.model.CodeType; import java.lang.String; -import org.hl7.fhir.dstu3.model.Patient; -import org.hl7.fhir.dstu3.model.IdType; -import org.hl7.fhir.dstu3.model.UriType; + import org.hl7.fhir.dstu3.model.MedicationDispense.MedicationDispenseSubstitutionComponent; -import org.hl7.fhir.dstu3.model.Period; -import org.hl7.fhir.dstu3.model.CodeableConcept; -import org.hl7.fhir.dstu3.model.DosageInstruction; -import org.hl7.fhir.dstu3.model.Identifier; -import org.hl7.fhir.dstu3.model.Location; -import org.hl7.fhir.dstu3.model.Type; -import org.hl7.fhir.dstu3.model.Medication; +import org.hl7.fhir.dstu3.model.Dosage; public class qicoremedicationdispenseAdapter implements Iqicoremedicationdispense { @@ -78,16 +62,16 @@ public Iqicoremedicationdispense setRefillsRemaining(IntegerType param) return this; } - public boolean hasDispenser() + public boolean hasPerformer() { - return adaptedClass.hasDispenser(); + return adaptedClass.hasPerformer(); } - public Reference getDispenser() + public List getPerformer() { try { - return adaptedClass.getDispenser(); + return adaptedClass.getPerformer(); } catch (Exception e) { @@ -95,44 +79,9 @@ public Reference getDispenser() } } - public Iqicoremedicationdispense setDispenser(Reference param) - { - adaptedClass.setDispenser(param); - return this; - } - - public Practitioner getDispenserTarget() - { - return (org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getDispenserTarget(); - } - - public Iqicoremedicationdispense setDispenserTarget(Practitioner param) - { - adaptedClass.setDispenserTarget(param); - return this; - } - - public qicorepractitionerAdapter getDispenserAdapterTarget() - { - if (adaptedClass.getDispenser().getResource() instanceof org.hl7.fhir.dstu3.model.Practitioner) - { - qicorepractitionerAdapter profiledType = new qicorepractitionerAdapter(); - profiledType - .setAdaptee((org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getDispenser().getResource()); - return profiledType; - } - else - { - return null; - } - } - - public Iqicoremedicationdispense setDispenserAdapterTarget( - qicorepractitionerAdapter param) + public Iqicoremedicationdispense setPerformer(List param) { - adaptedClass.setDispenserTarget(param.getAdaptee()); + adaptedClass.setPerformer(param); return this; } @@ -172,9 +121,9 @@ public Annotation addNote() public List getWrappedDosageInstruction() { List wrappedItems = new java.util.ArrayList<>(); - List items = adaptedClass + List items = adaptedClass .getDosageInstruction(); - for (org.hl7.fhir.dstu3.model.DosageInstruction item : items) { + for (org.hl7.fhir.dstu3.model.Dosage item : items) { wrappedItems .add(new qicoremedicationdispenseDosageInstructionAdapter(item)); } @@ -183,7 +132,7 @@ public List getWrappedDosageIn public Iqicoremedicationdispense setWrappedDosageInstruction( List param) { - List items = new java.util.ArrayList<>(); + List items = new java.util.ArrayList<>(); for (qicoremedicationdispenseDosageInstructionAdapter item : param) { items.add(item.getAdaptee()); } @@ -203,13 +152,13 @@ public Iqicoremedicationdispense addWrappedDosageInstruction( public qicoremedicationdispenseDosageInstructionAdapter addWrappedDosageInstruction() { - org.hl7.fhir.dstu3.model.DosageInstruction item = new org.hl7.fhir.dstu3.model.DosageInstruction(); + org.hl7.fhir.dstu3.model.Dosage item = new org.hl7.fhir.dstu3.model.Dosage(); adaptedClass.addDosageInstruction(item); return new qicoremedicationdispenseDosageInstructionAdapter( item); } - public List getDosageInstruction() + public List getDosageInstruction() { try { @@ -222,7 +171,7 @@ public List getDosageInstruction() } public Iqicoremedicationdispense setDosageInstruction( - List param) + List param) { adaptedClass.setDosageInstruction(param); return this; @@ -234,13 +183,13 @@ public boolean hasDosageInstruction() } public Iqicoremedicationdispense addDosageInstruction( - DosageInstruction param) + Dosage param) { adaptedClass.addDosageInstruction(param); return this; } - public DosageInstruction addDosageInstruction() + public Dosage addDosageInstruction() { return adaptedClass.addDosageInstruction(); } @@ -415,43 +364,6 @@ public boolean hasSubstitution() return adaptedClass.hasSubstitution(); } - public boolean hasDispensingOrganization() - { - return adaptedClass.hasDispensingOrganization(); - } - - public Reference getDispensingOrganization() - { - try - { - return adaptedClass.getDispensingOrganization(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting DispensingOrganization", - e); - } - } - - public Iqicoremedicationdispense setDispensingOrganization(Reference param) - { - adaptedClass.setDispensingOrganization(param); - return this; - } - - public Organization getDispensingOrganizationTarget() - { - return (org.hl7.fhir.dstu3.model.Organization) adaptedClass - .getDispensingOrganizationTarget(); - } - - public Iqicoremedicationdispense setDispensingOrganizationTarget( - Organization param) - { - adaptedClass.setDispensingOrganizationTarget(param); - return this; - } - public boolean hasLanguage() { return adaptedClass.hasLanguage(); @@ -500,14 +412,14 @@ public Iqicoremedicationdispense setLanguage(String param) public boolean hasPatient() { - return adaptedClass.hasPatient(); + return adaptedClass.hasSubject(); } public Reference getPatient() { try { - return adaptedClass.getPatient(); + return adaptedClass.getSubject(); } catch (Exception e) { @@ -517,30 +429,30 @@ public Reference getPatient() public Iqicoremedicationdispense setPatient(Reference param) { - adaptedClass.setPatient(param); + adaptedClass.setSubject(param); return this; } public Patient getPatientTarget() { return (org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getPatientTarget(); + .getSubjectTarget(); } public Iqicoremedicationdispense setPatientTarget(Patient param) { - adaptedClass.setPatientTarget(param); + adaptedClass.setSubjectTarget(param); return this; } public qicorepatientAdapter getPatientAdapterTarget() { - if (adaptedClass.getPatient().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) + if (adaptedClass.getSubject().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) { qicorepatientAdapter profiledType = new qicorepatientAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getPatient().getResource()); + .getSubject().getResource()); return profiledType; } else @@ -552,7 +464,7 @@ public qicorepatientAdapter getPatientAdapterTarget() public Iqicoremedicationdispense setPatientAdapterTarget( qicorepatientAdapter param) { - adaptedClass.setPatientTarget(param.getAdaptee()); + adaptedClass.setSubjectTarget(param.getAdaptee()); return this; } @@ -753,7 +665,7 @@ public boolean hasType() return adaptedClass.hasType(); } - public Identifier getIdentifier() + public List getIdentifier() { try { @@ -765,7 +677,7 @@ public Identifier getIdentifier() } } - public Iqicoremedicationdispense setIdentifier(Identifier param) + public Iqicoremedicationdispense setIdentifier(List param) { adaptedClass.setIdentifier(param); return this; @@ -905,4 +817,4 @@ public Iqicoremedicationdispense setMedicationTarget(Medication param) adaptedClass.setMedication(reference); return this; } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationdispenseDosageInstructionAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationdispenseDosageInstructionAdapter.java index a797e10..1c8713c 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationdispenseDosageInstructionAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationdispenseDosageInstructionAdapter.java @@ -19,26 +19,26 @@ public class qicoremedicationdispenseDosageInstructionAdapter { - private DosageInstruction adaptedClass; + private Dosage adaptedClass; public qicoremedicationdispenseDosageInstructionAdapter() { - this.adaptedClass = new org.hl7.fhir.dstu3.model.DosageInstruction(); + this.adaptedClass = new org.hl7.fhir.dstu3.model.Dosage(); } public qicoremedicationdispenseDosageInstructionAdapter( - DosageInstruction adaptee) + Dosage adaptee) { this.adaptedClass = adaptee; } - public DosageInstruction getAdaptee() + public Dosage getAdaptee() { return adaptedClass; } public void setAdaptee( - DosageInstruction param) + Dosage param) { this.adaptedClass = param; } @@ -757,4 +757,4 @@ public qicoremedicationdispenseDosageInstructionAdapter setMaxDeliveryRate( // adaptedClass.setText(param); // return this; // } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationrequestAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationrequestAdapter.java index 4a556eb..f38e7b2 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationrequestAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationrequestAdapter.java @@ -10,7 +10,7 @@ import org.hl7.fhir.dstu3.model.Encounter; import org.hl7.fhir.dstu3.model.Resource; import org.hl7.fhir.dstu3.model.CodeableConcept; -import org.hl7.fhir.dstu3.model.DosageInstruction; +import org.hl7.fhir.dstu3.model.Dosage; import org.hl7.fhir.dstu3.model.UriType; import org.hl7.fhir.dstu3.model.MedicationRequest.MedicationRequestDispenseRequestComponent; import org.hl7.fhir.dstu3.model.MedicationRequest.MedicationRequestStatus; @@ -48,11 +48,11 @@ public void setAdaptee(MedicationRequest param) this.adaptedClass = param; } - public List getWrappedDosageInstruction() { + public List getWrappedDosage() { List wrappedItems = new java.util.ArrayList<>(); - List items = adaptedClass + List items = adaptedClass .getDosageInstruction(); - for (org.hl7.fhir.dstu3.model.DosageInstruction item : items) { + for (org.hl7.fhir.dstu3.model.Dosage item : items) { wrappedItems .add(new qicoremedicationrequestDosageInstructionAdapter( item)); @@ -60,9 +60,9 @@ public List getWrappedDosageIns return wrappedItems; } - public Iqicoremedicationrequest setWrappedDosageInstruction( + public Iqicoremedicationrequest setWrappedDosage( List param) { - List items = new java.util.ArrayList<>(); + List items = new java.util.ArrayList<>(); for (qicoremedicationrequestDosageInstructionAdapter item : param) { items.add(item.getAdaptee()); } @@ -82,13 +82,13 @@ public Iqicoremedicationrequest addWrappedDosageInstruction( public qicoremedicationrequestDosageInstructionAdapter addWrappedDosageInstruction() { - org.hl7.fhir.dstu3.model.DosageInstruction item = new org.hl7.fhir.dstu3.model.DosageInstruction(); + org.hl7.fhir.dstu3.model.Dosage item = new org.hl7.fhir.dstu3.model.Dosage(); adaptedClass.addDosageInstruction(item); return new qicoremedicationrequestDosageInstructionAdapter( item); } - public List getDosageInstruction() + public List getDosageInstruction() { try { @@ -101,7 +101,7 @@ public List getDosageInstruction() } public Iqicoremedicationrequest setDosageInstruction( - List param) + List param) { adaptedClass.setDosageInstruction(param); return this; @@ -113,13 +113,13 @@ public boolean hasDosageInstruction() } public Iqicoremedicationrequest addDosageInstruction( - DosageInstruction param) + Dosage param) { adaptedClass.addDosageInstruction(param); return this; } - public DosageInstruction addDosageInstruction() + public Dosage addDosageInstruction() { return adaptedClass.addDosageInstruction(); } @@ -512,7 +512,7 @@ public Reference getRequester() { try { - return adaptedClass.getRequester(); + return adaptedClass.getRequester().getAgent(); } catch (Exception e) { @@ -522,30 +522,30 @@ public Reference getRequester() public Iqicoremedicationrequest setRequester(Reference param) { - adaptedClass.setRequester(param); + adaptedClass.getRequester().setAgent(param); return this; } public Practitioner getRequesterTarget() { return (org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getRequesterTarget(); + .getRequester().getAgentTarget(); } public Iqicoremedicationrequest setRequesterTarget(Practitioner param) { - adaptedClass.setRequesterTarget(param); + adaptedClass.getRequester().setAgentTarget(param); return this; } public qicorepractitionerAdapter getRequesterAdapterTarget() { - if (adaptedClass.getRequester().getResource() instanceof org.hl7.fhir.dstu3.model.Practitioner) + if (adaptedClass.getRequester().getAgentTarget() instanceof org.hl7.fhir.dstu3.model.Practitioner) { qicorepractitionerAdapter profiledType = new qicorepractitionerAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getRequester().getResource()); + .getRequester().getAgentTarget()); return profiledType; } else @@ -557,7 +557,7 @@ public qicorepractitionerAdapter getRequesterAdapterTarget() public Iqicoremedicationrequest setRequesterAdapterTarget( qicorepractitionerAdapter param) { - adaptedClass.setRequesterTarget(param.getAdaptee()); + adaptedClass.getRequester().setAgentTarget(param.getAdaptee()); return this; } @@ -573,14 +573,14 @@ public List getReasonReference() public boolean hasPatient() { - return adaptedClass.hasPatient(); + return adaptedClass.hasSubject(); } public Reference getPatient() { try { - return adaptedClass.getPatient(); + return adaptedClass.getSubject(); } catch (Exception e) { @@ -590,30 +590,30 @@ public Reference getPatient() public Iqicoremedicationrequest setPatient(Reference param) { - adaptedClass.setPatient(param); + adaptedClass.setSubject(param); return this; } public Patient getPatientTarget() { return (org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getPatientTarget(); + .getSubjectTarget(); } public Iqicoremedicationrequest setPatientTarget(Patient param) { - adaptedClass.setPatientTarget(param); + adaptedClass.setSubjectTarget(param); return this; } public qicorepatientAdapter getPatientAdapterTarget() { - if (adaptedClass.getPatient().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) + if (adaptedClass.getSubject().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) { qicorepatientAdapter profiledType = new qicorepatientAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getPatient().getResource()); + .getSubject().getResource()); return profiledType; } else @@ -625,7 +625,7 @@ public qicorepatientAdapter getPatientAdapterTarget() public Iqicoremedicationrequest setPatientAdapterTarget( qicorepatientAdapter param) { - adaptedClass.setPatientTarget(param.getAdaptee()); + adaptedClass.setSubjectTarget(param.getAdaptee()); return this; } @@ -634,11 +634,6 @@ public boolean hasCategory() return adaptedClass.hasCategory(); } -// public boolean hasCategoryElement() -// { -// return adaptedClass.hasCategoryElement(); -// } - public CodeableConcept getCategory() { try @@ -651,18 +646,6 @@ public CodeableConcept getCategory() } } -// public Enumeration getCategoryElement() -// { -// try -// { -// return adaptedClass.getCategoryElement(); -// } -// catch (Exception e) -// { -// throw new RuntimeException("Error getting CategoryElement", e); -// } -// } - public Iqicoremedicationrequest setCategory( CodeableConcept param) { @@ -670,13 +653,6 @@ public Iqicoremedicationrequest setCategory( return this; } -// public Iqicoremedicationrequest setCategoryElement( -// Enumeration param) -// { -// adaptedClass.setCategoryElement(param); -// return this; -// } - public Type getMedication() { try @@ -864,4 +840,4 @@ public Identifier addIdentifier() { return adaptedClass.addIdentifier(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationrequestDosageInstructionAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationrequestDosageInstructionAdapter.java index 27476bb..5fc9e01 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationrequestDosageInstructionAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationrequestDosageInstructionAdapter.java @@ -19,26 +19,26 @@ public class qicoremedicationrequestDosageInstructionAdapter { - private DosageInstruction adaptedClass; + private Dosage adaptedClass; public qicoremedicationrequestDosageInstructionAdapter() { - this.adaptedClass = new org.hl7.fhir.dstu3.model.DosageInstruction(); + this.adaptedClass = new org.hl7.fhir.dstu3.model.Dosage(); } public qicoremedicationrequestDosageInstructionAdapter( - DosageInstruction adaptee) + Dosage adaptee) { this.adaptedClass = adaptee; } - public DosageInstruction getAdaptee() + public Dosage getAdaptee() { return adaptedClass; } public void setAdaptee( - DosageInstruction param) + Dosage param) { this.adaptedClass = param; } @@ -265,7 +265,7 @@ public List getAdditionalInstructions() { try { - return adaptedClass.getAdditionalInstructions(); + return adaptedClass.getAdditionalInstruction(); } catch (Exception e) { @@ -277,25 +277,25 @@ public List getAdditionalInstructions() public qicoremedicationrequestDosageInstructionAdapter setAdditionalInstructions( List param) { - adaptedClass.setAdditionalInstructions(param); + adaptedClass.setAdditionalInstruction(param); return this; } public boolean hasAdditionalInstructions() { - return adaptedClass.hasAdditionalInstructions(); + return adaptedClass.hasAdditionalInstruction(); } public qicoremedicationrequestDosageInstructionAdapter addAdditionalInstructions( CodeableConcept param) { - adaptedClass.addAdditionalInstructions(param); + adaptedClass.addAdditionalInstruction(param); return this; } public CodeableConcept addAdditionalInstructions() { - return adaptedClass.addAdditionalInstructions(); + return adaptedClass.addAdditionalInstruction(); } public Timing getTiming() @@ -802,4 +802,4 @@ public boolean hasAsNeededCodeableConcept() { return adaptedClass.hasAsNeededCodeableConcept(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationstatementAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationstatementAdapter.java index 1a0fc86..f05d4c8 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoremedicationstatementAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoremedicationstatementAdapter.java @@ -1,28 +1,11 @@ package org.cqf.qicore.dstu3; -import org.hl7.fhir.dstu3.model.MedicationStatement; -import org.hl7.fhir.dstu3.model.MedicationStatement.MedicationStatementNotTaken; -import org.hl7.fhir.dstu3.model.UriType; +import org.hl7.fhir.dstu3.model.*; + import java.lang.String; -import org.hl7.fhir.dstu3.model.Identifier; import java.util.List; -import org.hl7.fhir.dstu3.model.Reference; -import org.hl7.fhir.dstu3.model.Annotation; -import org.hl7.fhir.dstu3.model.Enumeration; -import org.hl7.fhir.dstu3.model.CodeableConcept; -import org.hl7.fhir.dstu3.model.IdType; -import org.hl7.fhir.dstu3.model.Resource; -import org.hl7.fhir.dstu3.model.Patient; -import org.hl7.fhir.dstu3.model.Practitioner; -import org.hl7.fhir.dstu3.model.RelatedPerson; -import org.hl7.fhir.dstu3.model.CodeType; -import org.hl7.fhir.dstu3.model.Type; -import org.hl7.fhir.dstu3.model.DateTimeType; -import org.hl7.fhir.dstu3.model.DosageInstruction; -import org.hl7.fhir.dstu3.model.Period; -import org.hl7.fhir.dstu3.model.Medication; -import org.hl7.fhir.dstu3.model.BooleanType; -import java.lang.Boolean; + +import org.hl7.fhir.dstu3.model.Dosage; public class qicoremedicationstatementAdapter implements Iqicoremedicationstatement { @@ -129,16 +112,6 @@ public Identifier addIdentifier() return adaptedClass.addIdentifier(); } - public boolean hasReasonForUseReference() - { - return adaptedClass.hasReasonForUseReference(); - } - - public List getReasonForUseReference() - { - return adaptedClass.getReasonForUseReference(); - } - public List getNote() { try @@ -173,7 +146,7 @@ public Annotation addNote() return adaptedClass.addNote(); } - public List getDosage() + public List getDosage() { try { @@ -186,7 +159,7 @@ public List getDosage() } public qicoremedicationstatementAdapter setDosage( - List param) + List param) { adaptedClass.setDosage(param); return this; @@ -198,13 +171,13 @@ public boolean hasDosage() } public qicoremedicationstatementAdapter addDosage( - DosageInstruction param) + Dosage param) { adaptedClass.addDosage(param); return this; } - public DosageInstruction addDosage() + public Dosage addDosage() { return adaptedClass.addDosage(); } @@ -214,12 +187,7 @@ public boolean hasCategory() return adaptedClass.hasCategory(); } - public boolean hasCategoryElement() - { - return adaptedClass.hasCategoryElement(); - } - - public MedicationStatement.MedicationStatementCategory getCategory() + public CodeableConcept getCategory() { try { @@ -231,67 +199,12 @@ public MedicationStatement.MedicationStatementCategory getCategory() } } - public Enumeration getCategoryElement() - { - try - { - return adaptedClass.getCategoryElement(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting CategoryElement", e); - } - } - - public Iqicoremedicationstatement setCategory( - MedicationStatement.MedicationStatementCategory param) + public Iqicoremedicationstatement setCategory(CodeableConcept param) { adaptedClass.setCategory(param); return this; } - public Iqicoremedicationstatement setCategoryElement( - Enumeration param) - { - adaptedClass.setCategoryElement(param); - return this; - } - - public List getReasonForUseCodeableConcept() - { - try - { - return adaptedClass.getReasonForUseCodeableConcept(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting ReasonForUseCode", e); - } - } - - public Iqicoremedicationstatement setReasonForUseCodeableConcept( - List param) - { - adaptedClass.setReasonForUseCodeableConcept(param); - return this; - } - - public boolean hasReasonForUseCodeableConcept() - { - return adaptedClass.hasReasonForUseCodeableConcept(); - } - - public Iqicoremedicationstatement addReasonForUseCodeableConcept(CodeableConcept param) - { - adaptedClass.addReasonForUseCodeableConcept(param); - return this; - } - - public CodeableConcept addReasonForUseCodeableConcept() - { - return adaptedClass.addReasonForUseCodeableConcept(); - } - public boolean hasId() { return adaptedClass.hasId(); @@ -867,49 +780,4 @@ public List getDerivedFrom() return adaptedClass.getDerivedFrom(); } - public boolean hasNotTaken() - { - return adaptedClass.hasNotTaken(); - } - - public boolean hasNotTakenElement() - { - return adaptedClass.hasNotTakenElement(); - } - - public Enumeration getNotTakenElement() - { - try - { - return adaptedClass.getNotTakenElement(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting NotTakenElement", e); - } - } - - public MedicationStatementNotTaken getNotTaken() - { - try - { - return adaptedClass.getNotTaken(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting NotTaken", e); - } - } - - public Iqicoremedicationstatement setNotTakenElement(Enumeration param) - { - adaptedClass.setNotTakenElement(param); - return this; - } - - public Iqicoremedicationstatement setNotTaken(MedicationStatementNotTaken param) - { - adaptedClass.setNotTaken(param); - return this; - } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoreobservationAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoreobservationAdapter.java index c5a066f..d5ba73b 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoreobservationAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoreobservationAdapter.java @@ -847,14 +847,14 @@ public Iqicoreobservation setSubjectAdapterTarget( public boolean hasEncounter() { - return adaptedClass.hasEncounter(); + return adaptedClass.hasContext(); } public Reference getEncounter() { try { - return adaptedClass.getEncounter(); + return adaptedClass.getContext(); } catch (Exception e) { @@ -864,30 +864,30 @@ public Reference getEncounter() public Iqicoreobservation setEncounter(Reference param) { - adaptedClass.setEncounter(param); + adaptedClass.setContext(param); return this; } public Encounter getEncounterTarget() { return (org.hl7.fhir.dstu3.model.Encounter) adaptedClass - .getEncounterTarget(); + .getContextTarget(); } public Iqicoreobservation setEncounterTarget(Encounter param) { - adaptedClass.setEncounterTarget(param); + adaptedClass.setContextTarget(param); return this; } public qicoreencounterAdapter getEncounterAdapterTarget() { - if (adaptedClass.getEncounter().getResource() instanceof org.hl7.fhir.dstu3.model.Encounter) + if (adaptedClass.getContext().getResource() instanceof org.hl7.fhir.dstu3.model.Encounter) { qicoreencounterAdapter profiledType = new qicoreencounterAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Encounter) adaptedClass - .getEncounter().getResource()); + .getContext().getResource()); return profiledType; } else @@ -899,7 +899,7 @@ public qicoreencounterAdapter getEncounterAdapterTarget() public Iqicoreobservation setEncounterAdapterTarget( qicoreencounterAdapter param) { - adaptedClass.setEncounterTarget(param.getAdaptee()); + adaptedClass.setContextTarget(param.getAdaptee()); return this; } @@ -1389,4 +1389,4 @@ public boolean hasEffectivePeriod() { return adaptedClass.hasEffectivePeriod(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoreorganizationAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoreorganizationAdapter.java index 42df3a2..45d014e 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoreorganizationAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoreorganizationAdapter.java @@ -344,7 +344,7 @@ public Iqicoreorganization setAlias(List param) return this; } - public CodeableConcept getType() + public List getType() { try { @@ -356,7 +356,7 @@ public CodeableConcept getType() } } - public Iqicoreorganization setType(CodeableConcept param) + public Iqicoreorganization setType(List param) { adaptedClass.setType(param); return this; @@ -567,4 +567,4 @@ public Iqicoreorganization setId(String param) adaptedClass.setId(param); return this; } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicorepractitionerAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicorepractitionerAdapter.java index 69bae2c..93e2c3e 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicorepractitionerAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicorepractitionerAdapter.java @@ -45,42 +45,6 @@ public void setAdaptee(Practitioner param) this.adaptedClass = param; } - public List getRole() - { - try - { - return adaptedClass.getRole(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Role", e); - } - } - - public qicorepractitionerAdapter setRole( - List param) - { - adaptedClass.setRole(param); - return this; - } - - public boolean hasRole() - { - return adaptedClass.hasRole(); - } - - public qicorepractitionerAdapter addRole( - Practitioner.PractitionerRoleComponent param) - { - adaptedClass.addRole(param); - return this; - } - - public Practitioner.PractitionerRoleComponent addRole() - { - return adaptedClass.addRole(); - } - public boolean hasActive() { return adaptedClass.hasActive(); @@ -655,4 +619,4 @@ public Iqicorepractitioner addContained(Resource param) adaptedClass.addContained(param); return this; } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoreprocedureAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoreprocedureAdapter.java index 7b9e6b9..3a7f51e 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoreprocedureAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoreprocedureAdapter.java @@ -4,11 +4,12 @@ import org.hl7.fhir.dstu3.model.Reference; import org.hl7.fhir.dstu3.model.Location; import org.hl7.fhir.dstu3.model.CodeableConcept; + +import java.util.ArrayList; import java.util.List; import org.hl7.fhir.dstu3.model.Identifier; import org.hl7.fhir.dstu3.model.Resource; import org.hl7.fhir.dstu3.model.CarePlan; -import org.hl7.fhir.dstu3.model.DiagnosticRequest; import org.hl7.fhir.dstu3.model.ProcedureRequest; import org.hl7.fhir.dstu3.model.ReferralRequest; import org.hl7.fhir.dstu3.model.Type; @@ -213,11 +214,11 @@ public Identifier addIdentifier() return adaptedClass.addIdentifier(); } - public Reference getRequest() + public List getRequest() { try { - return adaptedClass.getRequest(); + return adaptedClass.getBasedOn(); } catch (Exception e) { @@ -225,11 +226,11 @@ public Reference getRequest() } } - public Resource getRequestTarget() + public List getBasedOnTarget() { try { - return adaptedClass.getRequestTarget(); + return adaptedClass.getBasedOnTarget(); } catch (Exception e) { @@ -237,70 +238,64 @@ public Resource getRequestTarget() } } - public boolean hasRequest() + public boolean hasBasedOn() { - return adaptedClass.hasRequest(); + return adaptedClass.hasBasedOn(); } - public Reference getRequestCarePlan() + public List getBasedOn() { try { - return adaptedClass.getRequest(); + return adaptedClass.getBasedOn(); } catch (Exception e) { - throw new RuntimeException("Error getting Request", e); + throw new RuntimeException("Error getting BasedOn", e); } } - public Iqicoreprocedure setRequest(Reference param) + public Iqicoreprocedure setBasedOn(List param) { - adaptedClass.setRequest(param); + adaptedClass.setBasedOn(param); return this; } - public CarePlan getRequestCarePlanTarget() - { - return (org.hl7.fhir.dstu3.model.CarePlan) adaptedClass - .getRequestTarget(); - } - - public Iqicoreprocedure setRequestTarget(CarePlan param) + public List getBasedOnCarePlan() { - adaptedClass.setRequestTarget(param); - return this; - } - - public Reference getRequestDiagnosticRequest() - { - try - { - return adaptedClass.getRequest(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Request", e); + List items = new ArrayList<>(); + List references = adaptedClass.getBasedOn(); + for(Reference reference : references){ + if (reference.getResource() instanceof CarePlan) { + items.add(reference); + } } + return items; } - public DiagnosticRequest getRequestDiagnosticRequestTarget() + public List getBasedOnCarePlanTarget() { - return (org.hl7.fhir.dstu3.model.DiagnosticRequest) adaptedClass - .getRequestTarget(); + List items = new ArrayList<>(); + List resources = adaptedClass.getBasedOnTarget(); + for (Resource resource : resources) { + if (resource instanceof CarePlan) { + items.add((CarePlan) resource); + } + } + return items; } - public Iqicoreprocedure setRequestTarget(DiagnosticRequest param) + public Iqicoreprocedure setContextTarget(Resource param) { - adaptedClass.setRequestTarget(param); + adaptedClass.setContextTarget(param); return this; } - public Reference getRequestProcedureRequest() + public List getBasedOnProcedureRequest() { try { - return adaptedClass.getRequest(); + return adaptedClass.getBasedOn(); } catch (Exception e) { @@ -308,40 +303,40 @@ public Reference getRequestProcedureRequest() } } - public ProcedureRequest getRequestProcedureRequestTarget() - { - return (org.hl7.fhir.dstu3.model.ProcedureRequest) adaptedClass - .getRequestTarget(); - } - - public Iqicoreprocedure setRequestTarget(ProcedureRequest param) + public List getBasedOnProcedureRequestTarget() { - adaptedClass.setRequestTarget(param); - return this; - } - - public Reference getRequestReferralRequest() - { - try - { - return adaptedClass.getRequest(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Request", e); + List items = new ArrayList<>(); + List resources = adaptedClass.getBasedOnTarget(); + for(Resource resource : resources) { + if (resource instanceof ProcedureRequest) { + items.add((ProcedureRequest) resource); + } } + return items; } - public ReferralRequest getRequestReferralRequestTarget() + public List getBasedOnReferralRequest() { - return (org.hl7.fhir.dstu3.model.ReferralRequest) adaptedClass - .getRequestTarget(); + List items = new ArrayList<>(); + List references = adaptedClass.getBasedOn(); + for(Reference reference : references){ + if (reference.getResource() instanceof ReferralRequest) { + items.add(reference); + } + } + return items; } - public Iqicoreprocedure setRequestTarget(ReferralRequest param) + public List getBasedOnReferralRequestTarget() { - adaptedClass.setRequestTarget(param); - return this; + List items = new ArrayList<>(); + List resources = adaptedClass.getBasedOnTarget(); + for(Resource resource : resources) { + if (resource instanceof ProcedureRequest) { + items.add((ReferralRequest) resource); + } + } + return items; } public CodeableConcept getCategory() @@ -419,40 +414,35 @@ public boolean hasPerformedPeriod() return adaptedClass.hasPerformedPeriod(); } - public boolean hasComponent() - { - return adaptedClass.hasComponent(); + public List getPartOfMedicationAdministrationTarget() { + List items = new java.util.ArrayList<>(); + List resources = adaptedClass + .getPartOfTarget(); + for (org.hl7.fhir.dstu3.model.Resource resource : resources) { + items.add((org.hl7.fhir.dstu3.model.MedicationAdministration) resource); + } + return items; } - public List getComponentMedicationAdministrationTarget() { - List items = new java.util.ArrayList<>(); - List resources = adaptedClass - .getComponentTarget(); - for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.MedicationAdministration) resource); - } - return items; - } - - public List getComponent() + public List getPartOf() { - return adaptedClass.getComponent(); + return adaptedClass.getPartOf(); } - public List getComponentProcedureTarget() { - List items = new java.util.ArrayList<>(); - List resources = adaptedClass - .getComponentTarget(); - for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.Procedure) resource); - } - return items; - } + public List getPartOfProcedureTarget() { + List items = new java.util.ArrayList<>(); + List resources = adaptedClass + .getPartOfTarget(); + for (org.hl7.fhir.dstu3.model.Resource resource : resources) { + items.add((org.hl7.fhir.dstu3.model.Procedure) resource); + } + return items; + } - public List getComponentObservationTarget() { + public List getPartOfObservationTarget() { List items = new java.util.ArrayList<>(); List resources = adaptedClass - .getComponentTarget(); + .getPartOfTarget(); for (org.hl7.fhir.dstu3.model.Resource resource : resources) { items.add((org.hl7.fhir.dstu3.model.Observation) resource); } @@ -545,7 +535,7 @@ public List getNotes() { try { - return adaptedClass.getNotes(); + return adaptedClass.getNote(); } catch (Exception e) { @@ -555,24 +545,24 @@ public List getNotes() public Iqicoreprocedure setNotes(List param) { - adaptedClass.setNotes(param); + adaptedClass.setNote(param); return this; } public boolean hasNotes() { - return adaptedClass.hasNotes(); + return adaptedClass.hasNote(); } public Iqicoreprocedure addNotes(Annotation param) { - adaptedClass.addNotes(param); + adaptedClass.addNote(param); return this; } public Annotation addNotes() { - return adaptedClass.addNotes(); + return adaptedClass.addNote(); } public List getReasonCode() @@ -833,21 +823,21 @@ public Iqicoreprocedure setId(String param) return this; } - public boolean hasNotPerformed() + public boolean hasNotDone() { - return adaptedClass.hasNotPerformed(); + return adaptedClass.hasNotDone(); } - public boolean hasNotPerformedElement() + public boolean hasNotDoneElement() { - return adaptedClass.hasNotPerformedElement(); + return adaptedClass.hasNotDoneElement(); } - public BooleanType getNotPerformedElement() + public BooleanType getNotDoneElement() { try { - return adaptedClass.getNotPerformedElement(); + return adaptedClass.getNotDoneElement(); } catch (Exception e) { @@ -855,11 +845,11 @@ public BooleanType getNotPerformedElement() } } - public Boolean getNotPerformed() + public Boolean getNotDone() { try { - return adaptedClass.getNotPerformed(); + return adaptedClass.getNotDone(); } catch (Exception e) { @@ -867,15 +857,15 @@ public Boolean getNotPerformed() } } - public Iqicoreprocedure setNotPerformedElement(BooleanType param) + public Iqicoreprocedure setNotDoneElement(BooleanType param) { - adaptedClass.setNotPerformedElement(param); + adaptedClass.setNotDoneElement(param); return this; } - public Iqicoreprocedure setNotPerformed(Boolean param) + public Iqicoreprocedure setNotDone(Boolean param) { - adaptedClass.setNotPerformed(param); + adaptedClass.setNotDone(param); return this; } @@ -926,11 +916,11 @@ public Iqicoreprocedure setStatusElement( return this; } - public List getReasonNotPerformed() + public CodeableConcept getNotDoneReason() { try { - return adaptedClass.getReasonNotPerformed(); + return adaptedClass.getNotDoneReason(); } catch (Exception e) { @@ -938,26 +928,15 @@ public List getReasonNotPerformed() } } - public Iqicoreprocedure setReasonNotPerformed(List param) - { - adaptedClass.setReasonNotPerformed(param); - return this; - } - - public boolean hasReasonNotPerformed() - { - return adaptedClass.hasReasonNotPerformed(); - } - - public Iqicoreprocedure addReasonNotPerformed(CodeableConcept param) + public Iqicoreprocedure setNotDoneReason(CodeableConcept param) { - adaptedClass.addReasonNotPerformed(param); + adaptedClass.setNotDoneReason(param); return this; } - public CodeableConcept addReasonNotPerformed() + public boolean hasNotDoneReason() { - return adaptedClass.addReasonNotPerformed(); + return adaptedClass.hasNotDoneReason(); } public List getFollowUp() @@ -1047,16 +1026,16 @@ public Iqicoreprocedure setApproachBodySite(List param) return this; } - public boolean hasEncounter() + public boolean hasContext() { - return adaptedClass.hasEncounter(); + return adaptedClass.hasContext(); } - public Reference getEncounter() + public Reference getContext() { try { - return adaptedClass.getEncounter(); + return adaptedClass.getContext(); } catch (Exception e) { @@ -1064,32 +1043,32 @@ public Reference getEncounter() } } - public Iqicoreprocedure setEncounter(Reference param) + public Iqicoreprocedure setContext(Reference param) { - adaptedClass.setEncounter(param); + adaptedClass.setContext(param); return this; } - public Encounter getEncounterTarget() + public Encounter getContextTarget() { return (org.hl7.fhir.dstu3.model.Encounter) adaptedClass - .getEncounterTarget(); + .getContextTarget(); } - public Iqicoreprocedure setEncounterTarget(Encounter param) + public Iqicoreprocedure setContextTarget(Encounter param) { - adaptedClass.setEncounterTarget(param); + adaptedClass.setContextTarget(param); return this; } public qicoreencounterAdapter getEncounterAdapterTarget() { - if (adaptedClass.getEncounter().getResource() instanceof org.hl7.fhir.dstu3.model.Encounter) + if (adaptedClass.getContext().getResource() instanceof org.hl7.fhir.dstu3.model.Encounter) { qicoreencounterAdapter profiledType = new qicoreencounterAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Encounter) adaptedClass - .getEncounter().getResource()); + .getContext().getResource()); return profiledType; } else @@ -1101,7 +1080,7 @@ public qicoreencounterAdapter getEncounterAdapterTarget() public Iqicoreprocedure setEncounterAdapterTarget( qicoreencounterAdapter param) { - adaptedClass.setEncounterTarget(param.getAdaptee()); + adaptedClass.setContextTarget(param.getAdaptee()); return this; } @@ -1257,4 +1236,4 @@ public CodeableConcept addUsedCode() { return adaptedClass.addUsedCode(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicoreprocedurerequestAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicoreprocedurerequestAdapter.java index 470f968..518f947 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicoreprocedurerequestAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicoreprocedurerequestAdapter.java @@ -2,6 +2,8 @@ import org.hl7.fhir.dstu3.model.ProcedureRequest; import org.hl7.fhir.dstu3.model.Annotation; + +import java.util.ArrayList; import java.util.List; import org.hl7.fhir.dstu3.model.IdType; import java.lang.String; @@ -57,7 +59,7 @@ public List getNotes() { try { - return adaptedClass.getNotes(); + return adaptedClass.getNote(); } catch (Exception e) { @@ -67,24 +69,24 @@ public List getNotes() public Iqicoreprocedurerequest setNotes(List param) { - adaptedClass.setNotes(param); + adaptedClass.setNote(param); return this; } public boolean hasNotes() { - return adaptedClass.hasNotes(); + return adaptedClass.hasNote(); } public Iqicoreprocedurerequest addNotes(Annotation param) { - adaptedClass.addNotes(param); + adaptedClass.addNote(param); return this; } public Annotation addNotes() { - return adaptedClass.addNotes(); + return adaptedClass.addNote(); } public boolean hasId() @@ -302,11 +304,11 @@ public Iqicoreprocedurerequest setPriorityElement( return this; } - public Reference getOrderer() + public ProcedureRequest.ProcedureRequestRequesterComponent getRequester() { try { - return adaptedClass.getOrderer(); + return adaptedClass.getRequester(); } catch (Exception e) { @@ -314,28 +316,16 @@ public Reference getOrderer() } } - public Resource getOrdererTarget() - { - try - { - return adaptedClass.getOrdererTarget(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting OrdererTarget", e); - } - } - - public boolean hasOrderer() + public boolean hasRequester() { - return adaptedClass.hasOrderer(); + return adaptedClass.hasRequester(); } - public Reference getOrdererPractitioner() + public ProcedureRequest.ProcedureRequestRequesterComponent geRequesterPractitioner() { try { - return adaptedClass.getOrderer(); + return adaptedClass.getRequester(); } catch (Exception e) { @@ -343,32 +333,31 @@ public Reference getOrdererPractitioner() } } - public Iqicoreprocedurerequest setOrderer(Reference param) + public Iqicoreprocedurerequest setOrderer(ProcedureRequest.ProcedureRequestRequesterComponent param) { - adaptedClass.setOrderer(param); + adaptedClass.setRequester(param); return this; } - public Practitioner getOrdererPractitionerTarget() + public Practitioner getRequesterAgentTarget() { - return (org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getOrdererTarget(); + return (org.hl7.fhir.dstu3.model.Practitioner) adaptedClass.getRequester().getAgentTarget(); } - public Iqicoreprocedurerequest setOrdererTarget(Practitioner param) + public Iqicoreprocedurerequest setRequesterAgentTarget(Resource param) { - adaptedClass.setOrdererTarget(param); + adaptedClass.getRequester().setAgentTarget(param); return this; } - public qicorepractitionerAdapter getOrdererPractitionerAdapterTarget() + public qicorepractitionerAdapter getRequesterPractitionerAdapterTarget() { - if (adaptedClass.getOrderer().getResource() instanceof org.hl7.fhir.dstu3.model.Practitioner) + if (adaptedClass.getRequester().getAgent().getResource() instanceof org.hl7.fhir.dstu3.model.Practitioner) { qicorepractitionerAdapter profiledType = new qicorepractitionerAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getOrderer().getResource()); + .getRequester().getAgentTarget()); return profiledType; } else @@ -377,65 +366,25 @@ public qicorepractitionerAdapter getOrdererPractitionerAdapterTarget() } } - public Iqicoreprocedurerequest setOrdererAdapterTarget( + public Iqicoreprocedurerequest setRequesterAdapterTarget( qicorepractitionerAdapter param) { - adaptedClass.setOrdererTarget(param.getAdaptee()); - return this; - } - - public Reference getOrdererPatient() - { - try - { - return adaptedClass.getOrderer(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting Orderer", e); - } - } - - public Patient getOrdererPatientTarget() - { - return (org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getOrdererTarget(); - } - - public Iqicoreprocedurerequest setOrdererTarget(Patient param) - { - adaptedClass.setOrdererTarget(param); + adaptedClass.getRequester().setAgentTarget(param.getAdaptee()); return this; } - public qicorepatientAdapter getOrdererPatientAdapterTarget() - { - if (adaptedClass.getOrderer().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) - { - qicorepatientAdapter profiledType = new qicorepatientAdapter(); - profiledType - .setAdaptee((org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getOrderer().getResource()); - return profiledType; - } - else - { - return null; - } - } - - public Iqicoreprocedurerequest setOrdererAdapterTarget( + public Iqicoreprocedurerequest setRequesterAdapterTarget( qicorepatientAdapter param) { - adaptedClass.setOrdererTarget(param.getAdaptee()); + adaptedClass.getRequester().setAgentTarget(param.getAdaptee()); return this; } - public Reference getOrdererRelatedPerson() + public Reference getRequesterRelatedPerson() { try { - return adaptedClass.getOrderer(); + return adaptedClass.getRequester().getAgent(); } catch (Exception e) { @@ -443,26 +392,26 @@ public Reference getOrdererRelatedPerson() } } - public RelatedPerson getOrdererRelatedPersonTarget() + public RelatedPerson getRequesterRelatedPersonTarget() { return (org.hl7.fhir.dstu3.model.RelatedPerson) adaptedClass - .getOrdererTarget(); + .getRequester().getAgentTarget(); } - public Iqicoreprocedurerequest setOrdererTarget(RelatedPerson param) + public Iqicoreprocedurerequest setRequesterTarget(RelatedPerson param) { - adaptedClass.setOrdererTarget(param); + adaptedClass.getRequester().setAgentTarget(param); return this; } - public qicorerelatedpersonAdapter getOrdererRelatedPersonAdapterTarget() + public qicorerelatedpersonAdapter getRequesterRelatedPersonAdapterTarget() { - if (adaptedClass.getOrderer().getResource() instanceof org.hl7.fhir.dstu3.model.RelatedPerson) + if (adaptedClass.getRequester().getAgentTarget() instanceof org.hl7.fhir.dstu3.model.RelatedPerson) { qicorerelatedpersonAdapter profiledType = new qicorerelatedpersonAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.RelatedPerson) adaptedClass - .getOrderer().getResource()); + .getRequester().getAgentTarget()); return profiledType; } else @@ -471,45 +420,45 @@ public qicorerelatedpersonAdapter getOrdererRelatedPersonAdapterTarget() } } - public Iqicoreprocedurerequest setOrdererAdapterTarget( + public Iqicoreprocedurerequest setRequesterAdapterTarget( qicorerelatedpersonAdapter param) { - adaptedClass.setOrdererTarget(param.getAdaptee()); + adaptedClass.getRequester().setAgentTarget(param.getAdaptee()); return this; } - public Reference getOrdererDevice() + public Reference getRequesterDevice() { try { - return adaptedClass.getOrderer(); + return adaptedClass.getRequester().getAgent(); } catch (Exception e) { - throw new RuntimeException("Error getting Orderer", e); + throw new RuntimeException("Error getting Requester", e); } } - public Device getOrdererDeviceTarget() + public Device getRequesterDeviceTarget() { return (org.hl7.fhir.dstu3.model.Device) adaptedClass - .getOrdererTarget(); + .getRequester().getAgentTarget(); } - public Iqicoreprocedurerequest setOrdererTarget(Device param) + public Iqicoreprocedurerequest setRequesterTarget(Device param) { - adaptedClass.setOrdererTarget(param); + adaptedClass.getRequester().setAgentTarget(param); return this; } - public qicoredeviceAdapter getOrdererDeviceAdapterTarget() + public qicoredeviceAdapter getRequesterDeviceAdapterTarget() { - if (adaptedClass.getOrderer().getResource() instanceof org.hl7.fhir.dstu3.model.Device) + if (adaptedClass.getRequester().getAgentTarget() instanceof org.hl7.fhir.dstu3.model.Device) { qicoredeviceAdapter profiledType = new qicoredeviceAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Device) adaptedClass - .getOrderer().getResource()); + .getRequester().getAgentTarget()); return profiledType; } else @@ -518,10 +467,10 @@ public qicoredeviceAdapter getOrdererDeviceAdapterTarget() } } - public Iqicoreprocedurerequest setOrdererAdapterTarget( + public Iqicoreprocedurerequest setRequesterAdapterTarget( qicoredeviceAdapter param) { - adaptedClass.setOrdererTarget(param.getAdaptee()); + adaptedClass.getRequester().setAgentTarget(param.getAdaptee()); return this; } @@ -583,11 +532,12 @@ public Iqicoreprocedurerequest setAppropriatenessScore(DecimalType param) return this; } - public Type getReason() + public List getReasonCode() { try { - return adaptedClass.getReason(); + return adaptedClass.getReasonCode() + ; } catch (Exception e) { @@ -595,35 +545,18 @@ public Type getReason() } } - public Iqicoreprocedurerequest setReason(Type param) + public Iqicoreprocedurerequest setReasonCode(List param) { - adaptedClass.setReason(param); + adaptedClass.setReasonCode(param); return this; } - public CodeableConcept getReasonCodeableConcept() - { - try - { - return adaptedClass.getReasonCodeableConcept(); - } - catch (Exception e) - { - throw new RuntimeException("Error getting ReasonCodeableConcept", e); - } - } - - public boolean hasReasonCodeableConcept() + public boolean hasReasonCode() { - return adaptedClass.hasReasonCodeableConcept(); + return adaptedClass.hasReasonCode(); } - public boolean hasReason() - { - return adaptedClass.hasReason(); - } - - public Reference getReasonReference() + public List getReasonReference() { try { @@ -638,19 +571,22 @@ public Reference getReasonReference() public Condition getReasonTarget() { return (org.hl7.fhir.dstu3.model.Condition) ((org.hl7.fhir.dstu3.model.Reference) adaptedClass - .getReason()).getResource(); + .getReasonReference()).getResource(); } - public Iqicoreprocedurerequest setReason(Reference param) + public Iqicoreprocedurerequest setReason(List param) { - adaptedClass.setReason(param); + adaptedClass.setReasonReference(param); return this; } - public Iqicoreprocedurerequest setReasonTarget(Condition param) + public Iqicoreprocedurerequest setReasonTarget(List param) { - Reference reference = new Reference(param); - adaptedClass.setReason(reference); + List references = new ArrayList<>(); + for (Resource resource : param) { + references.add(new Reference(resource)); + } + adaptedClass.setReasonReference(references); return this; } @@ -807,46 +743,46 @@ public Iqicoreprocedurerequest setSubjectTarget(Group param) return this; } - public Type getScheduled() + public Type getOccurrence() { try { - return adaptedClass.getScheduled(); + return adaptedClass.getOccurrence(); } catch (Exception e) { - throw new RuntimeException("Error getting Scheduled", e); + throw new RuntimeException("Error getting Occurrence", e); } } - public Iqicoreprocedurerequest setScheduled(Type param) + public Iqicoreprocedurerequest setOccurrence(Type param) { - adaptedClass.setScheduled(param); + adaptedClass.setOccurrence(param); return this; } - public DateTimeType getScheduledDateTimeType() + public DateTimeType getOccurrenceDateTimeType() { try { - return adaptedClass.getScheduledDateTimeType(); + return adaptedClass.getOccurrenceDateTimeType(); } catch (Exception e) { - throw new RuntimeException("Error getting ScheduledDateTimeType", e); + throw new RuntimeException("Error getting OccurrenceDateTimeType", e); } } - public boolean hasScheduledDateTimeType() + public boolean hasOccurrenceDateTimeType() { - return adaptedClass.hasScheduledDateTimeType(); + return adaptedClass.hasOccurrenceDateTimeType(); } - public Period getScheduledPeriod() + public Period getOccurrencePeriod() { try { - return adaptedClass.getScheduledPeriod(); + return adaptedClass.getOccurrencePeriod(); } catch (Exception e) { @@ -854,26 +790,26 @@ public Period getScheduledPeriod() } } - public boolean hasScheduledPeriod() + public boolean hasOccurrencePeriod() { - return adaptedClass.hasScheduledPeriod(); + return adaptedClass.hasOccurrencePeriod(); } - public Timing getScheduledTiming() + public Timing getOccurrenceTiming() { try { - return adaptedClass.getScheduledTiming(); + return adaptedClass.getOccurrenceTiming(); } catch (Exception e) { - throw new RuntimeException("Error getting ScheduledTiming", e); + throw new RuntimeException("Error getting OccurrenceTiming", e); } } - public boolean hasScheduledTiming() + public boolean hasOccurrenceTiming() { - return adaptedClass.hasScheduledTiming(); + return adaptedClass.hasOccurrenceTiming(); } public List getContained() @@ -905,49 +841,49 @@ public Iqicoreprocedurerequest addContained(Resource param) return this; } - public boolean hasEncounter() + public boolean hasContext() { - return adaptedClass.hasEncounter(); + return adaptedClass.hasContext(); } - public Reference getEncounter() + public Reference getContext() { try { - return adaptedClass.getEncounter(); + return adaptedClass.getContext(); } catch (Exception e) { - throw new RuntimeException("Error getting Encounter", e); + throw new RuntimeException("Error getting Context", e); } } - public Iqicoreprocedurerequest setEncounter(Reference param) + public Iqicoreprocedurerequest setContext(Reference param) { - adaptedClass.setEncounter(param); + adaptedClass.setContext(param); return this; } - public Encounter getEncounterTarget() + public Encounter getContextTarget() { return (org.hl7.fhir.dstu3.model.Encounter) adaptedClass - .getEncounterTarget(); + .getContextTarget(); } public Iqicoreprocedurerequest setEncounterTarget(Encounter param) { - adaptedClass.setEncounterTarget(param); + adaptedClass.setContextTarget(param); return this; } public qicoreencounterAdapter getEncounterAdapterTarget() { - if (adaptedClass.getEncounter().getResource() instanceof org.hl7.fhir.dstu3.model.Encounter) + if (adaptedClass.getContext().getResource() instanceof org.hl7.fhir.dstu3.model.Encounter) { qicoreencounterAdapter profiledType = new qicoreencounterAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Encounter) adaptedClass - .getEncounter().getResource()); + .getContext().getResource()); return profiledType; } else @@ -959,7 +895,7 @@ public qicoreencounterAdapter getEncounterAdapterTarget() public Iqicoreprocedurerequest setEncounterAdapterTarget( qicoreencounterAdapter param) { - adaptedClass.setEncounterTarget(param.getAdaptee()); + adaptedClass.setContextTarget(param.getAdaptee()); return this; } @@ -1359,4 +1295,4 @@ public boolean hasCode() { return adaptedClass.hasCode(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicorereferralrequestAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicorereferralrequestAdapter.java index 39ebd0d..47445af 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicorereferralrequestAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicorereferralrequestAdapter.java @@ -46,12 +46,12 @@ public void setAdaptee(ReferralRequest param) public boolean hasSupportingInformation() { - return adaptedClass.hasSupportingInformation(); + return adaptedClass.hasSupportingInfo(); } public List getSupportingInformation() { - return adaptedClass.getSupportingInformation(); + return adaptedClass.getSupportingInfo(); } public boolean hasLanguage() @@ -130,16 +130,6 @@ public List getBasedOnCarePlanTarget() { return items; } - public List getBasedOnDiagnosticRequestTarget() { - List items = new java.util.ArrayList<>(); - List resources = adaptedClass - .getBasedOnTarget(); - for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.DiagnosticRequest) resource); - } - return items; - } - public List getBasedOnProcedureRequestTarget() { List items = new java.util.ArrayList<>(); List resources = adaptedClass @@ -150,7 +140,7 @@ public List getBasedOnProcedureRequestTarget() { return items; } - public CodeableConcept getPriority() + public ReferralRequest.ReferralPriority getPriority() { try { @@ -162,7 +152,7 @@ public CodeableConcept getPriority() } } - public Iqicorereferralrequest setPriority(CodeableConcept param) + public Iqicorereferralrequest setPriority(ReferralRequest.ReferralPriority param) { adaptedClass.setPriority(param); return this; @@ -173,11 +163,11 @@ public boolean hasPriority() return adaptedClass.hasPriority(); } - public Identifier getParent() + public Reference getSubject() { try { - return adaptedClass.getParent(); + return adaptedClass.getSubject(); } catch (Exception e) { @@ -185,15 +175,15 @@ public Identifier getParent() } } - public Iqicorereferralrequest setParent(Identifier param) + public Iqicorereferralrequest setSubject(Reference param) { - adaptedClass.setParent(param); + adaptedClass.setSubject(param); return this; } - public boolean hasParent() + public boolean hasSubject() { - return adaptedClass.hasParent(); + return adaptedClass.hasSubject(); } public boolean hasImplicitRules() @@ -385,7 +375,7 @@ public boolean hasStatusElement() return adaptedClass.hasStatusElement(); } - public ReferralRequest.ReferralStatus getStatus() + public ReferralRequest.ReferralRequestStatus getStatus() { try { @@ -397,7 +387,7 @@ public ReferralRequest.ReferralStatus getStatus() } } - public Enumeration getStatusElement() + public Enumeration getStatusElement() { try { @@ -409,14 +399,14 @@ public Enumeration getStatusElement() } } - public Iqicorereferralrequest setStatus(ReferralRequest.ReferralStatus param) + public Iqicorereferralrequest setStatus(ReferralRequest.ReferralRequestStatus param) { adaptedClass.setStatus(param); return this; } public Iqicorereferralrequest setStatusElement( - Enumeration param) + Enumeration param) { adaptedClass.setStatusElement(param); return this; @@ -459,14 +449,14 @@ public CodeableConcept addServiceRequested() public boolean hasPatient() { - return adaptedClass.hasPatient(); + return adaptedClass.hasSubject(); } public Reference getPatient() { try { - return adaptedClass.getPatient(); + return adaptedClass.getSubject(); } catch (Exception e) { @@ -476,30 +466,30 @@ public Reference getPatient() public Iqicorereferralrequest setPatient(Reference param) { - adaptedClass.setPatient(param); + adaptedClass.setSubject(param); return this; } public Patient getPatientTarget() { return (org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getPatientTarget(); + .getSubjectTarget(); } public Iqicorereferralrequest setPatientTarget(Patient param) { - adaptedClass.setPatientTarget(param); + adaptedClass.setSubjectTarget(param); return this; } public qicorepatientAdapter getPatientAdapterTarget() { - if (adaptedClass.getPatient().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) + if (adaptedClass.getSubject().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) { qicorepatientAdapter profiledType = new qicorepatientAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getPatient().getResource()); + .getSubject().getResource()); return profiledType; } else @@ -511,7 +501,7 @@ public qicorepatientAdapter getPatientAdapterTarget() public Iqicorereferralrequest setPatientAdapterTarget( qicorepatientAdapter param) { - adaptedClass.setPatientTarget(param.getAdaptee()); + adaptedClass.setSubjectTarget(param.getAdaptee()); return this; } @@ -538,30 +528,30 @@ public boolean hasSpecialty() return adaptedClass.hasSpecialty(); } - public Period getFulfillmentTime() + public Period getOccurrencePeriod() { try { - return adaptedClass.getFulfillmentTime(); + return adaptedClass.getOccurrencePeriod(); } catch (Exception e) { - throw new RuntimeException("Error getting FulfillmentTime", e); + throw new RuntimeException("Error getting OccurrencePeriod", e); } } public Iqicorereferralrequest setFulfillmentTime(Period param) { - adaptedClass.setFulfillmentTime(param); + adaptedClass.setOccurrence(param); return this; } - public boolean hasFulfillmentTime() + public boolean hasOccurrencePeriod() { - return adaptedClass.hasFulfillmentTime(); + return adaptedClass.hasOccurrencePeriod(); } - public Reference getRequester() + public ReferralRequest.ReferralRequestRequesterComponent getRequester() { try { @@ -577,7 +567,7 @@ public Resource getRequesterTarget() { try { - return adaptedClass.getRequesterTarget(); + return adaptedClass.getRequester().getAgentTarget(); } catch (Exception e) { @@ -594,7 +584,7 @@ public Reference getRequesterPractitioner() { try { - return adaptedClass.getRequester(); + return adaptedClass.getRequester().getAgent(); } catch (Exception e) { @@ -604,30 +594,30 @@ public Reference getRequesterPractitioner() public Iqicorereferralrequest setRequester(Reference param) { - adaptedClass.setRequester(param); + adaptedClass.getRequester().setAgent(param); return this; } public Practitioner getRequesterPractitionerTarget() { return (org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getRequesterTarget(); + .getRequester().getAgentTarget(); } public Iqicorereferralrequest setRequesterTarget(Practitioner param) { - adaptedClass.setRequesterTarget(param); + adaptedClass.getRequester().setAgentTarget(param); return this; } public qicorepractitionerAdapter getRequesterPractitionerAdapterTarget() { - if (adaptedClass.getRequester().getResource() instanceof org.hl7.fhir.dstu3.model.Practitioner) + if (adaptedClass.getRequester().getAgentTarget() instanceof org.hl7.fhir.dstu3.model.Practitioner) { qicorepractitionerAdapter profiledType = new qicorepractitionerAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Practitioner) adaptedClass - .getRequester().getResource()); + .getRequester().getAgentTarget()); return profiledType; } else @@ -639,7 +629,7 @@ public qicorepractitionerAdapter getRequesterPractitionerAdapterTarget() public Iqicorereferralrequest setRequesterAdapterTarget( qicorepractitionerAdapter param) { - adaptedClass.setRequesterTarget(param.getAdaptee()); + adaptedClass.getRequester().setAgentTarget(param.getAdaptee()); return this; } @@ -647,7 +637,7 @@ public Reference getRequesterOrganization() { try { - return adaptedClass.getRequester(); + return adaptedClass.getRequester().getAgent(); } catch (Exception e) { @@ -658,23 +648,23 @@ public Reference getRequesterOrganization() public Organization getRequesterOrganizationTarget() { return (org.hl7.fhir.dstu3.model.Organization) adaptedClass - .getRequesterTarget(); + .getRequester().getAgentTarget(); } public Iqicorereferralrequest setRequesterTarget(Organization param) { - adaptedClass.setRequesterTarget(param); + adaptedClass.getRequester().setAgentTarget(param); return this; } public qicoreorganizationAdapter getRequesterOrganizationAdapterTarget() { - if (adaptedClass.getRequester().getResource() instanceof org.hl7.fhir.dstu3.model.Organization) + if (adaptedClass.getRequester().getAgentTarget() instanceof org.hl7.fhir.dstu3.model.Organization) { qicoreorganizationAdapter profiledType = new qicoreorganizationAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Organization) adaptedClass - .getRequester().getResource()); + .getRequester().getAgentTarget()); return profiledType; } else @@ -686,7 +676,7 @@ public qicoreorganizationAdapter getRequesterOrganizationAdapterTarget() public Iqicorereferralrequest setRequesterAdapterTarget( qicoreorganizationAdapter param) { - adaptedClass.setRequesterTarget(param.getAdaptee()); + adaptedClass.getRequester().setAgentTarget(param.getAdaptee()); return this; } @@ -694,7 +684,7 @@ public Reference getRequesterPatient() { try { - return adaptedClass.getRequester(); + return adaptedClass.getRequester().getAgent(); } catch (Exception e) { @@ -705,23 +695,23 @@ public Reference getRequesterPatient() public Patient getRequesterPatientTarget() { return (org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getRequesterTarget(); + .getRequester().getAgentTarget(); } public Iqicorereferralrequest setRequesterTarget(Patient param) { - adaptedClass.setRequesterTarget(param); + adaptedClass.getRequester().setAgentTarget(param); return this; } public qicorepatientAdapter getRequesterPatientAdapterTarget() { - if (adaptedClass.getRequester().getResource() instanceof org.hl7.fhir.dstu3.model.Patient) + if (adaptedClass.getRequester().getAgentTarget() instanceof org.hl7.fhir.dstu3.model.Patient) { qicorepatientAdapter profiledType = new qicorepatientAdapter(); profiledType .setAdaptee((org.hl7.fhir.dstu3.model.Patient) adaptedClass - .getRequester().getResource()); + .getRequester().getAgentTarget()); return profiledType; } else @@ -733,25 +723,25 @@ public qicorepatientAdapter getRequesterPatientAdapterTarget() public Iqicorereferralrequest setRequesterAdapterTarget( qicorepatientAdapter param) { - adaptedClass.setRequesterTarget(param.getAdaptee()); + adaptedClass.getRequester().setAgentTarget(param.getAdaptee()); return this; } - public boolean hasCategory() + public boolean hasIntent() { - return adaptedClass.hasCategory(); + return adaptedClass.hasIntent(); } - public boolean hasCategoryElement() + public boolean hasIntentElement() { - return adaptedClass.hasCategoryElement(); + return adaptedClass.hasIntentElement(); } - public ReferralRequest.ReferralCategory getCategory() + public ReferralRequest.ReferralCategory getIntent() { try { - return adaptedClass.getCategory(); + return adaptedClass.getIntent(); } catch (Exception e) { @@ -759,11 +749,11 @@ public ReferralRequest.ReferralCategory getCategory() } } - public Enumeration getCategoryElement() + public Enumeration getIntentElement() { try { - return adaptedClass.getCategoryElement(); + return adaptedClass.getIntentElement(); } catch (Exception e) { @@ -771,17 +761,17 @@ public Enumeration getCategoryElement() } } - public Iqicorereferralrequest setCategory( + public Iqicorereferralrequest setIntent( ReferralRequest.ReferralCategory param) { - adaptedClass.setCategory(param); + adaptedClass.setIntent(param); return this; } - public Iqicorereferralrequest setCategoryElement( + public Iqicorereferralrequest setIntentElement( Enumeration param) { - adaptedClass.setCategoryElement(param); + adaptedClass.setIntentElement(param); return this; } @@ -890,11 +880,11 @@ public List getRecipientOrganizationTarget() { return items; } - public CodeableConcept getReason() + public List getReasonCode() { try { - return adaptedClass.getReason(); + return adaptedClass.getReasonCode(); } catch (Exception e) { @@ -902,15 +892,15 @@ public CodeableConcept getReason() } } - public Iqicorereferralrequest setReason(CodeableConcept param) + public Iqicorereferralrequest setReasonCode(List param) { - adaptedClass.setReason(param); + adaptedClass.setReasonCode(param); return this; } - public boolean hasReason() + public boolean hasReasonCode() { - return adaptedClass.hasReason(); + return adaptedClass.hasReasonCode(); } public CodeableConcept getType() @@ -969,4 +959,4 @@ public Identifier addIdentifier() { return adaptedClass.addIdentifier(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/cqf/qicore/dstu3/qicorespecimenAdapter.java b/src/main/java/org/cqf/qicore/dstu3/qicorespecimenAdapter.java index 2b1969d..2789a2c 100644 --- a/src/main/java/org/cqf/qicore/dstu3/qicorespecimenAdapter.java +++ b/src/main/java/org/cqf/qicore/dstu3/qicorespecimenAdapter.java @@ -43,11 +43,11 @@ public void setAdaptee(Specimen param) this.adaptedClass = param; } - public List getTreatment() + public List getProcessing() { try { - return adaptedClass.getTreatment(); + return adaptedClass.getProcessing(); } catch (Exception e) { @@ -56,27 +56,27 @@ public List getTreatment() } public qicorespecimenAdapter setTreatment( - List param) + List param) { - adaptedClass.setTreatment(param); + adaptedClass.setProcessing(param); return this; } - public boolean hasTreatment() + public boolean hasProcessing() { - return adaptedClass.hasTreatment(); + return adaptedClass.hasProcessing(); } - public qicorespecimenAdapter addTreatment( - Specimen.SpecimenTreatmentComponent param) + public qicorespecimenAdapter addProcessing( + Specimen.SpecimenProcessingComponent param) { - adaptedClass.addTreatment(param); + adaptedClass.addProcessing(param); return this; } - public Specimen.SpecimenTreatmentComponent addTreatment() + public Specimen.SpecimenProcessingComponent addTreatment() { - return adaptedClass.addTreatment(); + return adaptedClass.addProcessing(); } public boolean hasImplicitRules() @@ -309,16 +309,6 @@ public boolean hasRequest() return adaptedClass.hasRequest(); } - public List getRequestDiagnosticRequestTarget() { - List items = new java.util.ArrayList<>(); - List resources = adaptedClass - .getRequestTarget(); - for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.DiagnosticRequest) resource); - } - return items; - } - public List getRequest() { return adaptedClass.getRequest(); @@ -326,10 +316,10 @@ public List getRequest() public List getRequestProcedureRequestTarget() { List items = new java.util.ArrayList<>(); - List resources = adaptedClass + List resources = adaptedClass .getRequestTarget(); - for (org.hl7.fhir.dstu3.model.Resource resource : resources) { - items.add((org.hl7.fhir.dstu3.model.ProcedureRequest) resource); + for (ProcedureRequest resource : resources) { + items.add(resource); } return items; } @@ -742,4 +732,4 @@ public Annotation addNote() { return adaptedClass.addNote(); } -} \ No newline at end of file +}