diff --git a/.gitignore b/.gitignore
index f3cbe8ed4..01b1acf66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -303,3 +303,4 @@ local.properties
/org.hl7.fhir.r5/src/test/resources/snapshot-generation/logical1-actual.xml
/org.hl7.fhir.r5/src/test/resources/snapshot-generation/logical2-actual.xml
/org.hl7.fhir.r5.new
+/org.hl7.fhir.r5.newc
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertorResourceNameMapper.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertorResourceNameMapper.java
index 0971a78de..31f434984 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertorResourceNameMapper.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertorResourceNameMapper.java
@@ -43,7 +43,7 @@ public class VersionConvertorResourceNameMapper {
case "DeviceComponent" : return null;
case "DeviceMetric" : return org.hl7.fhir.r5.model.DeviceMetric.class.getSimpleName();
case "DeviceRequest" : return org.hl7.fhir.r5.model.DeviceRequest.class.getSimpleName();
- case "DeviceUseStatement" : return org.hl7.fhir.r5.model.DeviceUseStatement.class.getSimpleName();
+ case "DeviceUseStatement" : return org.hl7.fhir.r5.model.DeviceUsage.class.getSimpleName();
case "DiagnosticReport" : return org.hl7.fhir.r5.model.DiagnosticReport.class.getSimpleName();
case "DocumentManifest" : return org.hl7.fhir.r5.model.DocumentManifest.class.getSimpleName();
case "DocumentReference" : return org.hl7.fhir.r5.model.DocumentReference.class.getSimpleName();
@@ -169,7 +169,7 @@ public class VersionConvertorResourceNameMapper {
case "DeviceDefinition" : return null;
case "DeviceMetric" : return org.hl7.fhir.dstu3.model.DeviceMetric.class.getSimpleName();
case "DeviceRequest" : return org.hl7.fhir.dstu3.model.DeviceRequest.class.getSimpleName();
- case "DeviceUseStatement" : return org.hl7.fhir.dstu3.model.DeviceUseStatement.class.getSimpleName();
+ case "DeviceUsage" : return org.hl7.fhir.dstu3.model.DeviceUseStatement.class.getSimpleName();
case "DiagnosticReport" : return org.hl7.fhir.dstu3.model.DiagnosticReport.class.getSimpleName();
case "DocumentManifest" : return org.hl7.fhir.dstu3.model.DocumentManifest.class.getSimpleName();
case "DocumentReference" : return org.hl7.fhir.dstu3.model.DocumentReference.class.getSimpleName();
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_30.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_30.java
index d169a697b..d5ac5381e 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_30.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_30.java
@@ -46,7 +46,7 @@ import java.util.stream.Collectors;
POSSIBILITY OF SUCH DAMAGE.
*/
-public class VersionConvertor_10_30 {
+public class VersionConvertor_10_30 extends VersionConvertor_Base {
public static void copyElement(org.hl7.fhir.dstu2.model.Element src, org.hl7.fhir.dstu3.model.Element tgt) throws FHIRException {
tgt.setId(src.getId());
for (org.hl7.fhir.dstu2.model.Extension e : src.getExtension()) {
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_40.java
index 2010fde30..86f67b7af 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_40.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_40.java
@@ -55,7 +55,7 @@ import java.util.stream.Collectors;
POSSIBILITY OF SUCH DAMAGE.
*/
-public class VersionConvertor_10_40 {
+public class VersionConvertor_10_40 extends VersionConvertor_Base {
static public List CANONICAL_URLS = new ArrayList();
static {
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java
index 073707cc9..8698932aa 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java
@@ -54,7 +54,7 @@ import java.util.stream.Collectors;
POSSIBILITY OF SUCH DAMAGE.
*/
-public class VersionConvertor_10_50 {
+public class VersionConvertor_10_50 extends VersionConvertor_Base {
static public List CANONICAL_URLS = new ArrayList();
static {
@@ -2979,8 +2979,8 @@ public class VersionConvertor_10_50 {
return DetectedIssue10_50.convertDetectedIssue((org.hl7.fhir.r5.model.DetectedIssue) src);
if (src instanceof org.hl7.fhir.r5.model.DeviceMetric)
return DeviceMetric10_50.convertDeviceMetric((org.hl7.fhir.r5.model.DeviceMetric) src);
- if (src instanceof org.hl7.fhir.r5.model.DeviceUseStatement)
- return DeviceUseStatement10_50.convertDeviceUseStatement((org.hl7.fhir.r5.model.DeviceUseStatement) src);
+ if (src instanceof org.hl7.fhir.r5.model.DeviceUsage)
+ return DeviceUseStatement10_50.convertDeviceUseStatement((org.hl7.fhir.r5.model.DeviceUsage) src);
if (src instanceof org.hl7.fhir.r5.model.DiagnosticReport)
return DiagnosticReport10_50.convertDiagnosticReport((org.hl7.fhir.r5.model.DiagnosticReport) src);
if (src instanceof org.hl7.fhir.r5.model.DocumentReference)
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_30.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_30.java
index fb3a82da9..a0aef97ea 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_30.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_30.java
@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
POSSIBILITY OF SUCH DAMAGE.
*/
-public class VersionConvertor_14_30 {
+public class VersionConvertor_14_30 extends VersionConvertor_Base {
static public void copyElement(org.hl7.fhir.dstu2016may.model.Element src, org.hl7.fhir.dstu3.model.Element tgt, String... exemptExtensions) throws FHIRException {
if (src.hasId()) tgt.setId(src.getId());
for (org.hl7.fhir.dstu2016may.model.Extension e : src.getExtension()) {
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_40.java
index beb5c3a26..5de05288b 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_40.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_40.java
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
POSSIBILITY OF SUCH DAMAGE.
*/
-public class VersionConvertor_14_40 {
+public class VersionConvertor_14_40 extends VersionConvertor_Base {
static public List CANONICAL_URLS = new ArrayList();
static {
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_50.java
index 1e5124abb..53d55f84e 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_50.java
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
POSSIBILITY OF SUCH DAMAGE.
*/
-public class VersionConvertor_14_50 {
+public class VersionConvertor_14_50 extends VersionConvertor_Base {
static public List CANONICAL_URLS = new ArrayList();
static {
@@ -299,6 +299,13 @@ public class VersionConvertor_14_50 {
return tgt;
}
+ public static org.hl7.fhir.r5.model.MarkdownType convertStringToMarkdown(org.hl7.fhir.dstu2016may.model.StringType src) throws FHIRException {
+ org.hl7.fhir.r5.model.MarkdownType tgt = src.hasValue() ? new org.hl7.fhir.r5.model.MarkdownType(src.getValue()) : new org.hl7.fhir.r5.model.MarkdownType();
+ copyElement(src, tgt);
+ return tgt;
+ }
+
+
public static org.hl7.fhir.r5.model.TimeType convertTime(org.hl7.fhir.dstu2016may.model.TimeType src) throws FHIRException {
org.hl7.fhir.r5.model.TimeType tgt = new org.hl7.fhir.r5.model.TimeType();
if (src.hasValue()) tgt.setValue(src.getValue());
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_40.java
index 1e2e01df8..7b4d7be20 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_40.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_40.java
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
POSSIBILITY OF SUCH DAMAGE.
*/
-public class VersionConvertor_30_40 {
+public class VersionConvertor_30_40 extends VersionConvertor_Base {
static final public String EXT_SRC_TYPE = "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type";
static public List CANONICAL_URLS = new ArrayList<>();
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java
index a2462232f..7528733a8 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java
@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
POSSIBILITY OF SUCH DAMAGE.
*/
-public class VersionConvertor_30_50 {
+public class VersionConvertor_30_50 extends VersionConvertor_Base {
static final public String EXT_SRC_TYPE = "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type";
static public List CANONICAL_URLS = new ArrayList<>();
@@ -4805,8 +4805,8 @@ public class VersionConvertor_30_50 {
return Consent30_50.convertConsent((org.hl7.fhir.r5.model.Consent) src);
if (src instanceof org.hl7.fhir.r5.model.DetectedIssue)
return DetectedIssue30_50.convertDetectedIssue((org.hl7.fhir.r5.model.DetectedIssue) src);
- if (src instanceof org.hl7.fhir.r5.model.DeviceUseStatement)
- return DeviceUseStatement30_50.convertDeviceUseStatement((org.hl7.fhir.r5.model.DeviceUseStatement) src);
+ if (src instanceof org.hl7.fhir.r5.model.DeviceUsage)
+ return DeviceUseStatement30_50.convertDeviceUseStatement((org.hl7.fhir.r5.model.DeviceUsage) src);
if (src instanceof org.hl7.fhir.r5.model.DiagnosticReport)
return DiagnosticReport30_50.convertDiagnosticReport((org.hl7.fhir.r5.model.DiagnosticReport) src);
if (src instanceof org.hl7.fhir.r5.model.DocumentReference)
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_40_50.java
index 3bc4ded03..15749d1e7 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_40_50.java
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
POSSIBILITY OF SUCH DAMAGE.
*/
-public class VersionConvertor_40_50 {
+public class VersionConvertor_40_50 extends VersionConvertor_Base {
static public boolean isExemptExtension(String url, String[] extensionsToIgnore) {
boolean ok = false;
for (String s : extensionsToIgnore) if (s.equals(url)) ok = true;
@@ -3478,8 +3478,8 @@ public class VersionConvertor_40_50 {
return Coverage40_50.convertCoverage((org.hl7.fhir.r4.model.Coverage) src);
if (src instanceof org.hl7.fhir.r4.model.CoverageEligibilityRequest)
return CoverageEligibilityRequest40_50.convertCoverageEligibilityRequest((org.hl7.fhir.r4.model.CoverageEligibilityRequest) src);
- if (src instanceof org.hl7.fhir.r4.model.CoverageEligibilityResponse)
- return CoverageEligibilityResponse40_50.convertCoverageEligibilityResponse((org.hl7.fhir.r4.model.CoverageEligibilityResponse) src);
+// if (src instanceof org.hl7.fhir.r4.model.CoverageEligibilityResponse)
+// return CoverageEligibilityResponse40_50.convertCoverageEligibilityResponse((org.hl7.fhir.r4.model.CoverageEligibilityResponse) src);
if (src instanceof org.hl7.fhir.r4.model.DetectedIssue)
return DetectedIssue40_50.convertDetectedIssue((org.hl7.fhir.r4.model.DetectedIssue) src);
if (src instanceof org.hl7.fhir.r4.model.Device)
@@ -3504,8 +3504,8 @@ public class VersionConvertor_40_50 {
return Endpoint40_50.convertEndpoint((org.hl7.fhir.r4.model.Endpoint) src);
if (src instanceof org.hl7.fhir.r4.model.EnrollmentRequest)
return EnrollmentRequest40_50.convertEnrollmentRequest((org.hl7.fhir.r4.model.EnrollmentRequest) src);
- if (src instanceof org.hl7.fhir.r4.model.EnrollmentResponse)
- return EnrollmentResponse40_50.convertEnrollmentResponse((org.hl7.fhir.r4.model.EnrollmentResponse) src);
+// if (src instanceof org.hl7.fhir.r4.model.EnrollmentResponse)
+// return EnrollmentResponse40_50.convertEnrollmentResponse((org.hl7.fhir.r4.model.EnrollmentResponse) src);
if (src instanceof org.hl7.fhir.r4.model.EpisodeOfCare)
return EpisodeOfCare40_50.convertEpisodeOfCare((org.hl7.fhir.r4.model.EpisodeOfCare) src);
if (src instanceof org.hl7.fhir.r4.model.EventDefinition)
@@ -3564,8 +3564,8 @@ public class VersionConvertor_40_50 {
return MedicationRequest40_50.convertMedicationRequest((org.hl7.fhir.r4.model.MedicationRequest) src);
if (src instanceof org.hl7.fhir.r4.model.MedicationStatement)
return MedicationStatement40_50.convertMedicationStatement((org.hl7.fhir.r4.model.MedicationStatement) src);
- if (src instanceof org.hl7.fhir.r4.model.MedicinalProduct)
- return MedicinalProductDefinition40_50.convertMedicinalProduct((org.hl7.fhir.r4.model.MedicinalProduct) src);
+// if (src instanceof org.hl7.fhir.r4.model.MedicinalProduct)
+// return MedicinalProductDefinition40_50.convertMedicinalProduct((org.hl7.fhir.r4.model.MedicinalProduct) src);
if (src instanceof org.hl7.fhir.r4.model.MessageDefinition)
return MessageDefinition40_50.convertMessageDefinition((org.hl7.fhir.r4.model.MessageDefinition) src);
if (src instanceof org.hl7.fhir.r4.model.MessageHeader)
@@ -3592,8 +3592,8 @@ public class VersionConvertor_40_50 {
return Patient40_50.convertPatient((org.hl7.fhir.r4.model.Patient) src);
if (src instanceof org.hl7.fhir.r4.model.PaymentNotice)
return PaymentNotice40_50.convertPaymentNotice((org.hl7.fhir.r4.model.PaymentNotice) src);
- if (src instanceof org.hl7.fhir.r4.model.PaymentReconciliation)
- return PaymentReconciliation40_50.convertPaymentReconciliation((org.hl7.fhir.r4.model.PaymentReconciliation) src);
+// if (src instanceof org.hl7.fhir.r4.model.PaymentReconciliation)
+// return PaymentReconciliation40_50.convertPaymentReconciliation((org.hl7.fhir.r4.model.PaymentReconciliation) src);
if (src instanceof org.hl7.fhir.r4.model.Person)
return Person40_50.convertPerson((org.hl7.fhir.r4.model.Person) src);
if (src instanceof org.hl7.fhir.r4.model.PlanDefinition)
@@ -3612,12 +3612,12 @@ public class VersionConvertor_40_50 {
return QuestionnaireResponse40_50.convertQuestionnaireResponse((org.hl7.fhir.r4.model.QuestionnaireResponse) src);
if (src instanceof org.hl7.fhir.r4.model.RelatedPerson)
return RelatedPerson40_50.convertRelatedPerson((org.hl7.fhir.r4.model.RelatedPerson) src);
- if (src instanceof org.hl7.fhir.r4.model.RequestGroup)
- return RequestGroup40_50.convertRequestGroup((org.hl7.fhir.r4.model.RequestGroup) src);
- if (src instanceof org.hl7.fhir.r4.model.ResearchStudy)
- return ResearchStudy40_50.convertResearchStudy((org.hl7.fhir.r4.model.ResearchStudy) src);
- if (src instanceof org.hl7.fhir.r4.model.ResearchSubject)
- return ResearchSubject40_50.convertResearchSubject((org.hl7.fhir.r4.model.ResearchSubject) src);
+// if (src instanceof org.hl7.fhir.r4.model.RequestGroup)
+// return RequestGroup40_50.convertRequestGroup((org.hl7.fhir.r4.model.RequestGroup) src);
+// if (src instanceof org.hl7.fhir.r4.model.ResearchStudy)
+// return ResearchStudy40_50.convertResearchStudy((org.hl7.fhir.r4.model.ResearchStudy) src);
+// if (src instanceof org.hl7.fhir.r4.model.ResearchSubject)
+// return ResearchSubject40_50.convertResearchSubject((org.hl7.fhir.r4.model.ResearchSubject) src);
if (src instanceof org.hl7.fhir.r4.model.RiskAssessment)
return RiskAssessment40_50.convertRiskAssessment((org.hl7.fhir.r4.model.RiskAssessment) src);
if (src instanceof org.hl7.fhir.r4.model.Schedule)
@@ -3729,8 +3729,8 @@ public class VersionConvertor_40_50 {
return Coverage40_50.convertCoverage((org.hl7.fhir.r5.model.Coverage) src);
if (src instanceof org.hl7.fhir.r5.model.CoverageEligibilityRequest)
return CoverageEligibilityRequest40_50.convertCoverageEligibilityRequest((org.hl7.fhir.r5.model.CoverageEligibilityRequest) src);
- if (src instanceof org.hl7.fhir.r5.model.CoverageEligibilityResponse)
- return CoverageEligibilityResponse40_50.convertCoverageEligibilityResponse((org.hl7.fhir.r5.model.CoverageEligibilityResponse) src);
+// if (src instanceof org.hl7.fhir.r5.model.CoverageEligibilityResponse)
+// return CoverageEligibilityResponse40_50.convertCoverageEligibilityResponse((org.hl7.fhir.r5.model.CoverageEligibilityResponse) src);
if (src instanceof org.hl7.fhir.r5.model.DetectedIssue)
return DetectedIssue40_50.convertDetectedIssue((org.hl7.fhir.r5.model.DetectedIssue) src);
if (src instanceof org.hl7.fhir.r5.model.Device)
@@ -3741,8 +3741,8 @@ public class VersionConvertor_40_50 {
return DeviceMetric40_50.convertDeviceMetric((org.hl7.fhir.r5.model.DeviceMetric) src);
if (src instanceof org.hl7.fhir.r5.model.DeviceRequest)
return DeviceRequest40_50.convertDeviceRequest((org.hl7.fhir.r5.model.DeviceRequest) src);
- if (src instanceof org.hl7.fhir.r5.model.DeviceUseStatement)
- return DeviceUseStatement40_50.convertDeviceUseStatement((org.hl7.fhir.r5.model.DeviceUseStatement) src);
+ if (src instanceof org.hl7.fhir.r5.model.DeviceUsage)
+ return DeviceUseStatement40_50.convertDeviceUseStatement((org.hl7.fhir.r5.model.DeviceUsage) src);
if (src instanceof org.hl7.fhir.r5.model.DiagnosticReport)
return DiagnosticReport40_50.convertDiagnosticReport((org.hl7.fhir.r5.model.DiagnosticReport) src);
if (src instanceof org.hl7.fhir.r5.model.DocumentManifest)
@@ -3755,8 +3755,8 @@ public class VersionConvertor_40_50 {
return Endpoint40_50.convertEndpoint((org.hl7.fhir.r5.model.Endpoint) src);
if (src instanceof org.hl7.fhir.r5.model.EnrollmentRequest)
return EnrollmentRequest40_50.convertEnrollmentRequest((org.hl7.fhir.r5.model.EnrollmentRequest) src);
- if (src instanceof org.hl7.fhir.r5.model.EnrollmentResponse)
- return EnrollmentResponse40_50.convertEnrollmentResponse((org.hl7.fhir.r5.model.EnrollmentResponse) src);
+// if (src instanceof org.hl7.fhir.r5.model.EnrollmentResponse)
+// return EnrollmentResponse40_50.convertEnrollmentResponse((org.hl7.fhir.r5.model.EnrollmentResponse) src);
if (src instanceof org.hl7.fhir.r5.model.EpisodeOfCare)
return EpisodeOfCare40_50.convertEpisodeOfCare((org.hl7.fhir.r5.model.EpisodeOfCare) src);
if (src instanceof org.hl7.fhir.r5.model.EventDefinition)
@@ -3816,8 +3816,8 @@ public class VersionConvertor_40_50 {
return MedicationRequest40_50.convertMedicationRequest((org.hl7.fhir.r5.model.MedicationRequest) src);
if (src instanceof org.hl7.fhir.r5.model.MedicationUsage)
return MedicationStatement40_50.convertMedicationStatement((org.hl7.fhir.r5.model.MedicationUsage) src);
- if (src instanceof org.hl7.fhir.r5.model.MedicinalProductDefinition)
- return MedicinalProductDefinition40_50.convertMedicinalProductDefinition((org.hl7.fhir.r5.model.MedicinalProductDefinition) src);
+// if (src instanceof org.hl7.fhir.r5.model.MedicinalProductDefinition)
+// return MedicinalProductDefinition40_50.convertMedicinalProductDefinition((org.hl7.fhir.r5.model.MedicinalProductDefinition) src);
if (src instanceof org.hl7.fhir.r5.model.MessageDefinition)
return MessageDefinition40_50.convertMessageDefinition((org.hl7.fhir.r5.model.MessageDefinition) src);
if (src instanceof org.hl7.fhir.r5.model.MessageHeader)
@@ -3844,8 +3844,8 @@ public class VersionConvertor_40_50 {
return Patient40_50.convertPatient((org.hl7.fhir.r5.model.Patient) src);
if (src instanceof org.hl7.fhir.r5.model.PaymentNotice)
return PaymentNotice40_50.convertPaymentNotice((org.hl7.fhir.r5.model.PaymentNotice) src);
- if (src instanceof org.hl7.fhir.r5.model.PaymentReconciliation)
- return PaymentReconciliation40_50.convertPaymentReconciliation((org.hl7.fhir.r5.model.PaymentReconciliation) src);
+// if (src instanceof org.hl7.fhir.r5.model.PaymentReconciliation)
+// return PaymentReconciliation40_50.convertPaymentReconciliation((org.hl7.fhir.r5.model.PaymentReconciliation) src);
if (src instanceof org.hl7.fhir.r5.model.Person)
return Person40_50.convertPerson((org.hl7.fhir.r5.model.Person) src);
if (src instanceof org.hl7.fhir.r5.model.PlanDefinition)
@@ -3864,12 +3864,12 @@ public class VersionConvertor_40_50 {
return QuestionnaireResponse40_50.convertQuestionnaireResponse((org.hl7.fhir.r5.model.QuestionnaireResponse) src);
if (src instanceof org.hl7.fhir.r5.model.RelatedPerson)
return RelatedPerson40_50.convertRelatedPerson((org.hl7.fhir.r5.model.RelatedPerson) src);
- if (src instanceof org.hl7.fhir.r5.model.RequestGroup)
- return RequestGroup40_50.convertRequestGroup((org.hl7.fhir.r5.model.RequestGroup) src);
- if (src instanceof org.hl7.fhir.r5.model.ResearchStudy)
- return ResearchStudy40_50.convertResearchStudy((org.hl7.fhir.r5.model.ResearchStudy) src);
- if (src instanceof org.hl7.fhir.r5.model.ResearchSubject)
- return ResearchSubject40_50.convertResearchSubject((org.hl7.fhir.r5.model.ResearchSubject) src);
+// if (src instanceof org.hl7.fhir.r5.model.RequestGroup)
+// return RequestGroup40_50.convertRequestGroup((org.hl7.fhir.r5.model.RequestGroup) src);
+// if (src instanceof org.hl7.fhir.r5.model.ResearchStudy)
+// return ResearchStudy40_50.convertResearchStudy((org.hl7.fhir.r5.model.ResearchStudy) src);
+// if (src instanceof org.hl7.fhir.r5.model.ResearchSubject)
+// return ResearchSubject40_50.convertResearchSubject((org.hl7.fhir.r5.model.ResearchSubject) src);
if (src instanceof org.hl7.fhir.r5.model.RiskAssessment)
return RiskAssessment40_50.convertRiskAssessment((org.hl7.fhir.r5.model.RiskAssessment) src);
if (src instanceof org.hl7.fhir.r5.model.Schedule)
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_Base.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_Base.java
new file mode 100644
index 000000000..34298c5f6
--- /dev/null
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_Base.java
@@ -0,0 +1,13 @@
+package org.hl7.fhir.convertors;
+
+public class VersionConvertor_Base {
+
+ public static org.hl7.fhir.r5.model.CodeableConcept convertAppointmentPriorityToR5(int priority) {
+ return null;
+ }
+
+ public static int convertAppointmentPriorityFromR5(org.hl7.fhir.r5.model.CodeableConcept priority) {
+ return 0;
+ }
+
+}
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Appointment10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Appointment10_50.java
index d36e842a5..96266716a 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Appointment10_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Appointment10_50.java
@@ -1,9 +1,12 @@
package org.hl7.fhir.convertors.conv10_50;
import org.hl7.fhir.convertors.VersionConvertor_10_50;
+import org.hl7.fhir.convertors.VersionConvertor_Base;
+import org.hl7.fhir.dstu2.model.UnsignedIntType;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.CodeableConcept;
-public class Appointment10_50 {
+public class Appointment10_50 extends VersionConvertor_Base {
public static org.hl7.fhir.dstu2.model.Appointment convertAppointment(org.hl7.fhir.r5.model.Appointment src) throws FHIRException {
if (src == null || src.isEmpty())
@@ -14,8 +17,8 @@ public class Appointment10_50 {
if (src.hasStatus())
tgt.setStatusElement(convertAppointmentStatus(src.getStatusElement()));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getServiceType()) tgt.setType(VersionConvertor_10_50.convertCodeableConcept(t));
- if (src.hasPriorityElement())
- tgt.setPriorityElement(VersionConvertor_10_50.convertUnsignedInt(src.getPriorityElement()));
+ if (src.hasPriority())
+ tgt.setPriorityElement(convertAppointmentPriority(src.getPriority()));
if (src.hasDescriptionElement())
tgt.setDescriptionElement(VersionConvertor_10_50.convertString(src.getDescriptionElement()));
if (src.hasStartElement())
@@ -31,6 +34,18 @@ public class Appointment10_50 {
return tgt;
}
+ private static UnsignedIntType convertAppointmentPriority(CodeableConcept src) {
+ UnsignedIntType tgt = new UnsignedIntType(convertAppointmentPriorityFromR5(src));
+ VersionConvertor_10_50.copyElement(src, tgt);
+ return tgt;
+ }
+
+ private static CodeableConcept convertAppointmentPriority(UnsignedIntType src) {
+ CodeableConcept tgt = src.hasValue() ? convertAppointmentPriorityToR5(src.getValue()) : new CodeableConcept();
+ VersionConvertor_10_50.copyElement(src, tgt);
+ return tgt;
+ }
+
public static org.hl7.fhir.r5.model.Appointment convertAppointment(org.hl7.fhir.dstu2.model.Appointment src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
@@ -42,7 +57,7 @@ public class Appointment10_50 {
if (src.hasType())
tgt.addServiceType(VersionConvertor_10_50.convertCodeableConcept(src.getType()));
if (src.hasPriorityElement())
- tgt.setPriorityElement(VersionConvertor_10_50.convertUnsignedInt(src.getPriorityElement()));
+ tgt.setPriority(convertAppointmentPriority(src.getPriorityElement()));
if (src.hasDescriptionElement())
tgt.setDescriptionElement(VersionConvertor_10_50.convertString(src.getDescriptionElement()));
if (src.hasStartElement())
@@ -58,6 +73,7 @@ public class Appointment10_50 {
return tgt;
}
+
public static org.hl7.fhir.dstu2.model.Appointment.AppointmentParticipantComponent convertAppointmentParticipantComponent(org.hl7.fhir.r5.model.Appointment.AppointmentParticipantComponent src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/CarePlan10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/CarePlan10_50.java
index 149cae38f..14989fd16 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/CarePlan10_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/CarePlan10_50.java
@@ -70,10 +70,10 @@ public class CarePlan10_50 {
org.hl7.fhir.dstu2.model.CarePlan.CarePlanActivityComponent tgt = new org.hl7.fhir.dstu2.model.CarePlan.CarePlanActivityComponent();
VersionConvertor_10_50.copyElement(src, tgt);
for (org.hl7.fhir.r5.model.Annotation t : src.getProgress()) tgt.addProgress(VersionConvertor_10_50.convertAnnotation(t));
- if (src.hasReference())
- tgt.setReference(VersionConvertor_10_50.convertReference(src.getReference()));
- if (src.hasDetail())
- tgt.setDetail(convertCarePlanActivityDetailComponent(src.getDetail()));
+ if (src.hasPlannedActivityReference())
+ tgt.setReference(VersionConvertor_10_50.convertReference(src.getPlannedActivityReference()));
+ if (src.hasPlannedActivityDetail())
+ tgt.setDetail(convertCarePlanActivityDetailComponent(src.getPlannedActivityDetail()));
return tgt;
}
@@ -84,16 +84,16 @@ public class CarePlan10_50 {
VersionConvertor_10_50.copyElement(src, tgt);
for (org.hl7.fhir.dstu2.model.Annotation t : src.getProgress()) tgt.addProgress(VersionConvertor_10_50.convertAnnotation(t));
if (src.hasReference())
- tgt.setReference(VersionConvertor_10_50.convertReference(src.getReference()));
+ tgt.setPlannedActivityReference(VersionConvertor_10_50.convertReference(src.getReference()));
if (src.hasDetail())
- tgt.setDetail(convertCarePlanActivityDetailComponent(src.getDetail()));
+ tgt.setPlannedActivityDetail(convertCarePlanActivityDetailComponent(src.getDetail()));
return tgt;
}
- public static org.hl7.fhir.r5.model.CarePlan.CarePlanActivityDetailComponent convertCarePlanActivityDetailComponent(org.hl7.fhir.dstu2.model.CarePlan.CarePlanActivityDetailComponent src) throws FHIRException {
+ public static org.hl7.fhir.r5.model.CarePlan.CarePlanActivityPlannedActivityDetailComponent convertCarePlanActivityDetailComponent(org.hl7.fhir.dstu2.model.CarePlan.CarePlanActivityDetailComponent src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
- org.hl7.fhir.r5.model.CarePlan.CarePlanActivityDetailComponent tgt = new org.hl7.fhir.r5.model.CarePlan.CarePlanActivityDetailComponent();
+ org.hl7.fhir.r5.model.CarePlan.CarePlanActivityPlannedActivityDetailComponent tgt = new org.hl7.fhir.r5.model.CarePlan.CarePlanActivityPlannedActivityDetailComponent();
VersionConvertor_10_50.copyElement(src, tgt);
if (src.hasCode())
tgt.setCode(VersionConvertor_10_50.convertCodeableConcept(src.getCode()));
@@ -120,7 +120,7 @@ public class CarePlan10_50 {
return tgt;
}
- public static org.hl7.fhir.dstu2.model.CarePlan.CarePlanActivityDetailComponent convertCarePlanActivityDetailComponent(org.hl7.fhir.r5.model.CarePlan.CarePlanActivityDetailComponent src) throws FHIRException {
+ public static org.hl7.fhir.dstu2.model.CarePlan.CarePlanActivityDetailComponent convertCarePlanActivityDetailComponent(org.hl7.fhir.r5.model.CarePlan.CarePlanActivityPlannedActivityDetailComponent src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
org.hl7.fhir.dstu2.model.CarePlan.CarePlanActivityDetailComponent tgt = new org.hl7.fhir.dstu2.model.CarePlan.CarePlanActivityDetailComponent();
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/DeviceUseStatement10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/DeviceUseStatement10_50.java
index f144a1924..c0a95be9c 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/DeviceUseStatement10_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/DeviceUseStatement10_50.java
@@ -7,10 +7,10 @@ import org.hl7.fhir.r5.model.CodeableReference;
public class DeviceUseStatement10_50 {
- public static org.hl7.fhir.r5.model.DeviceUseStatement convertDeviceUseStatement(org.hl7.fhir.dstu2.model.DeviceUseStatement src) throws FHIRException {
+ public static org.hl7.fhir.r5.model.DeviceUsage convertDeviceUseStatement(org.hl7.fhir.dstu2.model.DeviceUseStatement src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
- org.hl7.fhir.r5.model.DeviceUseStatement tgt = new org.hl7.fhir.r5.model.DeviceUseStatement();
+ org.hl7.fhir.r5.model.DeviceUsage tgt = new org.hl7.fhir.r5.model.DeviceUsage();
VersionConvertor_10_50.copyDomainResource(src, tgt);
if (src.hasBodySiteCodeableConcept())
tgt.getBodySite().setConcept(VersionConvertor_10_50.convertCodeableConcept(src.getBodySiteCodeableConcept()));
@@ -28,7 +28,7 @@ public class DeviceUseStatement10_50 {
return tgt;
}
- public static org.hl7.fhir.dstu2.model.DeviceUseStatement convertDeviceUseStatement(org.hl7.fhir.r5.model.DeviceUseStatement src) throws FHIRException {
+ public static org.hl7.fhir.dstu2.model.DeviceUseStatement convertDeviceUseStatement(org.hl7.fhir.r5.model.DeviceUsage src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
org.hl7.fhir.dstu2.model.DeviceUseStatement tgt = new org.hl7.fhir.dstu2.model.DeviceUseStatement();
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/MedicationStatement10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/MedicationStatement10_50.java
index 6ef18e55c..eeda7650c 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/MedicationStatement10_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/MedicationStatement10_50.java
@@ -122,7 +122,7 @@ public class MedicationStatement10_50 {
VersionConvertor_10_50.copyElement(src, tgt);
switch(src.getValue()) {
case ACTIVE:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.ACTIVE);
+ tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.COMPLETED);
break;
case COMPLETED:
tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.COMPLETED);
@@ -131,7 +131,7 @@ public class MedicationStatement10_50 {
tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.ENTEREDINERROR);
break;
case INTENDED:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.INTENDED);
+ tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.UNKNOWN);
break;
default:
tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.NULL);
@@ -146,16 +146,16 @@ public class MedicationStatement10_50 {
org.hl7.fhir.dstu2.model.Enumeration tgt = new org.hl7.fhir.dstu2.model.Enumeration<>(new org.hl7.fhir.dstu2.model.MedicationStatement.MedicationStatementStatusEnumFactory());
VersionConvertor_10_50.copyElement(src, tgt);
switch(src.getValue()) {
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.dstu2.model.MedicationStatement.MedicationStatementStatus.ACTIVE);
- break;
+// case ACTIVE:
+// tgt.setValue(org.hl7.fhir.dstu2.model.MedicationStatement.MedicationStatementStatus.ACTIVE);
+// break;
case COMPLETED:
tgt.setValue(org.hl7.fhir.dstu2.model.MedicationStatement.MedicationStatementStatus.COMPLETED);
break;
case ENTEREDINERROR:
tgt.setValue(org.hl7.fhir.dstu2.model.MedicationStatement.MedicationStatementStatus.ENTEREDINERROR);
break;
- case INTENDED:
+ case UNKNOWN:
tgt.setValue(org.hl7.fhir.dstu2.model.MedicationStatement.MedicationStatementStatus.INTENDED);
break;
default:
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Questionnaire10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Questionnaire10_50.java
index f5f4b51be..9a28dff49 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Questionnaire10_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Questionnaire10_50.java
@@ -1,9 +1,11 @@
package org.hl7.fhir.convertors.conv10_50;
import org.hl7.fhir.convertors.VersionConvertor_10_50;
+import org.hl7.fhir.dstu2.model.Questionnaire.AnswerFormat;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r5.model.CodeType;
import org.hl7.fhir.r5.model.ContactDetail;
+import org.hl7.fhir.r5.model.Questionnaire.QuestionnaireAnswerConstraint;
import org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemAnswerOptionComponent;
public class Questionnaire10_50 {
@@ -98,7 +100,7 @@ public class Questionnaire10_50 {
tgt.setLinkIdElement(VersionConvertor_10_50.convertString(src.getLinkIdElement()));
for (org.hl7.fhir.dstu2.model.Coding t : src.getConcept()) tgt.addCode(VersionConvertor_10_50.convertCoding(t));
if (src.hasTextElement())
- tgt.setTextElement(VersionConvertor_10_50.convertString(src.getTextElement()));
+ tgt.setTextElement(VersionConvertor_10_50.convertStringToMarkdown(src.getTextElement()));
tgt.setType(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.GROUP);
if (src.hasRequiredElement())
tgt.setRequiredElement(VersionConvertor_10_50.convertBoolean(src.getRequiredElement()));
@@ -109,7 +111,7 @@ public class Questionnaire10_50 {
return tgt;
}
- static public org.hl7.fhir.dstu2.model.Enumeration convertQuestionnaireItemType(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
+ static public org.hl7.fhir.dstu2.model.Enumeration convertQuestionnaireItemType(org.hl7.fhir.r5.model.Enumeration src, QuestionnaireAnswerConstraint constraint) throws FHIRException {
if (src == null || src.isEmpty())
return null;
org.hl7.fhir.dstu2.model.Enumeration tgt = new org.hl7.fhir.dstu2.model.Enumeration<>(new org.hl7.fhir.dstu2.model.Questionnaire.AnswerFormatEnumFactory());
@@ -142,11 +144,11 @@ public class Questionnaire10_50 {
case URL:
tgt.setValue(org.hl7.fhir.dstu2.model.Questionnaire.AnswerFormat.URL);
break;
- case CHOICE:
- tgt.setValue(org.hl7.fhir.dstu2.model.Questionnaire.AnswerFormat.CHOICE);
- break;
- case OPENCHOICE:
- tgt.setValue(org.hl7.fhir.dstu2.model.Questionnaire.AnswerFormat.OPENCHOICE);
+ case CODING:
+ if (constraint == QuestionnaireAnswerConstraint.OPTIONSORSTRING)
+ tgt.setValue(org.hl7.fhir.dstu2.model.Questionnaire.AnswerFormat.OPENCHOICE);
+ else
+ tgt.setValue(org.hl7.fhir.dstu2.model.Questionnaire.AnswerFormat.CHOICE);
break;
case ATTACHMENT:
tgt.setValue(org.hl7.fhir.dstu2.model.Questionnaire.AnswerFormat.ATTACHMENT);
@@ -175,7 +177,7 @@ public class Questionnaire10_50 {
if (src.hasTextElement())
tgt.setTextElement(VersionConvertor_10_50.convertString(src.getTextElement()));
if (src.hasType())
- tgt.setTypeElement(convertQuestionnaireItemType(src.getTypeElement()));
+ tgt.setTypeElement(convertQuestionnaireItemType(src.getTypeElement(), src.getAnswerConstraint()));
if (src.hasRequiredElement())
tgt.setRequiredElement(VersionConvertor_10_50.convertBoolean(src.getRequiredElement()));
if (src.hasRepeatsElement())
@@ -201,9 +203,15 @@ public class Questionnaire10_50 {
tgt.setLinkIdElement(VersionConvertor_10_50.convertString(src.getLinkIdElement()));
for (org.hl7.fhir.dstu2.model.Coding t : src.getConcept()) tgt.addCode(VersionConvertor_10_50.convertCoding(t));
if (src.hasTextElement())
- tgt.setTextElement(VersionConvertor_10_50.convertString(src.getTextElement()));
- if (src.hasType())
+ tgt.setTextElement(VersionConvertor_10_50.convertStringToMarkdown(src.getTextElement()));
+ if (src.hasType()) {
tgt.setTypeElement(convertQuestionnaireQuestionType(src.getTypeElement()));
+ if (src.getType() == AnswerFormat.CHOICE) {
+ tgt.setAnswerConstraint(QuestionnaireAnswerConstraint.OPTIONSONLY);
+ } else if (src.getType() == AnswerFormat.OPENCHOICE) {
+ tgt.setAnswerConstraint(QuestionnaireAnswerConstraint.OPTIONSORSTRING);
+ }
+ }
if (src.hasRequiredElement())
tgt.setRequiredElement(VersionConvertor_10_50.convertBoolean(src.getRequiredElement()));
if (src.hasRepeatsElement())
@@ -252,10 +260,10 @@ public class Questionnaire10_50 {
tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.URL);
break;
case CHOICE:
- tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.CHOICE);
+ tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.CODING);
break;
case OPENCHOICE:
- tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.OPENCHOICE);
+ tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.CODING);
break;
case ATTACHMENT:
tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.ATTACHMENT);
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Substance10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Substance10_50.java
index f5c708de7..466e4dc13 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Substance10_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/Substance10_50.java
@@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv10_50;
import org.hl7.fhir.convertors.VersionConvertor_10_50;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.Identifier;
public class Substance10_50 {
@@ -13,10 +14,10 @@ public class Substance10_50 {
for (org.hl7.fhir.dstu2.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_50.convertIdentifier(t));
for (org.hl7.fhir.dstu2.model.CodeableConcept t : src.getCategory()) tgt.addCategory(VersionConvertor_10_50.convertCodeableConcept(t));
if (src.hasCode())
- tgt.setCode(VersionConvertor_10_50.convertCodeableConcept(src.getCode()));
+ tgt.getCode().setConcept(VersionConvertor_10_50.convertCodeableConcept(src.getCode()));
if (src.hasDescriptionElement())
tgt.setDescriptionElement(VersionConvertor_10_50.convertString(src.getDescriptionElement()));
- for (org.hl7.fhir.dstu2.model.Substance.SubstanceInstanceComponent t : src.getInstance()) tgt.addInstance(convertSubstanceInstanceComponent(t));
+ for (org.hl7.fhir.dstu2.model.Substance.SubstanceInstanceComponent t : src.getInstance()) convertSubstanceInstanceComponent(t, tgt);
for (org.hl7.fhir.dstu2.model.Substance.SubstanceIngredientComponent t : src.getIngredient()) tgt.addIngredient(convertSubstanceIngredientComponent(t));
return tgt;
}
@@ -29,10 +30,12 @@ public class Substance10_50 {
for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_10_50.convertIdentifier(t));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getCategory()) tgt.addCategory(VersionConvertor_10_50.convertCodeableConcept(t));
if (src.hasCode())
- tgt.setCode(VersionConvertor_10_50.convertCodeableConcept(src.getCode()));
+ tgt.setCode(VersionConvertor_10_50.convertCodeableConcept(src.getCode().getConcept()));
if (src.hasDescriptionElement())
tgt.setDescriptionElement(VersionConvertor_10_50.convertString(src.getDescriptionElement()));
- for (org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent t : src.getInstance()) tgt.addInstance(convertSubstanceInstanceComponent(t));
+ if (src.getInstance()) {
+ tgt.addInstance(convertSubstanceInstanceComponent(src));
+ }
for (org.hl7.fhir.r5.model.Substance.SubstanceIngredientComponent t : src.getIngredient()) tgt.addIngredient(convertSubstanceIngredientComponent(t));
return tgt;
}
@@ -59,31 +62,26 @@ public class Substance10_50 {
return tgt;
}
- public static org.hl7.fhir.dstu2.model.Substance.SubstanceInstanceComponent convertSubstanceInstanceComponent(org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
+ public static org.hl7.fhir.dstu2.model.Substance.SubstanceInstanceComponent convertSubstanceInstanceComponent(org.hl7.fhir.r5.model.Substance src) throws FHIRException {
org.hl7.fhir.dstu2.model.Substance.SubstanceInstanceComponent tgt = new org.hl7.fhir.dstu2.model.Substance.SubstanceInstanceComponent();
- VersionConvertor_10_50.copyElement(src, tgt);
- if (src.hasIdentifier())
- tgt.setIdentifier(VersionConvertor_10_50.convertIdentifier(src.getIdentifier()));
- if (src.hasExpiryElement())
- tgt.setExpiryElement(VersionConvertor_10_50.convertDateTime(src.getExpiryElement()));
- if (src.hasQuantity())
- tgt.setQuantity(VersionConvertor_10_50.convertSimpleQuantity(src.getQuantity()));
- return tgt;
- }
+ for (Identifier t : src.getIdentifier()) {
+ tgt.setIdentifier(VersionConvertor_10_50.convertIdentifier(t));
+ }
+ if (src.hasExpiry())
+ tgt.setExpiryElement(VersionConvertor_10_50.convertDateTime(src.getExpiryElement()));
+ if (src.hasQuantity())
+ tgt.setQuantity(VersionConvertor_10_50.convertSimpleQuantity(src.getQuantity()));
+ return tgt;
+ }
- public static org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent convertSubstanceInstanceComponent(org.hl7.fhir.dstu2.model.Substance.SubstanceInstanceComponent src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent tgt = new org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent();
- VersionConvertor_10_50.copyElement(src, tgt);
+
+ public static void convertSubstanceInstanceComponent(org.hl7.fhir.dstu2.model.Substance.SubstanceInstanceComponent src, org.hl7.fhir.r5.model.Substance tgt) throws FHIRException {
+ tgt.setInstance(true);
if (src.hasIdentifier())
- tgt.setIdentifier(VersionConvertor_10_50.convertIdentifier(src.getIdentifier()));
+ tgt.addIdentifier(VersionConvertor_10_50.convertIdentifier(src.getIdentifier()));
if (src.hasExpiryElement())
tgt.setExpiryElement(VersionConvertor_10_50.convertDateTime(src.getExpiryElement()));
if (src.hasQuantity())
tgt.setQuantity(VersionConvertor_10_50.convertSimpleQuantity(src.getQuantity()));
- return tgt;
}
}
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Questionnaire14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Questionnaire14_50.java
index 4238da85a..5960af264 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Questionnaire14_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/Questionnaire14_50.java
@@ -1,9 +1,11 @@
package org.hl7.fhir.convertors.conv14_50;
import org.hl7.fhir.convertors.VersionConvertor_14_50;
+import org.hl7.fhir.dstu2016may.model.Questionnaire.QuestionnaireItemType;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r5.model.CodeType;
import org.hl7.fhir.r5.model.ContactDetail;
+import org.hl7.fhir.r5.model.Questionnaire.QuestionnaireAnswerConstraint;
import org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemOperator;
import org.hl7.fhir.r5.model.UsageContext;
@@ -87,7 +89,7 @@ public class Questionnaire14_50 {
if (src.hasText())
tgt.setTextElement(VersionConvertor_14_50.convertString(src.getTextElement()));
if (src.hasType())
- tgt.setTypeElement(convertQuestionnaireItemType(src.getTypeElement()));
+ tgt.setTypeElement(convertQuestionnaireItemType(src.getTypeElement(), src.getAnswerConstraint()));
for (org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemEnableWhenComponent t : src.getEnableWhen()) tgt.addEnableWhen(convertQuestionnaireItemEnableWhenComponent(t));
if (src.hasRequired())
tgt.setRequiredElement(VersionConvertor_14_50.convertBoolean(src.getRequiredElement()));
@@ -117,9 +119,15 @@ public class Questionnaire14_50 {
if (src.hasPrefix())
tgt.setPrefixElement(VersionConvertor_14_50.convertString(src.getPrefixElement()));
if (src.hasText())
- tgt.setTextElement(VersionConvertor_14_50.convertString(src.getTextElement()));
- if (src.hasType())
+ tgt.setTextElement(VersionConvertor_14_50.convertStringToMarkdown(src.getTextElement()));
+ if (src.hasType()) {
tgt.setTypeElement(convertQuestionnaireItemType(src.getTypeElement()));
+ if (src.getType() == QuestionnaireItemType.CHOICE) {
+ tgt.setAnswerConstraint(QuestionnaireAnswerConstraint.OPTIONSONLY);
+ } else if (src.getType() == QuestionnaireItemType.OPENCHOICE) {
+ tgt.setAnswerConstraint(QuestionnaireAnswerConstraint.OPTIONSORSTRING);
+ }
+ }
for (org.hl7.fhir.dstu2016may.model.Questionnaire.QuestionnaireItemEnableWhenComponent t : src.getEnableWhen()) tgt.addEnableWhen(convertQuestionnaireItemEnableWhenComponent(t));
if (src.hasRequired())
tgt.setRequiredElement(VersionConvertor_14_50.convertBoolean(src.getRequiredElement()));
@@ -235,10 +243,10 @@ public class Questionnaire14_50 {
tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.URL);
break;
case CHOICE:
- tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.CHOICE);
+ tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.CODING);
break;
case OPENCHOICE:
- tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.OPENCHOICE);
+ tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.CODING);
break;
case ATTACHMENT:
tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.ATTACHMENT);
@@ -256,7 +264,7 @@ public class Questionnaire14_50 {
return tgt;
}
- static public org.hl7.fhir.dstu2016may.model.Enumeration convertQuestionnaireItemType(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
+ static public org.hl7.fhir.dstu2016may.model.Enumeration convertQuestionnaireItemType(org.hl7.fhir.r5.model.Enumeration src, QuestionnaireAnswerConstraint constraint) throws FHIRException {
if (src == null || src.isEmpty())
return null;
org.hl7.fhir.dstu2016may.model.Enumeration tgt = new org.hl7.fhir.dstu2016may.model.Enumeration<>(new org.hl7.fhir.dstu2016may.model.Questionnaire.QuestionnaireItemTypeEnumFactory());
@@ -295,12 +303,12 @@ public class Questionnaire14_50 {
case URL:
tgt.setValue(org.hl7.fhir.dstu2016may.model.Questionnaire.QuestionnaireItemType.URL);
break;
- case CHOICE:
- tgt.setValue(org.hl7.fhir.dstu2016may.model.Questionnaire.QuestionnaireItemType.CHOICE);
- break;
- case OPENCHOICE:
+ case CODING:
+ if (constraint == QuestionnaireAnswerConstraint.OPTIONSORSTRING)
tgt.setValue(org.hl7.fhir.dstu2016may.model.Questionnaire.QuestionnaireItemType.OPENCHOICE);
- break;
+ else
+ tgt.setValue(org.hl7.fhir.dstu2016may.model.Questionnaire.QuestionnaireItemType.CHOICE);
+ break;
case ATTACHMENT:
tgt.setValue(org.hl7.fhir.dstu2016may.model.Questionnaire.QuestionnaireItemType.ATTACHMENT);
break;
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureMap14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureMap14_50.java
index f2dee9f21..9360e154d 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureMap14_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/StructureMap14_50.java
@@ -106,44 +106,6 @@ public class StructureMap14_50 {
return tgt;
}
- public static org.hl7.fhir.r5.model.Enumeration convertStructureMapContextType(org.hl7.fhir.dstu2016may.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.StructureMap.StructureMapContextTypeEnumFactory());
- VersionConvertor_14_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case TYPE:
- tgt.setValue(org.hl7.fhir.r5.model.StructureMap.StructureMapContextType.TYPE);
- break;
- case VARIABLE:
- tgt.setValue(org.hl7.fhir.r5.model.StructureMap.StructureMapContextType.VARIABLE);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.StructureMap.StructureMapContextType.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.dstu2016may.model.Enumeration convertStructureMapContextType(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.dstu2016may.model.Enumeration tgt = new org.hl7.fhir.dstu2016may.model.Enumeration<>(new org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapContextTypeEnumFactory());
- VersionConvertor_14_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case TYPE:
- tgt.setValue(org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapContextType.TYPE);
- break;
- case VARIABLE:
- tgt.setValue(org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapContextType.VARIABLE);
- break;
- default:
- tgt.setValue(org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapContextType.NULL);
- break;
- }
- return tgt;
- }
-
public static org.hl7.fhir.r5.model.StructureMap.StructureMapGroupComponent convertStructureMapGroupComponent(org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapGroupComponent src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
@@ -313,8 +275,7 @@ public class StructureMap14_50 {
VersionConvertor_14_50.copyElement(src, tgt);
if (src.hasContext())
tgt.setContextElement(VersionConvertor_14_50.convertId(src.getContextElement()));
- if (src.hasContextType())
- tgt.setContextTypeElement(convertStructureMapContextType(src.getContextTypeElement()));
+ tgt.setContextType(org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapContextType.VARIABLE);
if (src.hasElement())
tgt.setElementElement(VersionConvertor_14_50.convertString(src.getElementElement()));
if (src.hasVariable())
@@ -337,8 +298,8 @@ public class StructureMap14_50 {
VersionConvertor_14_50.copyElement(src, tgt);
if (src.hasContext())
tgt.setContextElement(VersionConvertor_14_50.convertId(src.getContextElement()));
- if (src.hasContextType())
- tgt.setContextTypeElement(convertStructureMapContextType(src.getContextTypeElement()));
+ if (src.hasContextType() && src.getContextType() == org.hl7.fhir.dstu2016may.model.StructureMap.StructureMapContextType.VARIABLE)
+ throw new Error("This conversion is not supported. Consult code maintainers"); // this should never happens - no one knows what the intent was here.
if (src.hasElement())
tgt.setElementElement(VersionConvertor_14_50.convertString(src.getElementElement()));
if (src.hasVariable())
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ActivityDefinition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ActivityDefinition30_50.java
index 5d05a633a..8f953620c 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ActivityDefinition30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ActivityDefinition30_50.java
@@ -4,6 +4,7 @@ import org.hl7.fhir.convertors.VersionConvertor_30_50;
import org.hl7.fhir.dstu3.model.ContactDetail;
import org.hl7.fhir.dstu3.model.Contributor.ContributorType;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.CodeableReference;
public class ActivityDefinition30_50 {
@@ -66,7 +67,7 @@ public class ActivityDefinition30_50 {
if (src.hasTiming())
tgt.setTiming(VersionConvertor_30_50.convertType(src.getTiming()));
if (src.hasLocation())
- tgt.setLocation(VersionConvertor_30_50.convertReference(src.getLocation()));
+ tgt.setLocation(new CodeableReference(VersionConvertor_30_50.convertReference(src.getLocation())));
for (org.hl7.fhir.dstu3.model.ActivityDefinition.ActivityDefinitionParticipantComponent t : src.getParticipant()) tgt.addParticipant(convertActivityDefinitionParticipantComponent(t));
if (src.hasProduct())
tgt.setProduct(VersionConvertor_30_50.convertType(src.getProduct()));
@@ -152,8 +153,8 @@ public class ActivityDefinition30_50 {
tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode()));
if (src.hasTiming())
tgt.setTiming(VersionConvertor_30_50.convertType(src.getTiming()));
- if (src.hasLocation())
- tgt.setLocation(VersionConvertor_30_50.convertReference(src.getLocation()));
+ if (src.getLocation().hasReference())
+ tgt.setLocation(VersionConvertor_30_50.convertReference(src.getLocation().getReference()));
for (org.hl7.fhir.r5.model.ActivityDefinition.ActivityDefinitionParticipantComponent t : src.getParticipant()) tgt.addParticipant(convertActivityDefinitionParticipantComponent(t));
if (src.hasProduct())
tgt.setProduct(VersionConvertor_30_50.convertType(src.getProduct()));
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AllergyIntolerance30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AllergyIntolerance30_50.java
index 412dcf124..2ff8491a2 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AllergyIntolerance30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/AllergyIntolerance30_50.java
@@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50;
import org.hl7.fhir.convertors.VersionConvertor_30_50;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.CodeableReference;
import java.util.stream.Collectors;
@@ -207,7 +208,7 @@ public class AllergyIntolerance30_50 {
VersionConvertor_30_50.copyElement(src, tgt);
if (src.hasSubstance())
tgt.setSubstance(VersionConvertor_30_50.convertCodeableConcept(src.getSubstance()));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getManifestation()) tgt.addManifestation(VersionConvertor_30_50.convertCodeableConcept(t));
+ for (CodeableReference t : src.getManifestation()) if (t.hasConcept()) tgt.addManifestation(VersionConvertor_30_50.convertCodeableConcept(t.getConcept()));
if (src.hasDescription())
tgt.setDescriptionElement(VersionConvertor_30_50.convertString(src.getDescriptionElement()));
if (src.hasOnset())
@@ -227,7 +228,7 @@ public class AllergyIntolerance30_50 {
VersionConvertor_30_50.copyElement(src, tgt);
if (src.hasSubstance())
tgt.setSubstance(VersionConvertor_30_50.convertCodeableConcept(src.getSubstance()));
- for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getManifestation()) tgt.addManifestation(VersionConvertor_30_50.convertCodeableConcept(t));
+ for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getManifestation()) tgt.addManifestation(new CodeableReference(VersionConvertor_30_50.convertCodeableConcept(t)));
if (src.hasDescription())
tgt.setDescriptionElement(VersionConvertor_30_50.convertString(src.getDescriptionElement()));
if (src.hasOnset())
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Appointment30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Appointment30_50.java
index 28d708cc8..43dd6f869 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Appointment30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Appointment30_50.java
@@ -1,10 +1,14 @@
package org.hl7.fhir.convertors.conv30_50;
+import org.hl7.fhir.convertors.VersionConvertor_10_50;
import org.hl7.fhir.convertors.VersionConvertor_30_50;
+import org.hl7.fhir.convertors.VersionConvertor_Base;
+import org.hl7.fhir.dstu3.model.UnsignedIntType;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.CodeableConcept;
import org.hl7.fhir.r5.model.CodeableReference;
-public class Appointment30_50 {
+public class Appointment30_50 extends VersionConvertor_Base {
public static org.hl7.fhir.dstu3.model.Appointment convertAppointment(org.hl7.fhir.r5.model.Appointment src) throws FHIRException {
if (src == null)
@@ -25,7 +29,7 @@ public class Appointment30_50 {
for (CodeableReference t : src.getReason()) if (t.hasReference())
tgt.addIndication(VersionConvertor_30_50.convertReference(t.getReference()));
if (src.hasPriority())
- tgt.setPriorityElement(VersionConvertor_30_50.convertUnsignedInt(src.getPriorityElement()));
+ tgt.setPriorityElement(convertAppointmentPriority(src.getPriority()));
if (src.hasDescription())
tgt.setDescriptionElement(VersionConvertor_30_50.convertString(src.getDescriptionElement()));
for (org.hl7.fhir.r5.model.Reference t : src.getSupportingInformation()) tgt.addSupportingInformation(VersionConvertor_30_50.convertReference(t));
@@ -46,6 +50,19 @@ public class Appointment30_50 {
return tgt;
}
+
+ private static UnsignedIntType convertAppointmentPriority(CodeableConcept src) {
+ UnsignedIntType tgt = new UnsignedIntType(convertAppointmentPriorityFromR5(src));
+ VersionConvertor_30_50.copyElement(src, tgt);
+ return tgt;
+ }
+
+ private static CodeableConcept convertAppointmentPriority(UnsignedIntType src) {
+ CodeableConcept tgt = src.hasValue() ? convertAppointmentPriorityToR5(src.getValue()) : new CodeableConcept();
+ VersionConvertor_30_50.copyElement(src, tgt);
+ return tgt;
+ }
+
public static org.hl7.fhir.r5.model.Appointment convertAppointment(org.hl7.fhir.dstu3.model.Appointment src) throws FHIRException {
if (src == null)
return null;
@@ -63,7 +80,7 @@ public class Appointment30_50 {
for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReason()) tgt.addReason(VersionConvertor_30_50.convertCodeableConceptToCodableReference(t));
for (org.hl7.fhir.dstu3.model.Reference t : src.getIndication()) tgt.addReason(VersionConvertor_30_50.convertReferenceToCodableReference(t));
if (src.hasPriority())
- tgt.setPriorityElement(VersionConvertor_30_50.convertUnsignedInt(src.getPriorityElement()));
+ tgt.setPriority(convertAppointmentPriority(src.getPriorityElement()));
if (src.hasDescription())
tgt.setDescriptionElement(VersionConvertor_30_50.convertString(src.getDescriptionElement()));
for (org.hl7.fhir.dstu3.model.Reference t : src.getSupportingInformation()) tgt.addSupportingInformation(VersionConvertor_30_50.convertReference(t));
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CarePlan30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CarePlan30_50.java
index 8300d84a1..6a4011902 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CarePlan30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/CarePlan30_50.java
@@ -161,24 +161,24 @@ public class CarePlan30_50 {
return null;
org.hl7.fhir.dstu3.model.CarePlan.CarePlanActivityComponent tgt = new org.hl7.fhir.dstu3.model.CarePlan.CarePlanActivityComponent();
VersionConvertor_30_50.copyElement(src, tgt);
- for (CodeableReference t : src.getOutcome()) {
+ for (CodeableReference t : src.getPerformedActivity()) {
if (t.hasConcept())
tgt.addOutcomeCodeableConcept(VersionConvertor_30_50.convertCodeableConcept(t.getConcept()));
}
- for (CodeableReference t : src.getOutcome()) {
+ for (CodeableReference t : src.getPerformedActivity()) {
if (t.hasReference())
tgt.addOutcomeReference(VersionConvertor_30_50.convertReference(t.getReference()));
}
for (org.hl7.fhir.r5.model.Annotation t : src.getProgress()) {
tgt.addProgress(VersionConvertor_30_50.convertAnnotation(t));
}
- if (src.hasReference()) {
- if (src.hasReference())
- tgt.setReference(VersionConvertor_30_50.convertReference(src.getReference()));
+ if (src.hasPlannedActivityReference()) {
+ if (src.hasPlannedActivityReference())
+ tgt.setReference(VersionConvertor_30_50.convertReference(src.getPlannedActivityReference()));
}
- if (src.hasDetail()) {
- if (src.hasDetail())
- tgt.setDetail(convertCarePlanActivityDetailComponent(src.getDetail()));
+ if (src.hasPlannedActivityDetail()) {
+ if (src.hasPlannedActivityDetail())
+ tgt.setDetail(convertCarePlanActivityDetailComponent(src.getPlannedActivityDetail()));
}
return tgt;
}
@@ -189,26 +189,26 @@ public class CarePlan30_50 {
org.hl7.fhir.r5.model.CarePlan.CarePlanActivityComponent tgt = new org.hl7.fhir.r5.model.CarePlan.CarePlanActivityComponent();
VersionConvertor_30_50.copyElement(src, tgt);
for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getOutcomeCodeableConcept()) {
- tgt.addOutcome(VersionConvertor_30_50.convertCodeableConceptToCodableReference(t));
+ tgt.addPerformedActivity(VersionConvertor_30_50.convertCodeableConceptToCodableReference(t));
}
for (org.hl7.fhir.dstu3.model.Reference t : src.getOutcomeReference()) {
- tgt.addOutcome(VersionConvertor_30_50.convertReferenceToCodableReference(t));
+ tgt.addPerformedActivity(VersionConvertor_30_50.convertReferenceToCodableReference(t));
}
for (org.hl7.fhir.dstu3.model.Annotation t : src.getProgress()) {
tgt.addProgress(VersionConvertor_30_50.convertAnnotation(t));
}
if (src.hasReference()) {
if (src.hasReference())
- tgt.setReference(VersionConvertor_30_50.convertReference(src.getReference()));
+ tgt.setPlannedActivityReference(VersionConvertor_30_50.convertReference(src.getReference()));
}
if (src.hasDetail()) {
if (src.hasDetail())
- tgt.setDetail(convertCarePlanActivityDetailComponent(src.getDetail()));
+ tgt.setPlannedActivityDetail(convertCarePlanActivityDetailComponent(src.getDetail()));
}
return tgt;
}
- public static org.hl7.fhir.dstu3.model.CarePlan.CarePlanActivityDetailComponent convertCarePlanActivityDetailComponent(org.hl7.fhir.r5.model.CarePlan.CarePlanActivityDetailComponent src) throws FHIRException {
+ public static org.hl7.fhir.dstu3.model.CarePlan.CarePlanActivityDetailComponent convertCarePlanActivityDetailComponent(org.hl7.fhir.r5.model.CarePlan.CarePlanActivityPlannedActivityDetailComponent src) throws FHIRException {
if (src == null)
return null;
org.hl7.fhir.dstu3.model.CarePlan.CarePlanActivityDetailComponent tgt = new org.hl7.fhir.dstu3.model.CarePlan.CarePlanActivityDetailComponent();
@@ -281,10 +281,10 @@ public class CarePlan30_50 {
return tgt;
}
- public static org.hl7.fhir.r5.model.CarePlan.CarePlanActivityDetailComponent convertCarePlanActivityDetailComponent(org.hl7.fhir.dstu3.model.CarePlan.CarePlanActivityDetailComponent src) throws FHIRException {
+ public static org.hl7.fhir.r5.model.CarePlan.CarePlanActivityPlannedActivityDetailComponent convertCarePlanActivityDetailComponent(org.hl7.fhir.dstu3.model.CarePlan.CarePlanActivityDetailComponent src) throws FHIRException {
if (src == null)
return null;
- org.hl7.fhir.r5.model.CarePlan.CarePlanActivityDetailComponent tgt = new org.hl7.fhir.r5.model.CarePlan.CarePlanActivityDetailComponent();
+ org.hl7.fhir.r5.model.CarePlan.CarePlanActivityPlannedActivityDetailComponent tgt = new org.hl7.fhir.r5.model.CarePlan.CarePlanActivityPlannedActivityDetailComponent();
VersionConvertor_30_50.copyElement(src, tgt);
if (src.hasCategory()) {
org.hl7.fhir.r5.model.Extension t = new org.hl7.fhir.r5.model.Extension();
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ConceptMap30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ConceptMap30_50.java
index 1da574ca9..9dd6f2771 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ConceptMap30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ConceptMap30_50.java
@@ -4,10 +4,12 @@ import org.hl7.fhir.convertors.VersionConvertorConstants;
import org.hl7.fhir.convertors.VersionConvertor_30_50;
import org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.CanonicalType;
import org.hl7.fhir.r5.model.Enumeration;
import org.hl7.fhir.r5.model.Enumerations;
import org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship;
import org.hl7.fhir.r5.utils.ToolingExtensions;
+import org.hl7.fhir.utilities.CanonicalPair;
public class ConceptMap30_50 {
@@ -100,14 +102,11 @@ public class ConceptMap30_50 {
return null;
org.hl7.fhir.r5.model.ConceptMap.ConceptMapGroupComponent tgt = new org.hl7.fhir.r5.model.ConceptMap.ConceptMapGroupComponent();
VersionConvertor_30_50.copyElement(src, tgt);
- if (src.hasSource())
- tgt.setSourceElement(VersionConvertor_30_50.convertUri(src.getSourceElement()));
- if (src.hasSourceVersion())
- tgt.setSourceVersionElement(VersionConvertor_30_50.convertString(src.getSourceVersionElement()));
- if (src.hasTarget())
- tgt.setTarget(src.getTarget());
- if (src.hasTargetVersion())
- tgt.setTargetVersion(src.getTargetVersion());
+ if (src.hasSource() || src.hasSourceVersion())
+ tgt.setSourceElement(convertUriAndVersionToCanonical(src.getSourceElement(), src.getSourceVersionElement()));
+ if (src.hasTarget() || src.hasTargetVersion())
+ tgt.setSourceElement(convertUriAndVersionToCanonical(src.getTargetElement(), src.getTargetVersionElement()));
+
for (org.hl7.fhir.dstu3.model.ConceptMap.SourceElementComponent t : src.getElement()) tgt.addElement(convertSourceElementComponent(t));
if (src.hasUnmapped())
tgt.setUnmapped(convertConceptMapGroupUnmappedComponent(src.getUnmapped()));
@@ -119,20 +118,38 @@ public class ConceptMap30_50 {
return null;
org.hl7.fhir.dstu3.model.ConceptMap.ConceptMapGroupComponent tgt = new org.hl7.fhir.dstu3.model.ConceptMap.ConceptMapGroupComponent();
VersionConvertor_30_50.copyElement(src, tgt);
- if (src.hasSource())
- tgt.setSourceElement(VersionConvertor_30_50.convertUri(src.getSourceElement()));
- if (src.hasSourceVersion())
- tgt.setSourceVersionElement(VersionConvertor_30_50.convertString(src.getSourceVersionElement()));
- if (src.hasTarget())
- tgt.setTarget(src.getTarget());
- if (src.hasTargetVersion())
- tgt.setTargetVersion(src.getTargetVersion());
+ if (src.hasSource()) {
+ CanonicalPair cp = new CanonicalPair(src.getSource());
+ tgt.setSource(cp.getUrl());
+ tgt.setSourceVersion(cp.getVersion());
+ }
+ if (src.hasTarget()) {
+ CanonicalPair cp = new CanonicalPair(src.getTarget());
+ tgt.setTarget(cp.getUrl());
+ tgt.setTargetVersion(cp.getVersion());
+ }
for (org.hl7.fhir.r5.model.ConceptMap.SourceElementComponent t : src.getElement()) tgt.addElement(convertSourceElementComponent(t));
if (src.hasUnmapped())
tgt.setUnmapped(convertConceptMapGroupUnmappedComponent(src.getUnmapped()));
return tgt;
}
+ private static CanonicalType convertUriAndVersionToCanonical(org.hl7.fhir.dstu3.model.UriType srcUri, org.hl7.fhir.dstu3.model.StringType srcVersion) {
+ if (srcUri == null && srcVersion == null)
+ return null;
+ org.hl7.fhir.r5.model.CanonicalType tgt = new org.hl7.fhir.r5.model.CanonicalType();
+ VersionConvertor_30_50.copyElement(srcUri == null ? srcVersion : srcUri, tgt);
+ if (srcUri.hasValue()) {
+ if (srcVersion.hasValue()) {
+ tgt.setValue(srcUri.getValue()+"|"+srcVersion.getValue());
+ } else {
+ tgt.setValue(srcUri.getValue());
+ }
+ }
+ return tgt;
+ }
+
+
public static org.hl7.fhir.r5.model.ConceptMap.ConceptMapGroupUnmappedComponent convertConceptMapGroupUnmappedComponent(org.hl7.fhir.dstu3.model.ConceptMap.ConceptMapGroupUnmappedComponent src) throws FHIRException {
if (src == null)
return null;
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DeviceUseStatement30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DeviceUseStatement30_50.java
index 9b6444401..0f74d359e 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DeviceUseStatement30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/DeviceUseStatement30_50.java
@@ -6,7 +6,7 @@ import org.hl7.fhir.r5.model.CodeableReference;
public class DeviceUseStatement30_50 {
- public static org.hl7.fhir.dstu3.model.DeviceUseStatement convertDeviceUseStatement(org.hl7.fhir.r5.model.DeviceUseStatement src) throws FHIRException {
+ public static org.hl7.fhir.dstu3.model.DeviceUseStatement convertDeviceUseStatement(org.hl7.fhir.r5.model.DeviceUsage src) throws FHIRException {
if (src == null)
return null;
org.hl7.fhir.dstu3.model.DeviceUseStatement tgt = new org.hl7.fhir.dstu3.model.DeviceUseStatement();
@@ -32,10 +32,10 @@ public class DeviceUseStatement30_50 {
return tgt;
}
- public static org.hl7.fhir.r5.model.DeviceUseStatement convertDeviceUseStatement(org.hl7.fhir.dstu3.model.DeviceUseStatement src) throws FHIRException {
+ public static org.hl7.fhir.r5.model.DeviceUsage convertDeviceUseStatement(org.hl7.fhir.dstu3.model.DeviceUseStatement src) throws FHIRException {
if (src == null)
return null;
- org.hl7.fhir.r5.model.DeviceUseStatement tgt = new org.hl7.fhir.r5.model.DeviceUseStatement();
+ org.hl7.fhir.r5.model.DeviceUsage tgt = new org.hl7.fhir.r5.model.DeviceUsage();
VersionConvertor_30_50.copyDomainResource(src, tgt);
for (org.hl7.fhir.dstu3.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(t));
if (src.hasStatus())
@@ -57,7 +57,7 @@ public class DeviceUseStatement30_50 {
return tgt;
}
- static public org.hl7.fhir.dstu3.model.Enumeration convertDeviceUseStatementStatus(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
+ static public org.hl7.fhir.dstu3.model.Enumeration convertDeviceUseStatementStatus(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
org.hl7.fhir.dstu3.model.Enumeration tgt = new org.hl7.fhir.dstu3.model.Enumeration<>(new org.hl7.fhir.dstu3.model.DeviceUseStatement.DeviceUseStatementStatusEnumFactory());
@@ -88,32 +88,32 @@ public class DeviceUseStatement30_50 {
return tgt;
}
- static public org.hl7.fhir.r5.model.Enumeration convertDeviceUseStatementStatus(org.hl7.fhir.dstu3.model.Enumeration src) throws FHIRException {
+ static public org.hl7.fhir.r5.model.Enumeration convertDeviceUseStatementStatus(org.hl7.fhir.dstu3.model.Enumeration src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatusEnumFactory());
+ org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatusEnumFactory());
VersionConvertor_30_50.copyElement(src, tgt);
switch(src.getValue()) {
case ACTIVE:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.ACTIVE);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.ACTIVE);
break;
case COMPLETED:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.COMPLETED);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.COMPLETED);
break;
case ENTEREDINERROR:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.ENTEREDINERROR);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.ENTEREDINERROR);
break;
case INTENDED:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.INTENDED);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.INTENDED);
break;
case STOPPED:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.STOPPED);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.STOPPED);
break;
case ONHOLD:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.ONHOLD);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.ONHOLD);
break;
default:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.NULL);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.NULL);
break;
}
return tgt;
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Goal30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Goal30_50.java
index 3926aee3a..07d9de0c8 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Goal30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Goal30_50.java
@@ -29,8 +29,6 @@ public class Goal30_50 {
tgt.setStatusDateElement(VersionConvertor_30_50.convertDate(src.getStatusDateElement()));
if (src.hasStatusReason())
tgt.setStatusReasonElement(VersionConvertor_30_50.convertString(src.getStatusReasonElement()));
- if (src.hasExpressedBy())
- tgt.setExpressedBy(VersionConvertor_30_50.convertReference(src.getExpressedBy()));
for (org.hl7.fhir.r5.model.Reference t : src.getAddresses()) tgt.addAddresses(VersionConvertor_30_50.convertReference(t));
for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(VersionConvertor_30_50.convertAnnotation(t));
for (CodeableReference t : src.getOutcome()) if (t.hasConcept())
@@ -63,8 +61,6 @@ public class Goal30_50 {
tgt.setStatusDateElement(VersionConvertor_30_50.convertDate(src.getStatusDateElement()));
if (src.hasStatusReason())
tgt.setStatusReasonElement(VersionConvertor_30_50.convertString(src.getStatusReasonElement()));
- if (src.hasExpressedBy())
- tgt.setExpressedBy(VersionConvertor_30_50.convertReference(src.getExpressedBy()));
for (org.hl7.fhir.dstu3.model.Reference t : src.getAddresses()) tgt.addAddresses(VersionConvertor_30_50.convertReference(t));
for (org.hl7.fhir.dstu3.model.Annotation t : src.getNote()) tgt.addNote(VersionConvertor_30_50.convertAnnotation(t));
for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getOutcomeCode()) tgt.addOutcome(VersionConvertor_30_50.convertCodeableConceptToCodableReference(t));
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Medication30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Medication30_50.java
index 9f8c07d10..4cc577bea 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Medication30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Medication30_50.java
@@ -15,7 +15,7 @@ public class Medication30_50 {
if (src.hasStatus())
tgt.setStatusElement(convertMedicationStatus(src.getStatusElement()));
if (src.hasManufacturer())
- tgt.setManufacturer(VersionConvertor_30_50.convertReference(src.getManufacturer()));
+ tgt.setSponsor(VersionConvertor_30_50.convertReference(src.getManufacturer()));
if (src.hasForm())
tgt.setDoseForm(VersionConvertor_30_50.convertCodeableConcept(src.getForm()));
for (org.hl7.fhir.dstu3.model.Medication.MedicationIngredientComponent t : src.getIngredient()) tgt.addIngredient(convertMedicationIngredientComponent(t));
@@ -33,8 +33,8 @@ public class Medication30_50 {
tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode()));
if (src.hasStatus())
tgt.setStatusElement(convertMedicationStatus(src.getStatusElement()));
- if (src.hasManufacturer())
- tgt.setManufacturer(VersionConvertor_30_50.convertReference(src.getManufacturer()));
+ if (src.hasSponsor())
+ tgt.setManufacturer(VersionConvertor_30_50.convertReference(src.getSponsor()));
if (src.hasDoseForm())
tgt.setForm(VersionConvertor_30_50.convertCodeableConcept(src.getDoseForm()));
for (org.hl7.fhir.r5.model.Medication.MedicationIngredientComponent t : src.getIngredient()) tgt.addIngredient(convertMedicationIngredientComponent(t));
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationStatement30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationStatement30_50.java
index d9d865f40..7814583c7 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationStatement30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/MedicationStatement30_50.java
@@ -86,24 +86,24 @@ public class MedicationStatement30_50 {
org.hl7.fhir.dstu3.model.Enumeration tgt = new org.hl7.fhir.dstu3.model.Enumeration<>(new org.hl7.fhir.dstu3.model.MedicationStatement.MedicationStatementStatusEnumFactory());
VersionConvertor_30_50.copyElement(src, tgt);
switch(src.getValue()) {
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.dstu3.model.MedicationStatement.MedicationStatementStatus.ACTIVE);
- break;
+// case ACTIVE:
+// tgt.setValue(org.hl7.fhir.dstu3.model.MedicationStatement.MedicationStatementStatus.ACTIVE);
+// break;
case COMPLETED:
tgt.setValue(org.hl7.fhir.dstu3.model.MedicationStatement.MedicationStatementStatus.COMPLETED);
break;
case ENTEREDINERROR:
tgt.setValue(org.hl7.fhir.dstu3.model.MedicationStatement.MedicationStatementStatus.ENTEREDINERROR);
break;
- case INTENDED:
+ case UNKNOWN:
tgt.setValue(org.hl7.fhir.dstu3.model.MedicationStatement.MedicationStatementStatus.INTENDED);
break;
- case STOPPED:
- tgt.setValue(org.hl7.fhir.dstu3.model.MedicationStatement.MedicationStatementStatus.STOPPED);
- break;
- case ONHOLD:
- tgt.setValue(org.hl7.fhir.dstu3.model.MedicationStatement.MedicationStatementStatus.ONHOLD);
- break;
+// case STOPPED:
+// tgt.setValue(org.hl7.fhir.dstu3.model.MedicationStatement.MedicationStatementStatus.STOPPED);
+// break;
+// case ONHOLD:
+// tgt.setValue(org.hl7.fhir.dstu3.model.MedicationStatement.MedicationStatementStatus.ONHOLD);
+// break;
default:
tgt.setValue(org.hl7.fhir.dstu3.model.MedicationStatement.MedicationStatementStatus.NULL);
break;
@@ -118,7 +118,7 @@ public class MedicationStatement30_50 {
VersionConvertor_30_50.copyElement(src, tgt);
switch(src.getValue()) {
case ACTIVE:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.ACTIVE);
+ tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.COMPLETED);
break;
case COMPLETED:
tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.COMPLETED);
@@ -127,13 +127,13 @@ public class MedicationStatement30_50 {
tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.ENTEREDINERROR);
break;
case INTENDED:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.INTENDED);
+ tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.UNKNOWN);
break;
case STOPPED:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.STOPPED);
+ tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.UNKNOWN);
break;
case ONHOLD:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.ONHOLD);
+ tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.UNKNOWN);
break;
default:
tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.NULL);
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PlanDefinition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PlanDefinition30_50.java
index 63c6c204e..7301a32a1 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PlanDefinition30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/PlanDefinition30_50.java
@@ -1,9 +1,17 @@
package org.hl7.fhir.convertors.conv30_50;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
import org.hl7.fhir.convertors.VersionConvertor_30_50;
import org.hl7.fhir.dstu3.model.ContactDetail;
import org.hl7.fhir.dstu3.model.Contributor.ContributorType;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.DataRequirement;
+import org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionInputComponent;
+import org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionOutputComponent;
public class PlanDefinition30_50 {
@@ -546,14 +554,14 @@ public class PlanDefinition30_50 {
tgt.setDescriptionElement(VersionConvertor_30_50.convertString(src.getDescriptionElement()));
if (src.hasTextEquivalent())
tgt.setTextEquivalentElement(VersionConvertor_30_50.convertString(src.getTextEquivalentElement()));
- for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getCode()) tgt.addCode(VersionConvertor_30_50.convertCodeableConcept(t));
+ for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getCode()) tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(t));
for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getReason()) tgt.addReason(VersionConvertor_30_50.convertCodeableConcept(t));
for (org.hl7.fhir.dstu3.model.RelatedArtifact t : src.getDocumentation()) tgt.addDocumentation(VersionConvertor_30_50.convertRelatedArtifact(t));
for (org.hl7.fhir.dstu3.model.IdType t : src.getGoalId()) tgt.addGoalId(t.getValue());
for (org.hl7.fhir.dstu3.model.TriggerDefinition t : src.getTriggerDefinition()) tgt.addTrigger(VersionConvertor_30_50.convertTriggerDefinition(t));
for (org.hl7.fhir.dstu3.model.PlanDefinition.PlanDefinitionActionConditionComponent t : src.getCondition()) tgt.addCondition(convertPlanDefinitionActionConditionComponent(t));
- for (org.hl7.fhir.dstu3.model.DataRequirement t : src.getInput()) tgt.addInput(VersionConvertor_30_50.convertDataRequirement(t));
- for (org.hl7.fhir.dstu3.model.DataRequirement t : src.getOutput()) tgt.addOutput(VersionConvertor_30_50.convertDataRequirement(t));
+ for (org.hl7.fhir.dstu3.model.DataRequirement t : src.getInput()) tgt.addInput(wrapInput(VersionConvertor_30_50.convertDataRequirement(t)));
+ for (org.hl7.fhir.dstu3.model.DataRequirement t : src.getOutput()) tgt.addOutput(wrapOutput(VersionConvertor_30_50.convertDataRequirement(t)));
for (org.hl7.fhir.dstu3.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent t : src.getRelatedAction()) tgt.addRelatedAction(convertPlanDefinitionActionRelatedActionComponent(t));
if (src.hasTiming())
tgt.setTiming(VersionConvertor_30_50.convertType(src.getTiming()));
@@ -579,6 +587,14 @@ public class PlanDefinition30_50 {
return tgt;
}
+ private static PlanDefinitionActionOutputComponent wrapOutput(DataRequirement dr) {
+ return new PlanDefinitionActionOutputComponent().setRequirement(dr);
+ }
+
+ private static PlanDefinitionActionInputComponent wrapInput(DataRequirement dr) {
+ return new PlanDefinitionActionInputComponent().setRequirement(dr);
+ }
+
public static org.hl7.fhir.dstu3.model.PlanDefinition.PlanDefinitionActionComponent convertPlanDefinitionActionComponent(org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionComponent src) throws FHIRException {
if (src == null)
return null;
@@ -592,14 +608,14 @@ public class PlanDefinition30_50 {
tgt.setDescriptionElement(VersionConvertor_30_50.convertString(src.getDescriptionElement()));
if (src.hasTextEquivalent())
tgt.setTextEquivalentElement(VersionConvertor_30_50.convertString(src.getTextEquivalentElement()));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getCode()) tgt.addCode(VersionConvertor_30_50.convertCodeableConcept(t));
+ if (src.hasCode()) tgt.addCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode()));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReason()) tgt.addReason(VersionConvertor_30_50.convertCodeableConcept(t));
for (org.hl7.fhir.r5.model.RelatedArtifact t : src.getDocumentation()) tgt.addDocumentation(VersionConvertor_30_50.convertRelatedArtifact(t));
for (org.hl7.fhir.r5.model.IdType t : src.getGoalId()) tgt.addGoalId(t.getValue());
for (org.hl7.fhir.r5.model.TriggerDefinition t : src.getTrigger()) tgt.addTriggerDefinition(VersionConvertor_30_50.convertTriggerDefinition(t));
for (org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionConditionComponent t : src.getCondition()) tgt.addCondition(convertPlanDefinitionActionConditionComponent(t));
- for (org.hl7.fhir.r5.model.DataRequirement t : src.getInput()) tgt.addInput(VersionConvertor_30_50.convertDataRequirement(t));
- for (org.hl7.fhir.r5.model.DataRequirement t : src.getOutput()) tgt.addOutput(VersionConvertor_30_50.convertDataRequirement(t));
+ for (PlanDefinitionActionInputComponent t : src.getInput()) tgt.addInput(VersionConvertor_30_50.convertDataRequirement(t.getRequirement()));
+ for (PlanDefinitionActionOutputComponent t : src.getOutput()) tgt.addOutput(VersionConvertor_30_50.convertDataRequirement(t.getRequirement()));
for (org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent t : src.getRelatedAction()) tgt.addRelatedAction(convertPlanDefinitionActionRelatedActionComponent(t));
if (src.hasTiming())
tgt.setTiming(VersionConvertor_30_50.convertType(src.getTiming()));
@@ -718,8 +734,8 @@ public class PlanDefinition30_50 {
return null;
org.hl7.fhir.dstu3.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent tgt = new org.hl7.fhir.dstu3.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent();
VersionConvertor_30_50.copyElement(src, tgt);
- if (src.hasActionId())
- tgt.setActionIdElement(VersionConvertor_30_50.convertId(src.getActionIdElement()));
+ if (src.hasTargetId())
+ tgt.setActionIdElement(VersionConvertor_30_50.convertId(src.getTargetIdElement()));
if (src.hasRelationship())
tgt.setRelationshipElement(convertActionRelationshipType(src.getRelationshipElement()));
if (src.hasOffset())
@@ -733,7 +749,7 @@ public class PlanDefinition30_50 {
org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent tgt = new org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent();
VersionConvertor_30_50.copyElement(src, tgt);
if (src.hasActionId())
- tgt.setActionIdElement(VersionConvertor_30_50.convertId(src.getActionIdElement()));
+ tgt.setTargetIdElement(VersionConvertor_30_50.convertId(src.getActionIdElement()));
if (src.hasRelationship())
tgt.setRelationshipElement(convertActionRelationshipType(src.getRelationshipElement()));
if (src.hasOffset())
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Questionnaire30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Questionnaire30_50.java
index 21536a757..d3ede0336 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Questionnaire30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Questionnaire30_50.java
@@ -1,8 +1,10 @@
package org.hl7.fhir.convertors.conv30_50;
import org.hl7.fhir.convertors.VersionConvertor_30_50;
+import org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemType;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r5.model.Questionnaire;
+import org.hl7.fhir.r5.model.Questionnaire.QuestionnaireAnswerConstraint;
public class Questionnaire30_50 {
@@ -106,8 +108,8 @@ public class Questionnaire30_50 {
tgt.setPrefixElement(VersionConvertor_30_50.convertString(src.getPrefixElement()));
if (src.hasText())
tgt.setTextElement(VersionConvertor_30_50.convertString(src.getTextElement()));
- if (src.hasType())
- tgt.setTypeElement(convertQuestionnaireItemType(src.getTypeElement()));
+ if (src.hasType())
+ tgt.setTypeElement(convertQuestionnaireItemType(src.getTypeElement(), src.getAnswerConstraint()));
for (org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemEnableWhenComponent t : src.getEnableWhen()) tgt.addEnableWhen(convertQuestionnaireItemEnableWhenComponent(t));
if (src.hasRequired())
tgt.setRequiredElement(VersionConvertor_30_50.convertBoolean(src.getRequiredElement()));
@@ -139,9 +141,15 @@ public class Questionnaire30_50 {
if (src.hasPrefix())
tgt.setPrefixElement(VersionConvertor_30_50.convertString(src.getPrefixElement()));
if (src.hasText())
- tgt.setTextElement(VersionConvertor_30_50.convertString(src.getTextElement()));
- if (src.hasType())
+ tgt.setTextElement(VersionConvertor_30_50.convertStringToMarkdown(src.getTextElement()));
+ if (src.hasType()) {
tgt.setTypeElement(convertQuestionnaireItemType(src.getTypeElement()));
+ if (src.getType() == QuestionnaireItemType.CHOICE) {
+ tgt.setAnswerConstraint(QuestionnaireAnswerConstraint.OPTIONSONLY);
+ } else if (src.getType() == QuestionnaireItemType.OPENCHOICE) {
+ tgt.setAnswerConstraint(QuestionnaireAnswerConstraint.OPTIONSORSTRING);
+ }
+ }
for (org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemEnableWhenComponent t : src.getEnableWhen()) tgt.addEnableWhen(convertQuestionnaireItemEnableWhenComponent(t));
tgt.setEnableBehavior(Questionnaire.EnableWhenBehavior.ANY);
if (src.hasRequired())
@@ -217,7 +225,7 @@ public class Questionnaire30_50 {
return tgt;
}
- static public org.hl7.fhir.dstu3.model.Enumeration convertQuestionnaireItemType(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
+ static public org.hl7.fhir.dstu3.model.Enumeration convertQuestionnaireItemType(org.hl7.fhir.r5.model.Enumeration src, QuestionnaireAnswerConstraint constraint) throws FHIRException {
if (src == null || src.isEmpty())
return null;
org.hl7.fhir.dstu3.model.Enumeration tgt = new org.hl7.fhir.dstu3.model.Enumeration<>(new org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemTypeEnumFactory());
@@ -256,12 +264,12 @@ public class Questionnaire30_50 {
case URL:
tgt.setValue(org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemType.URL);
break;
- case CHOICE:
- tgt.setValue(org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemType.CHOICE);
- break;
- case OPENCHOICE:
+ case CODING:
+ if (constraint == QuestionnaireAnswerConstraint.OPTIONSORSTRING)
tgt.setValue(org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemType.OPENCHOICE);
- break;
+ else
+ tgt.setValue(org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemType.CHOICE);
+ break;
case ATTACHMENT:
tgt.setValue(org.hl7.fhir.dstu3.model.Questionnaire.QuestionnaireItemType.ATTACHMENT);
break;
@@ -318,10 +326,10 @@ public class Questionnaire30_50 {
tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.URL);
break;
case CHOICE:
- tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.CHOICE);
+ tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.CODING);
break;
case OPENCHOICE:
- tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.OPENCHOICE);
+ tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.CODING);
break;
case ATTACHMENT:
tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.ATTACHMENT);
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureMap30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureMap30_50.java
index f8f49b95d..66ded6531 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureMap30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureMap30_50.java
@@ -81,43 +81,6 @@ public class StructureMap30_50 {
return tgt;
}
- static public org.hl7.fhir.r5.model.Enumeration convertStructureMapContextType(org.hl7.fhir.dstu3.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.StructureMap.StructureMapContextTypeEnumFactory());
- VersionConvertor_30_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case TYPE:
- tgt.setValue(org.hl7.fhir.r5.model.StructureMap.StructureMapContextType.TYPE);
- break;
- case VARIABLE:
- tgt.setValue(org.hl7.fhir.r5.model.StructureMap.StructureMapContextType.VARIABLE);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.StructureMap.StructureMapContextType.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.dstu3.model.Enumeration convertStructureMapContextType(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.dstu3.model.Enumeration tgt = new org.hl7.fhir.dstu3.model.Enumeration<>(new org.hl7.fhir.dstu3.model.StructureMap.StructureMapContextTypeEnumFactory());
- VersionConvertor_30_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case TYPE:
- tgt.setValue(org.hl7.fhir.dstu3.model.StructureMap.StructureMapContextType.TYPE);
- break;
- case VARIABLE:
- tgt.setValue(org.hl7.fhir.dstu3.model.StructureMap.StructureMapContextType.VARIABLE);
- break;
- default:
- tgt.setValue(org.hl7.fhir.dstu3.model.StructureMap.StructureMapContextType.NULL);
- break;
- }
- return tgt;
- }
public static org.hl7.fhir.r5.model.StructureMap.StructureMapGroupComponent convertStructureMapGroupComponent(org.hl7.fhir.dstu3.model.StructureMap.StructureMapGroupComponent src) throws FHIRException {
if (src == null)
@@ -304,8 +267,8 @@ public class StructureMap30_50 {
VersionConvertor_30_50.copyElement(src, tgt);
if (src.hasContext())
tgt.setContextElement(VersionConvertor_30_50.convertId(src.getContextElement()));
- if (src.hasContextType())
- tgt.setContextTypeElement(convertStructureMapContextType(src.getContextTypeElement()));
+ if (src.hasContextType() && src.getContextType() == org.hl7.fhir.dstu3.model.StructureMap.StructureMapContextType.VARIABLE)
+ throw new Error("This conversion is not supported. Consult code maintainers"); // this should never happens - no one knows what the intent was here.
if (src.hasElement())
tgt.setElementElement(VersionConvertor_30_50.convertString(src.getElementElement()));
if (src.hasVariable())
@@ -328,8 +291,7 @@ public class StructureMap30_50 {
VersionConvertor_30_50.copyElement(src, tgt);
if (src.hasContext())
tgt.setContextElement(VersionConvertor_30_50.convertId(src.getContextElement()));
- if (src.hasContextType())
- tgt.setContextTypeElement(convertStructureMapContextType(src.getContextTypeElement()));
+ tgt.setContextType(org.hl7.fhir.dstu3.model.StructureMap.StructureMapContextType.VARIABLE);
if (src.hasElement())
tgt.setElementElement(VersionConvertor_30_50.convertString(src.getElementElement()));
if (src.hasVariable())
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Substance30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Substance30_50.java
index df8313582..922ba3751 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Substance30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/Substance30_50.java
@@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_50;
import org.hl7.fhir.convertors.VersionConvertor_30_50;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.Identifier;
public class Substance30_50 {
@@ -59,10 +60,10 @@ public class Substance30_50 {
tgt.setStatusElement(convertFHIRSubstanceStatus(src.getStatusElement()));
for (org.hl7.fhir.dstu3.model.CodeableConcept t : src.getCategory()) tgt.addCategory(VersionConvertor_30_50.convertCodeableConcept(t));
if (src.hasCode())
- tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode()));
+ tgt.getCode().setConcept(VersionConvertor_30_50.convertCodeableConcept(src.getCode()));
if (src.hasDescription())
tgt.setDescriptionElement(VersionConvertor_30_50.convertString(src.getDescriptionElement()));
- for (org.hl7.fhir.dstu3.model.Substance.SubstanceInstanceComponent t : src.getInstance()) tgt.addInstance(convertSubstanceInstanceComponent(t));
+ for (org.hl7.fhir.dstu3.model.Substance.SubstanceInstanceComponent t : src.getInstance()) convertSubstanceInstanceComponent(t, tgt);
for (org.hl7.fhir.dstu3.model.Substance.SubstanceIngredientComponent t : src.getIngredient()) tgt.addIngredient(convertSubstanceIngredientComponent(t));
return tgt;
}
@@ -76,11 +77,13 @@ public class Substance30_50 {
if (src.hasStatus())
tgt.setStatusElement(convertFHIRSubstanceStatus(src.getStatusElement()));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getCategory()) tgt.addCategory(VersionConvertor_30_50.convertCodeableConcept(t));
- if (src.hasCode())
- tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode()));
+ if (src.getCode().hasConcept())
+ tgt.setCode(VersionConvertor_30_50.convertCodeableConcept(src.getCode().getConcept()));
if (src.hasDescription())
tgt.setDescriptionElement(VersionConvertor_30_50.convertString(src.getDescriptionElement()));
- for (org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent t : src.getInstance()) tgt.addInstance(convertSubstanceInstanceComponent(t));
+ if (src.getInstance()) {
+ tgt.addInstance(convertSubstanceInstanceComponent(src));
+ }
for (org.hl7.fhir.r5.model.Substance.SubstanceIngredientComponent t : src.getIngredient()) tgt.addIngredient(convertSubstanceIngredientComponent(t));
return tgt;
}
@@ -109,31 +112,26 @@ public class Substance30_50 {
return tgt;
}
- public static org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent convertSubstanceInstanceComponent(org.hl7.fhir.dstu3.model.Substance.SubstanceInstanceComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent tgt = new org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent();
- VersionConvertor_30_50.copyElement(src, tgt);
+ public static void convertSubstanceInstanceComponent(org.hl7.fhir.dstu3.model.Substance.SubstanceInstanceComponent src, org.hl7.fhir.r5.model.Substance tgt) throws FHIRException {
+ tgt.setInstance(true);
if (src.hasIdentifier())
- tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier()));
+ tgt.addIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier()));
if (src.hasExpiry())
tgt.setExpiryElement(VersionConvertor_30_50.convertDateTime(src.getExpiryElement()));
if (src.hasQuantity())
tgt.setQuantity(VersionConvertor_30_50.convertSimpleQuantity(src.getQuantity()));
- return tgt;
}
- public static org.hl7.fhir.dstu3.model.Substance.SubstanceInstanceComponent convertSubstanceInstanceComponent(org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent src) throws FHIRException {
- if (src == null)
- return null;
+ public static org.hl7.fhir.dstu3.model.Substance.SubstanceInstanceComponent convertSubstanceInstanceComponent(org.hl7.fhir.r5.model.Substance src) throws FHIRException {
org.hl7.fhir.dstu3.model.Substance.SubstanceInstanceComponent tgt = new org.hl7.fhir.dstu3.model.Substance.SubstanceInstanceComponent();
- VersionConvertor_30_50.copyElement(src, tgt);
- if (src.hasIdentifier())
- tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(src.getIdentifier()));
- if (src.hasExpiry())
- tgt.setExpiryElement(VersionConvertor_30_50.convertDateTime(src.getExpiryElement()));
- if (src.hasQuantity())
- tgt.setQuantity(VersionConvertor_30_50.convertSimpleQuantity(src.getQuantity()));
- return tgt;
+ for (Identifier t : src.getIdentifier()) {
+ tgt.setIdentifier(VersionConvertor_30_50.convertIdentifier(t));
+ }
+ if (src.hasExpiry())
+ tgt.setExpiryElement(VersionConvertor_30_50.convertDateTime(src.getExpiryElement()));
+ if (src.hasQuantity())
+ tgt.setQuantity(VersionConvertor_30_50.convertSimpleQuantity(src.getQuantity()));
+ return tgt;
+
}
}
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ActivityDefinition40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ActivityDefinition40_50.java
index 2b8b0b4bb..d675c6fb2 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ActivityDefinition40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ActivityDefinition40_50.java
@@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv40_50;
import org.hl7.fhir.convertors.VersionConvertor_40_50;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.CodeableReference;
/*
Copyright (c) 2011+, HL7, Inc.
@@ -100,7 +101,7 @@ public class ActivityDefinition40_50 extends VersionConvertor_40_50 {
if (src.hasTiming())
tgt.setTiming(convertType(src.getTiming()));
if (src.hasLocation())
- tgt.setLocation(convertReference(src.getLocation()));
+ tgt.setLocation(new CodeableReference(convertReference(src.getLocation())));
for (org.hl7.fhir.r4.model.ActivityDefinition.ActivityDefinitionParticipantComponent t : src.getParticipant()) tgt.addParticipant(convertActivityDefinitionParticipantComponent(t));
if (src.hasProduct())
tgt.setProduct(convertType(src.getProduct()));
@@ -181,8 +182,8 @@ public class ActivityDefinition40_50 extends VersionConvertor_40_50 {
tgt.setDoNotPerformElement(convertBoolean(src.getDoNotPerformElement()));
if (src.hasTiming())
tgt.setTiming(convertType(src.getTiming()));
- if (src.hasLocation())
- tgt.setLocation(convertReference(src.getLocation()));
+ if (src.getLocation().hasReference())
+ tgt.setLocation(convertReference(src.getLocation().getReference()));
for (org.hl7.fhir.r5.model.ActivityDefinition.ActivityDefinitionParticipantComponent t : src.getParticipant()) tgt.addParticipant(convertActivityDefinitionParticipantComponent(t));
if (src.hasProduct())
tgt.setProduct(convertType(src.getProduct()));
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AllergyIntolerance40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AllergyIntolerance40_50.java
index abc2fa53b..b8ae4fed3 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AllergyIntolerance40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/AllergyIntolerance40_50.java
@@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv40_50;
import org.hl7.fhir.convertors.VersionConvertor_40_50;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.CodeableReference;
import java.util.stream.Collectors;
@@ -252,7 +253,7 @@ public class AllergyIntolerance40_50 extends VersionConvertor_40_50 {
copyElement(src, tgt);
if (src.hasSubstance())
tgt.setSubstance(convertCodeableConcept(src.getSubstance()));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getManifestation()) tgt.addManifestation(convertCodeableConcept(t));
+ for (org.hl7.fhir.r4.model.CodeableConcept t : src.getManifestation()) tgt.addManifestation(new CodeableReference(convertCodeableConcept(t)));
if (src.hasDescription())
tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
if (src.hasOnset())
@@ -272,7 +273,7 @@ public class AllergyIntolerance40_50 extends VersionConvertor_40_50 {
copyElement(src, tgt);
if (src.hasSubstance())
tgt.setSubstance(convertCodeableConcept(src.getSubstance()));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getManifestation()) tgt.addManifestation(convertCodeableConcept(t));
+ for (CodeableReference t : src.getManifestation()) if (t.hasConcept()) tgt.addManifestation(convertCodeableConcept(t.getConcept()));
if (src.hasDescription())
tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
if (src.hasOnset())
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment40_50.java
index de3e2c338..daa0499ef 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Appointment40_50.java
@@ -1,8 +1,11 @@
package org.hl7.fhir.convertors.conv40_50;
+import org.hl7.fhir.convertors.VersionConvertor_10_50;
import org.hl7.fhir.convertors.VersionConvertor_40_50;
+import org.hl7.fhir.r4.model.UnsignedIntType;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.CodeableConcept;
import org.hl7.fhir.r5.model.CodeableReference;
/*
@@ -54,7 +57,7 @@ public class Appointment40_50 extends VersionConvertor_40_50 {
for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) tgt.addReason(convertCodeableConceptToCodeableReference(t));
for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) tgt.addReason(convertReferenceToCodeableReference(t));
if (src.hasPriority())
- tgt.setPriorityElement(convertUnsignedInt(src.getPriorityElement()));
+ tgt.setPriority(convertAppointmentPriority(src.getPriorityElement()));
if (src.hasDescription())
tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
for (org.hl7.fhir.r4.model.Reference t : src.getSupportingInformation()) tgt.addSupportingInformation(convertReference(t));
@@ -97,7 +100,7 @@ public class Appointment40_50 extends VersionConvertor_40_50 {
for (CodeableReference t : src.getReason()) if (t.hasReference())
tgt.addReasonReference(convertReference(t.getReference()));
if (src.hasPriority())
- tgt.setPriorityElement(convertUnsignedInt(src.getPriorityElement()));
+ tgt.setPriorityElement(convertAppointmentPriority(src.getPriority()));
if (src.hasDescription())
tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
for (org.hl7.fhir.r5.model.Reference t : src.getSupportingInformation()) tgt.addSupportingInformation(convertReference(t));
@@ -120,6 +123,19 @@ public class Appointment40_50 extends VersionConvertor_40_50 {
return tgt;
}
+
+ private static UnsignedIntType convertAppointmentPriority(CodeableConcept src) {
+ UnsignedIntType tgt = new UnsignedIntType(convertAppointmentPriorityFromR5(src));
+ VersionConvertor_40_50.copyElement(src, tgt);
+ return tgt;
+ }
+
+ private static CodeableConcept convertAppointmentPriority(UnsignedIntType src) {
+ CodeableConcept tgt = src.hasValue() ? convertAppointmentPriorityToR5(src.getValue()) : new CodeableConcept();
+ VersionConvertor_40_50.copyElement(src, tgt);
+ return tgt;
+ }
+
static public org.hl7.fhir.r5.model.Enumeration convertAppointmentStatus(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan40_50.java
index 4a0748ecd..773de7806 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CarePlan40_50.java
@@ -240,13 +240,13 @@ public class CarePlan40_50 extends VersionConvertor_40_50 {
return null;
org.hl7.fhir.r5.model.CarePlan.CarePlanActivityComponent tgt = new org.hl7.fhir.r5.model.CarePlan.CarePlanActivityComponent();
copyElement(src, tgt);
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getOutcomeCodeableConcept()) tgt.addOutcome(convertCodeableConceptToCodeableReference(t));
- for (org.hl7.fhir.r4.model.Reference t : src.getOutcomeReference()) tgt.addOutcome(convertReferenceToCodeableReference(t));
+ for (org.hl7.fhir.r4.model.CodeableConcept t : src.getOutcomeCodeableConcept()) tgt.addPerformedActivity(convertCodeableConceptToCodeableReference(t));
+ for (org.hl7.fhir.r4.model.Reference t : src.getOutcomeReference()) tgt.addPerformedActivity(convertReferenceToCodeableReference(t));
for (org.hl7.fhir.r4.model.Annotation t : src.getProgress()) tgt.addProgress(convertAnnotation(t));
if (src.hasReference())
- tgt.setReference(convertReference(src.getReference()));
+ tgt.setPlannedActivityReference(convertReference(src.getReference()));
if (src.hasDetail())
- tgt.setDetail(convertCarePlanActivityDetailComponent(src.getDetail()));
+ tgt.setPlannedActivityDetail(convertCarePlanActivityDetailComponent(src.getDetail()));
return tgt;
}
@@ -255,22 +255,22 @@ public class CarePlan40_50 extends VersionConvertor_40_50 {
return null;
org.hl7.fhir.r4.model.CarePlan.CarePlanActivityComponent tgt = new org.hl7.fhir.r4.model.CarePlan.CarePlanActivityComponent();
copyElement(src, tgt);
- for (CodeableReference t : src.getOutcome()) if (t.hasConcept())
+ for (CodeableReference t : src.getPerformedActivity()) if (t.hasConcept())
tgt.addOutcomeCodeableConcept(convertCodeableConcept(t.getConcept()));
- for (CodeableReference t : src.getOutcome()) if (t.hasReference())
+ for (CodeableReference t : src.getPerformedActivity()) if (t.hasReference())
tgt.addOutcomeReference(convertReference(t.getReference()));
for (org.hl7.fhir.r5.model.Annotation t : src.getProgress()) tgt.addProgress(convertAnnotation(t));
- if (src.hasReference())
- tgt.setReference(convertReference(src.getReference()));
- if (src.hasDetail())
- tgt.setDetail(convertCarePlanActivityDetailComponent(src.getDetail()));
+ if (src.hasPlannedActivityReference())
+ tgt.setReference(convertReference(src.getPlannedActivityReference()));
+ if (src.hasPlannedActivityDetail())
+ tgt.setDetail(convertCarePlanActivityDetailComponent(src.getPlannedActivityDetail()));
return tgt;
}
- public static org.hl7.fhir.r5.model.CarePlan.CarePlanActivityDetailComponent convertCarePlanActivityDetailComponent(org.hl7.fhir.r4.model.CarePlan.CarePlanActivityDetailComponent src) throws FHIRException {
+ public static org.hl7.fhir.r5.model.CarePlan.CarePlanActivityPlannedActivityDetailComponent convertCarePlanActivityDetailComponent(org.hl7.fhir.r4.model.CarePlan.CarePlanActivityDetailComponent src) throws FHIRException {
if (src == null)
return null;
- org.hl7.fhir.r5.model.CarePlan.CarePlanActivityDetailComponent tgt = new org.hl7.fhir.r5.model.CarePlan.CarePlanActivityDetailComponent();
+ org.hl7.fhir.r5.model.CarePlan.CarePlanActivityPlannedActivityDetailComponent tgt = new org.hl7.fhir.r5.model.CarePlan.CarePlanActivityPlannedActivityDetailComponent();
copyElement(src, tgt);
if (src.hasKind())
tgt.setKindElement(convertCarePlanActivityKind(src.getKindElement()));
@@ -303,7 +303,7 @@ public class CarePlan40_50 extends VersionConvertor_40_50 {
return tgt;
}
- public static org.hl7.fhir.r4.model.CarePlan.CarePlanActivityDetailComponent convertCarePlanActivityDetailComponent(org.hl7.fhir.r5.model.CarePlan.CarePlanActivityDetailComponent src) throws FHIRException {
+ public static org.hl7.fhir.r4.model.CarePlan.CarePlanActivityDetailComponent convertCarePlanActivityDetailComponent(org.hl7.fhir.r5.model.CarePlan.CarePlanActivityPlannedActivityDetailComponent src) throws FHIRException {
if (src == null)
return null;
org.hl7.fhir.r4.model.CarePlan.CarePlanActivityDetailComponent tgt = new org.hl7.fhir.r4.model.CarePlan.CarePlanActivityDetailComponent();
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ConceptMap40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ConceptMap40_50.java
index 60b631320..97cc0f87c 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ConceptMap40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ConceptMap40_50.java
@@ -5,10 +5,14 @@ import org.hl7.fhir.convertors.VersionConvertorConstants;
import org.hl7.fhir.convertors.VersionConvertor_40_50;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence;
+import org.hl7.fhir.r4.model.StringType;
+import org.hl7.fhir.r4.model.UriType;
+import org.hl7.fhir.r5.model.CanonicalType;
import org.hl7.fhir.r5.model.Enumeration;
import org.hl7.fhir.r5.model.Enumerations;
import org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship;
import org.hl7.fhir.r5.utils.ToolingExtensions;
+import org.hl7.fhir.utilities.CanonicalPair;
/*
Copyright (c) 2011+, HL7, Inc.
@@ -126,33 +130,46 @@ public class ConceptMap40_50 extends VersionConvertor_40_50 {
return null;
org.hl7.fhir.r5.model.ConceptMap.ConceptMapGroupComponent tgt = new org.hl7.fhir.r5.model.ConceptMap.ConceptMapGroupComponent();
copyElement(src, tgt);
- if (src.hasSource())
- tgt.setSourceElement(convertUri(src.getSourceElement()));
- if (src.hasSourceVersion())
- tgt.setSourceVersionElement(convertString(src.getSourceVersionElement()));
- if (src.hasTarget())
- tgt.setTargetElement(convertUri(src.getTargetElement()));
- if (src.hasTargetVersion())
- tgt.setTargetVersionElement(convertString(src.getTargetVersionElement()));
+ if (src.hasSource() || src.hasSourceVersion())
+ tgt.setSourceElement(convertUriAndVersionToCanonical(src.getSourceElement(), src.getSourceVersionElement()));
+ if (src.hasTarget() || src.hasTargetVersion())
+ tgt.setTargetElement(convertUriAndVersionToCanonical(src.getTargetElement(), src.getTargetVersionElement()));
for (org.hl7.fhir.r4.model.ConceptMap.SourceElementComponent t : src.getElement()) tgt.addElement(convertSourceElementComponent(t));
if (src.hasUnmapped())
tgt.setUnmapped(convertConceptMapGroupUnmappedComponent(src.getUnmapped()));
return tgt;
}
+ private static CanonicalType convertUriAndVersionToCanonical(org.hl7.fhir.r4.model.UriType srcUri, org.hl7.fhir.r4.model.StringType srcVersion) {
+ if (srcUri == null && srcVersion == null)
+ return null;
+ org.hl7.fhir.r5.model.CanonicalType tgt = new org.hl7.fhir.r5.model.CanonicalType();
+ copyElement(srcUri == null ? srcVersion : srcUri, tgt);
+ if (srcUri.hasValue()) {
+ if (srcVersion.hasValue()) {
+ tgt.setValue(srcUri.getValue()+"|"+srcVersion.getValue());
+ } else {
+ tgt.setValue(srcUri.getValue());
+ }
+ }
+ return tgt;
+ }
+
public static org.hl7.fhir.r4.model.ConceptMap.ConceptMapGroupComponent convertConceptMapGroupComponent(org.hl7.fhir.r5.model.ConceptMap.ConceptMapGroupComponent src) throws FHIRException {
if (src == null)
return null;
org.hl7.fhir.r4.model.ConceptMap.ConceptMapGroupComponent tgt = new org.hl7.fhir.r4.model.ConceptMap.ConceptMapGroupComponent();
copyElement(src, tgt);
- if (src.hasSource())
- tgt.setSourceElement(convertUri(src.getSourceElement()));
- if (src.hasSourceVersion())
- tgt.setSourceVersionElement(convertString(src.getSourceVersionElement()));
- if (src.hasTarget())
- tgt.setTargetElement(convertUri(src.getTargetElement()));
- if (src.hasTargetVersion())
- tgt.setTargetVersionElement(convertString(src.getTargetVersionElement()));
+ if (src.hasSource()) {
+ CanonicalPair cp = new CanonicalPair(src.getSource());
+ tgt.setSource(cp.getUrl());
+ tgt.setSourceVersion(cp.getVersion());
+ }
+ if (src.hasTarget()) {
+ CanonicalPair cp = new CanonicalPair(src.getTarget());
+ tgt.setTarget(cp.getUrl());
+ tgt.setTargetVersion(cp.getVersion());
+ }
for (org.hl7.fhir.r5.model.ConceptMap.SourceElementComponent t : src.getElement()) tgt.addElement(convertSourceElementComponent(t));
if (src.hasUnmapped())
tgt.setUnmapped(convertConceptMapGroupUnmappedComponent(src.getUnmapped()));
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityResponse40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityResponse40_50.java
deleted file mode 100644
index f2cc38e30..000000000
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/CoverageEligibilityResponse40_50.java
+++ /dev/null
@@ -1,405 +0,0 @@
-package org.hl7.fhir.convertors.conv40_50;
-
-
-import org.hl7.fhir.convertors.VersionConvertor_40_50;
-import org.hl7.fhir.exceptions.FHIRException;
-
-import java.util.stream.Collectors;
-
-/*
- Copyright (c) 2011+, HL7, Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of HL7 nor the names of its contributors may be used to
- endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-*/
-// Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0
-public class CoverageEligibilityResponse40_50 extends VersionConvertor_40_50 {
-
- public static org.hl7.fhir.r5.model.CoverageEligibilityResponse convertCoverageEligibilityResponse(org.hl7.fhir.r4.model.CoverageEligibilityResponse src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.CoverageEligibilityResponse tgt = new org.hl7.fhir.r5.model.CoverageEligibilityResponse();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- if (src.hasStatus())
- tgt.setStatusElement(convertEligibilityResponseStatus(src.getStatusElement()));
- tgt.setPurpose(src.getPurpose().stream()
- .map(CoverageEligibilityResponse40_50::convertEligibilityResponsePurpose)
- .collect(Collectors.toList()));
- if (src.hasPatient())
- tgt.setPatient(convertReference(src.getPatient()));
- if (src.hasServiced())
- tgt.setServiced(convertType(src.getServiced()));
- if (src.hasCreated())
- tgt.setCreatedElement(convertDateTime(src.getCreatedElement()));
- if (src.hasRequestor())
- tgt.setRequestor(convertReference(src.getRequestor()));
- if (src.hasRequest())
- tgt.setRequest(convertReference(src.getRequest()));
- if (src.hasOutcome())
- tgt.setOutcomeElement(convertRemittanceOutcome(src.getOutcomeElement()));
- if (src.hasDisposition())
- tgt.setDispositionElement(convertString(src.getDispositionElement()));
- if (src.hasInsurer())
- tgt.setInsurer(convertReference(src.getInsurer()));
- for (org.hl7.fhir.r4.model.CoverageEligibilityResponse.InsuranceComponent t : src.getInsurance()) tgt.addInsurance(convertInsuranceComponent(t));
- if (src.hasPreAuthRef())
- tgt.setPreAuthRefElement(convertString(src.getPreAuthRefElement()));
- if (src.hasForm())
- tgt.setForm(convertCodeableConcept(src.getForm()));
- for (org.hl7.fhir.r4.model.CoverageEligibilityResponse.ErrorsComponent t : src.getError()) tgt.addError(convertErrorsComponent(t));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.CoverageEligibilityResponse convertCoverageEligibilityResponse(org.hl7.fhir.r5.model.CoverageEligibilityResponse src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.CoverageEligibilityResponse tgt = new org.hl7.fhir.r4.model.CoverageEligibilityResponse();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- if (src.hasStatus())
- tgt.setStatusElement(convertEligibilityResponseStatus(src.getStatusElement()));
- tgt.setPurpose(src.getPurpose().stream()
- .map(CoverageEligibilityResponse40_50::convertEligibilityResponsePurpose)
- .collect(Collectors.toList()));
- if (src.hasPatient())
- tgt.setPatient(convertReference(src.getPatient()));
- if (src.hasServiced())
- tgt.setServiced(convertType(src.getServiced()));
- if (src.hasCreated())
- tgt.setCreatedElement(convertDateTime(src.getCreatedElement()));
- if (src.hasRequestor())
- tgt.setRequestor(convertReference(src.getRequestor()));
- if (src.hasRequest())
- tgt.setRequest(convertReference(src.getRequest()));
- if (src.hasOutcome())
- tgt.setOutcomeElement(convertRemittanceOutcome(src.getOutcomeElement()));
- if (src.hasDisposition())
- tgt.setDispositionElement(convertString(src.getDispositionElement()));
- if (src.hasInsurer())
- tgt.setInsurer(convertReference(src.getInsurer()));
- for (org.hl7.fhir.r5.model.CoverageEligibilityResponse.InsuranceComponent t : src.getInsurance()) tgt.addInsurance(convertInsuranceComponent(t));
- if (src.hasPreAuthRef())
- tgt.setPreAuthRefElement(convertString(src.getPreAuthRefElement()));
- if (src.hasForm())
- tgt.setForm(convertCodeableConcept(src.getForm()));
- for (org.hl7.fhir.r5.model.CoverageEligibilityResponse.ErrorsComponent t : src.getError()) tgt.addError(convertErrorsComponent(t));
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertEligibilityResponseStatus(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodesEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.ACTIVE);
- break;
- case CANCELLED:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.CANCELLED);
- break;
- case DRAFT:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.DRAFT);
- break;
- case ENTEREDINERROR:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.ENTEREDINERROR);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertEligibilityResponseStatus(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.CoverageEligibilityResponse.EligibilityResponseStatusEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.r4.model.CoverageEligibilityResponse.EligibilityResponseStatus.ACTIVE);
- break;
- case CANCELLED:
- tgt.setValue(org.hl7.fhir.r4.model.CoverageEligibilityResponse.EligibilityResponseStatus.CANCELLED);
- break;
- case DRAFT:
- tgt.setValue(org.hl7.fhir.r4.model.CoverageEligibilityResponse.EligibilityResponseStatus.DRAFT);
- break;
- case ENTEREDINERROR:
- tgt.setValue(org.hl7.fhir.r4.model.CoverageEligibilityResponse.EligibilityResponseStatus.ENTEREDINERROR);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.CoverageEligibilityResponse.EligibilityResponseStatus.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertEligibilityResponsePurpose(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.CoverageEligibilityResponse.EligibilityResponsePurposeEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case AUTHREQUIREMENTS:
- tgt.setValue(org.hl7.fhir.r5.model.CoverageEligibilityResponse.EligibilityResponsePurpose.AUTHREQUIREMENTS);
- break;
- case BENEFITS:
- tgt.setValue(org.hl7.fhir.r5.model.CoverageEligibilityResponse.EligibilityResponsePurpose.BENEFITS);
- break;
- case DISCOVERY:
- tgt.setValue(org.hl7.fhir.r5.model.CoverageEligibilityResponse.EligibilityResponsePurpose.DISCOVERY);
- break;
- case VALIDATION:
- tgt.setValue(org.hl7.fhir.r5.model.CoverageEligibilityResponse.EligibilityResponsePurpose.VALIDATION);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.CoverageEligibilityResponse.EligibilityResponsePurpose.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertEligibilityResponsePurpose(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.CoverageEligibilityResponse.EligibilityResponsePurposeEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case AUTHREQUIREMENTS:
- tgt.setValue(org.hl7.fhir.r4.model.CoverageEligibilityResponse.EligibilityResponsePurpose.AUTHREQUIREMENTS);
- break;
- case BENEFITS:
- tgt.setValue(org.hl7.fhir.r4.model.CoverageEligibilityResponse.EligibilityResponsePurpose.BENEFITS);
- break;
- case DISCOVERY:
- tgt.setValue(org.hl7.fhir.r4.model.CoverageEligibilityResponse.EligibilityResponsePurpose.DISCOVERY);
- break;
- case VALIDATION:
- tgt.setValue(org.hl7.fhir.r4.model.CoverageEligibilityResponse.EligibilityResponsePurpose.VALIDATION);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.CoverageEligibilityResponse.EligibilityResponsePurpose.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertRemittanceOutcome(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodesEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case QUEUED:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.QUEUED);
- break;
- case COMPLETE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.COMPLETE);
- break;
- case ERROR:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.ERROR);
- break;
- case PARTIAL:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.PARTIAL);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertRemittanceOutcome(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.Enumerations.RemittanceOutcomeEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case QUEUED:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.QUEUED);
- break;
- case COMPLETE:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.COMPLETE);
- break;
- case ERROR:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.ERROR);
- break;
- case PARTIAL:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.PARTIAL);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.NULL);
- break;
- }
- return tgt;
- }
-
- public static org.hl7.fhir.r5.model.CoverageEligibilityResponse.InsuranceComponent convertInsuranceComponent(org.hl7.fhir.r4.model.CoverageEligibilityResponse.InsuranceComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.CoverageEligibilityResponse.InsuranceComponent tgt = new org.hl7.fhir.r5.model.CoverageEligibilityResponse.InsuranceComponent();
- copyElement(src, tgt);
- if (src.hasCoverage())
- tgt.setCoverage(convertReference(src.getCoverage()));
- if (src.hasInforce())
- tgt.setInforceElement(convertBoolean(src.getInforceElement()));
- if (src.hasBenefitPeriod())
- tgt.setBenefitPeriod(convertPeriod(src.getBenefitPeriod()));
- for (org.hl7.fhir.r4.model.CoverageEligibilityResponse.ItemsComponent t : src.getItem()) tgt.addItem(convertItemsComponent(t));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.CoverageEligibilityResponse.InsuranceComponent convertInsuranceComponent(org.hl7.fhir.r5.model.CoverageEligibilityResponse.InsuranceComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.CoverageEligibilityResponse.InsuranceComponent tgt = new org.hl7.fhir.r4.model.CoverageEligibilityResponse.InsuranceComponent();
- copyElement(src, tgt);
- if (src.hasCoverage())
- tgt.setCoverage(convertReference(src.getCoverage()));
- if (src.hasInforce())
- tgt.setInforceElement(convertBoolean(src.getInforceElement()));
- if (src.hasBenefitPeriod())
- tgt.setBenefitPeriod(convertPeriod(src.getBenefitPeriod()));
- for (org.hl7.fhir.r5.model.CoverageEligibilityResponse.ItemsComponent t : src.getItem()) tgt.addItem(convertItemsComponent(t));
- return tgt;
- }
-
- public static org.hl7.fhir.r5.model.CoverageEligibilityResponse.ItemsComponent convertItemsComponent(org.hl7.fhir.r4.model.CoverageEligibilityResponse.ItemsComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.CoverageEligibilityResponse.ItemsComponent tgt = new org.hl7.fhir.r5.model.CoverageEligibilityResponse.ItemsComponent();
- copyElement(src, tgt);
- if (src.hasCategory())
- tgt.setCategory(convertCodeableConcept(src.getCategory()));
- if (src.hasProductOrService())
- tgt.setProductOrService(convertCodeableConcept(src.getProductOrService()));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getModifier()) tgt.addModifier(convertCodeableConcept(t));
- if (src.hasProvider())
- tgt.setProvider(convertReference(src.getProvider()));
- if (src.hasExcluded())
- tgt.setExcludedElement(convertBoolean(src.getExcludedElement()));
- if (src.hasName())
- tgt.setNameElement(convertString(src.getNameElement()));
- if (src.hasDescription())
- tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
- if (src.hasNetwork())
- tgt.setNetwork(convertCodeableConcept(src.getNetwork()));
- if (src.hasUnit())
- tgt.setUnit(convertCodeableConcept(src.getUnit()));
- if (src.hasTerm())
- tgt.setTerm(convertCodeableConcept(src.getTerm()));
- for (org.hl7.fhir.r4.model.CoverageEligibilityResponse.BenefitComponent t : src.getBenefit()) tgt.addBenefit(convertBenefitComponent(t));
- if (src.hasAuthorizationRequired())
- tgt.setAuthorizationRequiredElement(convertBoolean(src.getAuthorizationRequiredElement()));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getAuthorizationSupporting()) tgt.addAuthorizationSupporting(convertCodeableConcept(t));
- if (src.hasAuthorizationUrl())
- tgt.setAuthorizationUrlElement(convertUri(src.getAuthorizationUrlElement()));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.CoverageEligibilityResponse.ItemsComponent convertItemsComponent(org.hl7.fhir.r5.model.CoverageEligibilityResponse.ItemsComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.CoverageEligibilityResponse.ItemsComponent tgt = new org.hl7.fhir.r4.model.CoverageEligibilityResponse.ItemsComponent();
- copyElement(src, tgt);
- if (src.hasCategory())
- tgt.setCategory(convertCodeableConcept(src.getCategory()));
- if (src.hasProductOrService())
- tgt.setProductOrService(convertCodeableConcept(src.getProductOrService()));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getModifier()) tgt.addModifier(convertCodeableConcept(t));
- if (src.hasProvider())
- tgt.setProvider(convertReference(src.getProvider()));
- if (src.hasExcluded())
- tgt.setExcludedElement(convertBoolean(src.getExcludedElement()));
- if (src.hasName())
- tgt.setNameElement(convertString(src.getNameElement()));
- if (src.hasDescription())
- tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
- if (src.hasNetwork())
- tgt.setNetwork(convertCodeableConcept(src.getNetwork()));
- if (src.hasUnit())
- tgt.setUnit(convertCodeableConcept(src.getUnit()));
- if (src.hasTerm())
- tgt.setTerm(convertCodeableConcept(src.getTerm()));
- for (org.hl7.fhir.r5.model.CoverageEligibilityResponse.BenefitComponent t : src.getBenefit()) tgt.addBenefit(convertBenefitComponent(t));
- if (src.hasAuthorizationRequired())
- tgt.setAuthorizationRequiredElement(convertBoolean(src.getAuthorizationRequiredElement()));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getAuthorizationSupporting()) tgt.addAuthorizationSupporting(convertCodeableConcept(t));
- if (src.hasAuthorizationUrl())
- tgt.setAuthorizationUrlElement(convertUri(src.getAuthorizationUrlElement()));
- return tgt;
- }
-
- public static org.hl7.fhir.r5.model.CoverageEligibilityResponse.BenefitComponent convertBenefitComponent(org.hl7.fhir.r4.model.CoverageEligibilityResponse.BenefitComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.CoverageEligibilityResponse.BenefitComponent tgt = new org.hl7.fhir.r5.model.CoverageEligibilityResponse.BenefitComponent();
- copyElement(src, tgt);
- if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
- if (src.hasAllowed())
- tgt.setAllowed(convertType(src.getAllowed()));
- if (src.hasUsed())
- tgt.setUsed(convertType(src.getUsed()));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.CoverageEligibilityResponse.BenefitComponent convertBenefitComponent(org.hl7.fhir.r5.model.CoverageEligibilityResponse.BenefitComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.CoverageEligibilityResponse.BenefitComponent tgt = new org.hl7.fhir.r4.model.CoverageEligibilityResponse.BenefitComponent();
- copyElement(src, tgt);
- if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
- if (src.hasAllowed())
- tgt.setAllowed(convertType(src.getAllowed()));
- if (src.hasUsed())
- tgt.setUsed(convertType(src.getUsed()));
- return tgt;
- }
-
- public static org.hl7.fhir.r5.model.CoverageEligibilityResponse.ErrorsComponent convertErrorsComponent(org.hl7.fhir.r4.model.CoverageEligibilityResponse.ErrorsComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.CoverageEligibilityResponse.ErrorsComponent tgt = new org.hl7.fhir.r5.model.CoverageEligibilityResponse.ErrorsComponent();
- copyElement(src, tgt);
- if (src.hasCode())
- tgt.setCode(convertCodeableConcept(src.getCode()));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.CoverageEligibilityResponse.ErrorsComponent convertErrorsComponent(org.hl7.fhir.r5.model.CoverageEligibilityResponse.ErrorsComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.CoverageEligibilityResponse.ErrorsComponent tgt = new org.hl7.fhir.r4.model.CoverageEligibilityResponse.ErrorsComponent();
- copyElement(src, tgt);
- if (src.hasCode())
- tgt.setCode(convertCodeableConcept(src.getCode()));
- return tgt;
- }
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Device40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Device40_50.java
index aaae94802..15f41672c 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Device40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Device40_50.java
@@ -432,8 +432,8 @@ public class Device40_50 extends VersionConvertor_40_50 {
copyElement(src, tgt);
if (src.hasType())
tgt.setType(convertCodeableConcept(src.getType()));
- for (org.hl7.fhir.r4.model.Quantity t : src.getValueQuantity()) tgt.addValueQuantity(convertQuantity(t));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getValueCode()) tgt.addValueCode(convertCodeableConcept(t));
+ for (org.hl7.fhir.r4.model.Quantity t : src.getValueQuantity()) tgt.setValue(convertQuantity(t));
+ for (org.hl7.fhir.r4.model.CodeableConcept t : src.getValueCode()) tgt.setValue(convertCodeableConcept(t));
return tgt;
}
@@ -444,8 +444,8 @@ public class Device40_50 extends VersionConvertor_40_50 {
copyElement(src, tgt);
if (src.hasType())
tgt.setType(convertCodeableConcept(src.getType()));
- for (org.hl7.fhir.r5.model.Quantity t : src.getValueQuantity()) tgt.addValueQuantity(convertQuantity(t));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getValueCode()) tgt.addValueCode(convertCodeableConcept(t));
+ if (src.hasValueQuantity()) tgt.addValueQuantity(convertQuantity(src.getValueQuantity()));
+ if (src.hasValueCodeableConcept()) tgt.addValueCode(convertCodeableConcept(src.getValueCodeableConcept()));
return tgt;
}
}
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceDefinition40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceDefinition40_50.java
index 4b2e7a9f7..3d1e35c3f 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceDefinition40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceDefinition40_50.java
@@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv40_50;
import org.hl7.fhir.convertors.VersionConvertor_40_50;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.DeviceDefinition.DeviceDefinitionVersionComponent;
/*
Copyright (c) 2011+, HL7, Inc.
@@ -48,9 +49,9 @@ public class DeviceDefinition40_50 extends VersionConvertor_40_50 {
if (src.hasModelNumber())
tgt.setModelNumberElement(convertString(src.getModelNumberElement()));
if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
+ tgt.addType(convertCodeableConcept(src.getType()));
for (org.hl7.fhir.r4.model.DeviceDefinition.DeviceDefinitionSpecializationComponent t : src.getSpecialization()) tgt.addSpecialization(convertDeviceDefinitionSpecializationComponent(t));
- for (org.hl7.fhir.r4.model.StringType t : src.getVersion()) tgt.getVersion().add(convertString(t));
+ for (org.hl7.fhir.r4.model.StringType t : src.getVersion()) tgt.getVersion().add(new DeviceDefinitionVersionComponent().setValueElement(convertString(t)));
for (org.hl7.fhir.r4.model.CodeableConcept t : src.getSafety()) tgt.addSafety(convertCodeableConcept(t));
for (org.hl7.fhir.r4.model.ProductShelfLife t : src.getShelfLifeStorage()) tgt.addShelfLifeStorage(convertProductShelfLife(t));
if (src.hasPhysicalCharacteristics())
@@ -64,8 +65,6 @@ public class DeviceDefinition40_50 extends VersionConvertor_40_50 {
if (src.hasOnlineInformation())
tgt.setOnlineInformationElement(convertUri(src.getOnlineInformationElement()));
for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t));
- if (src.hasQuantity())
- tgt.setQuantity(convertQuantity(src.getQuantity()));
if (src.hasParentDevice())
tgt.setParentDevice(convertReference(src.getParentDevice()));
for (org.hl7.fhir.r4.model.DeviceDefinition.DeviceDefinitionMaterialComponent t : src.getMaterial()) tgt.addMaterial(convertDeviceDefinitionMaterialComponent(t));
@@ -84,10 +83,9 @@ public class DeviceDefinition40_50 extends VersionConvertor_40_50 {
for (org.hl7.fhir.r5.model.DeviceDefinition.DeviceDefinitionDeviceNameComponent t : src.getDeviceName()) tgt.addDeviceName(convertDeviceDefinitionDeviceNameComponent(t));
if (src.hasModelNumber())
tgt.setModelNumberElement(convertString(src.getModelNumberElement()));
- if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
+ for (org.hl7.fhir.r5.model.CodeableConcept t : src.getType()) tgt.setType(convertCodeableConcept(t));
for (org.hl7.fhir.r5.model.DeviceDefinition.DeviceDefinitionSpecializationComponent t : src.getSpecialization()) tgt.addSpecialization(convertDeviceDefinitionSpecializationComponent(t));
- for (org.hl7.fhir.r5.model.StringType t : src.getVersion()) tgt.getVersion().add(convertString(t));
+ for (DeviceDefinitionVersionComponent t : src.getVersion()) tgt.getVersion().add(convertString(t.getValueElement()));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getSafety()) tgt.addSafety(convertCodeableConcept(t));
for (org.hl7.fhir.r5.model.ProductShelfLife t : src.getShelfLifeStorage()) tgt.addShelfLifeStorage(convertProductShelfLife(t));
if (src.hasPhysicalCharacteristics())
@@ -101,8 +99,6 @@ public class DeviceDefinition40_50 extends VersionConvertor_40_50 {
if (src.hasOnlineInformation())
tgt.setOnlineInformationElement(convertUri(src.getOnlineInformationElement()));
for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t));
- if (src.hasQuantity())
- tgt.setQuantity(convertQuantity(src.getQuantity()));
if (src.hasParentDevice())
tgt.setParentDevice(convertReference(src.getParentDevice()));
for (org.hl7.fhir.r5.model.DeviceDefinition.DeviceDefinitionMaterialComponent t : src.getMaterial()) tgt.addMaterial(convertDeviceDefinitionMaterialComponent(t));
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement40_50.java
index b0febbf32..aad53c269 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/DeviceUseStatement40_50.java
@@ -36,10 +36,10 @@ import org.hl7.fhir.r5.model.CodeableReference;
// Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0
public class DeviceUseStatement40_50 extends VersionConvertor_40_50 {
- public static org.hl7.fhir.r5.model.DeviceUseStatement convertDeviceUseStatement(org.hl7.fhir.r4.model.DeviceUseStatement src) throws FHIRException {
+ public static org.hl7.fhir.r5.model.DeviceUsage convertDeviceUseStatement(org.hl7.fhir.r4.model.DeviceUseStatement src) throws FHIRException {
if (src == null)
return null;
- org.hl7.fhir.r5.model.DeviceUseStatement tgt = new org.hl7.fhir.r5.model.DeviceUseStatement();
+ org.hl7.fhir.r5.model.DeviceUsage tgt = new org.hl7.fhir.r5.model.DeviceUsage();
copyDomainResource(src, tgt);
for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
for (org.hl7.fhir.r4.model.Reference t : src.getBasedOn()) tgt.addBasedOn(convertReference(t));
@@ -64,7 +64,7 @@ public class DeviceUseStatement40_50 extends VersionConvertor_40_50 {
return tgt;
}
- public static org.hl7.fhir.r4.model.DeviceUseStatement convertDeviceUseStatement(org.hl7.fhir.r5.model.DeviceUseStatement src) throws FHIRException {
+ public static org.hl7.fhir.r4.model.DeviceUseStatement convertDeviceUseStatement(org.hl7.fhir.r5.model.DeviceUsage src) throws FHIRException {
if (src == null)
return null;
org.hl7.fhir.r4.model.DeviceUseStatement tgt = new org.hl7.fhir.r4.model.DeviceUseStatement();
@@ -94,38 +94,38 @@ public class DeviceUseStatement40_50 extends VersionConvertor_40_50 {
return tgt;
}
- static public org.hl7.fhir.r5.model.Enumeration convertDeviceUseStatementStatus(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
+ static public org.hl7.fhir.r5.model.Enumeration convertDeviceUseStatementStatus(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatusEnumFactory());
+ org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatusEnumFactory());
VersionConvertor_40_50.copyElement(src, tgt);
switch(src.getValue()) {
case ACTIVE:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.ACTIVE);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.ACTIVE);
break;
case COMPLETED:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.COMPLETED);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.COMPLETED);
break;
case ENTEREDINERROR:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.ENTEREDINERROR);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.ENTEREDINERROR);
break;
case INTENDED:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.INTENDED);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.INTENDED);
break;
case STOPPED:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.STOPPED);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.STOPPED);
break;
case ONHOLD:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.ONHOLD);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.ONHOLD);
break;
default:
- tgt.setValue(org.hl7.fhir.r5.model.DeviceUseStatement.DeviceUseStatementStatus.NULL);
+ tgt.setValue(org.hl7.fhir.r5.model.DeviceUsage.DeviceUsageStatus.NULL);
break;
}
return tgt;
}
- static public org.hl7.fhir.r4.model.Enumeration convertDeviceUseStatementStatus(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
+ static public org.hl7.fhir.r4.model.Enumeration convertDeviceUseStatementStatus(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.DeviceUseStatement.DeviceUseStatementStatusEnumFactory());
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentResponse40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentResponse40_50.java
deleted file mode 100644
index 1b86f55c3..000000000
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/EnrollmentResponse40_50.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package org.hl7.fhir.convertors.conv40_50;
-
-
-import org.hl7.fhir.convertors.VersionConvertor_40_50;
-import org.hl7.fhir.exceptions.FHIRException;
-
-/*
- Copyright (c) 2011+, HL7, Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of HL7 nor the names of its contributors may be used to
- endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-*/
-// Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0
-public class EnrollmentResponse40_50 extends VersionConvertor_40_50 {
-
- public static org.hl7.fhir.r5.model.EnrollmentResponse convertEnrollmentResponse(org.hl7.fhir.r4.model.EnrollmentResponse src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.EnrollmentResponse tgt = new org.hl7.fhir.r5.model.EnrollmentResponse();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- if (src.hasStatus())
- tgt.setStatusElement(convertEnrollmentResponseStatus(src.getStatusElement()));
- if (src.hasRequest())
- tgt.setRequest(convertReference(src.getRequest()));
- if (src.hasOutcome())
- tgt.setOutcomeElement(convertRemittanceOutcome(src.getOutcomeElement()));
- if (src.hasDisposition())
- tgt.setDispositionElement(convertString(src.getDispositionElement()));
- if (src.hasCreated())
- tgt.setCreatedElement(convertDateTime(src.getCreatedElement()));
- if (src.hasOrganization())
- tgt.setOrganization(convertReference(src.getOrganization()));
- if (src.hasRequestProvider())
- tgt.setRequestProvider(convertReference(src.getRequestProvider()));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.EnrollmentResponse convertEnrollmentResponse(org.hl7.fhir.r5.model.EnrollmentResponse src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.EnrollmentResponse tgt = new org.hl7.fhir.r4.model.EnrollmentResponse();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- if (src.hasStatus())
- tgt.setStatusElement(convertEnrollmentResponseStatus(src.getStatusElement()));
- if (src.hasRequest())
- tgt.setRequest(convertReference(src.getRequest()));
- if (src.hasOutcome())
- tgt.setOutcomeElement(convertRemittanceOutcome(src.getOutcomeElement()));
- if (src.hasDisposition())
- tgt.setDispositionElement(convertString(src.getDispositionElement()));
- if (src.hasCreated())
- tgt.setCreatedElement(convertDateTime(src.getCreatedElement()));
- if (src.hasOrganization())
- tgt.setOrganization(convertReference(src.getOrganization()));
- if (src.hasRequestProvider())
- tgt.setRequestProvider(convertReference(src.getRequestProvider()));
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertEnrollmentResponseStatus(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodesEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.ACTIVE);
- break;
- case CANCELLED:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.CANCELLED);
- break;
- case DRAFT:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.DRAFT);
- break;
- case ENTEREDINERROR:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.ENTEREDINERROR);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertEnrollmentResponseStatus(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.EnrollmentResponse.EnrollmentResponseStatusEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.r4.model.EnrollmentResponse.EnrollmentResponseStatus.ACTIVE);
- break;
- case CANCELLED:
- tgt.setValue(org.hl7.fhir.r4.model.EnrollmentResponse.EnrollmentResponseStatus.CANCELLED);
- break;
- case DRAFT:
- tgt.setValue(org.hl7.fhir.r4.model.EnrollmentResponse.EnrollmentResponseStatus.DRAFT);
- break;
- case ENTEREDINERROR:
- tgt.setValue(org.hl7.fhir.r4.model.EnrollmentResponse.EnrollmentResponseStatus.ENTEREDINERROR);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.EnrollmentResponse.EnrollmentResponseStatus.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertRemittanceOutcome(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodesEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case QUEUED:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.QUEUED);
- break;
- case COMPLETE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.COMPLETE);
- break;
- case ERROR:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.ERROR);
- break;
- case PARTIAL:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.PARTIAL);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertRemittanceOutcome(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.Enumerations.RemittanceOutcomeEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case QUEUED:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.QUEUED);
- break;
- case COMPLETE:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.COMPLETE);
- break;
- case ERROR:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.ERROR);
- break;
- case PARTIAL:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.PARTIAL);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.NULL);
- break;
- }
- return tgt;
- }
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal40_50.java
index 7ef1ec78a..28b139197 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Goal40_50.java
@@ -60,8 +60,6 @@ public class Goal40_50 extends VersionConvertor_40_50 {
tgt.setStatusDateElement(convertDate(src.getStatusDateElement()));
if (src.hasStatusReason())
tgt.setStatusReasonElement(convertString(src.getStatusReasonElement()));
- if (src.hasExpressedBy())
- tgt.setExpressedBy(convertReference(src.getExpressedBy()));
for (org.hl7.fhir.r4.model.Reference t : src.getAddresses()) tgt.addAddresses(convertReference(t));
for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t));
for (org.hl7.fhir.r4.model.CodeableConcept t : src.getOutcomeCode()) tgt.addOutcome(convertCodeableConceptToCodeableReference(t));
@@ -93,8 +91,6 @@ public class Goal40_50 extends VersionConvertor_40_50 {
tgt.setStatusDateElement(convertDate(src.getStatusDateElement()));
if (src.hasStatusReason())
tgt.setStatusReasonElement(convertString(src.getStatusReasonElement()));
- if (src.hasExpressedBy())
- tgt.setExpressedBy(convertReference(src.getExpressedBy()));
for (org.hl7.fhir.r5.model.Reference t : src.getAddresses()) tgt.addAddresses(convertReference(t));
for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t));
for (CodeableReference t : src.getOutcome()) if (t.hasConcept())
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MeasureReport40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MeasureReport40_50.java
index 35523c585..298f97dd8 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MeasureReport40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MeasureReport40_50.java
@@ -205,8 +205,8 @@ public class MeasureReport40_50 extends VersionConvertor_40_50 {
if (src.hasCode())
tgt.setCode(convertCodeableConcept(src.getCode()));
for (org.hl7.fhir.r5.model.MeasureReport.MeasureReportGroupPopulationComponent t : src.getPopulation()) tgt.addPopulation(convertMeasureReportGroupPopulationComponent(t));
- if (src.hasMeasureScore())
- tgt.setMeasureScore(convertQuantity(src.getMeasureScore()));
+ if (src.hasMeasureScoreQuantity())
+ tgt.setMeasureScore(convertQuantity(src.getMeasureScoreQuantity()));
for (org.hl7.fhir.r5.model.MeasureReport.MeasureReportGroupStratifierComponent t : src.getStratifier()) tgt.addStratifier(convertMeasureReportGroupStratifierComponent(t));
return tgt;
}
@@ -278,12 +278,12 @@ public class MeasureReport40_50 extends VersionConvertor_40_50 {
return null;
org.hl7.fhir.r4.model.MeasureReport.StratifierGroupComponent tgt = new org.hl7.fhir.r4.model.MeasureReport.StratifierGroupComponent();
copyElement(src, tgt);
- if (src.hasValue())
- tgt.setValue(convertCodeableConcept(src.getValue()));
+ if (src.hasValueCodeableConcept())
+ tgt.setValue(convertCodeableConcept(src.getValueCodeableConcept()));
for (org.hl7.fhir.r5.model.MeasureReport.StratifierGroupComponentComponent t : src.getComponent()) tgt.addComponent(convertStratifierGroupComponentComponent(t));
for (org.hl7.fhir.r5.model.MeasureReport.StratifierGroupPopulationComponent t : src.getPopulation()) tgt.addPopulation(convertStratifierGroupPopulationComponent(t));
- if (src.hasMeasureScore())
- tgt.setMeasureScore(convertQuantity(src.getMeasureScore()));
+ if (src.hasMeasureScoreQuantity())
+ tgt.setMeasureScore(convertQuantity(src.getMeasureScoreQuantity()));
return tgt;
}
@@ -306,8 +306,8 @@ public class MeasureReport40_50 extends VersionConvertor_40_50 {
copyElement(src, tgt);
if (src.hasCode())
tgt.setCode(convertCodeableConcept(src.getCode()));
- if (src.hasValue())
- tgt.setValue(convertCodeableConcept(src.getValue()));
+ if (src.hasValueCodeableConcept())
+ tgt.setValue(convertCodeableConcept(src.getValueCodeableConcept()));
return tgt;
}
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Medication40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Medication40_50.java
index e282e484b..4bd3457f0 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Medication40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Medication40_50.java
@@ -46,7 +46,7 @@ public class Medication40_50 extends VersionConvertor_40_50 {
if (src.hasStatus())
tgt.setStatusElement(convertMedicationStatus(src.getStatusElement()));
if (src.hasManufacturer())
- tgt.setManufacturer(convertReference(src.getManufacturer()));
+ tgt.setSponsor(convertReference(src.getManufacturer()));
if (src.hasForm())
tgt.setDoseForm(convertCodeableConcept(src.getForm()));
if (src.hasAmount())
@@ -67,8 +67,8 @@ public class Medication40_50 extends VersionConvertor_40_50 {
tgt.setCode(convertCodeableConcept(src.getCode()));
if (src.hasStatus())
tgt.setStatusElement(convertMedicationStatus(src.getStatusElement()));
- if (src.hasManufacturer())
- tgt.setManufacturer(convertReference(src.getManufacturer()));
+ if (src.hasSponsor())
+ tgt.setManufacturer(convertReference(src.getSponsor()));
if (src.hasDoseForm())
tgt.setForm(convertCodeableConcept(src.getDoseForm()));
if (src.hasAmount())
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java
index 4134b86d1..24b9b9d18 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationKnowledge40_50.java
@@ -4,6 +4,8 @@ package org.hl7.fhir.convertors.conv40_50;
import org.hl7.fhir.convertors.VersionConvertor_40_50;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r4.model.CodeType;
+import org.hl7.fhir.r5.model.CodeableConcept;
+import org.hl7.fhir.r5.model.Coding;
import org.hl7.fhir.r5.model.Enumeration;
import org.hl7.fhir.r5.model.MedicationKnowledge.MedicationKnowledgeStatusCodesEnumFactory;
import org.hl7.fhir.r5.model.MedicationKnowledge.MedicationKnowledgePackagingComponent;
@@ -51,7 +53,7 @@ public class MedicationKnowledge40_50 extends VersionConvertor_40_50 {
if (src.hasStatus())
tgt.setStatusElement(convertMedicationKnowledgeStatus(src.getStatusElement()));
if (src.hasManufacturer())
- tgt.setManufacturer(convertReference(src.getManufacturer()));
+ tgt.setSponsor(convertReference(src.getManufacturer()));
if (src.hasDoseForm())
tgt.setDoseForm(convertCodeableConcept(src.getDoseForm()));
if (src.hasAmount())
@@ -90,8 +92,8 @@ public class MedicationKnowledge40_50 extends VersionConvertor_40_50 {
tgt.setCode(convertCodeableConcept(src.getCode()));
if (src.hasStatus())
tgt.setStatusElement(convertMedicationKnowledgeStatus(src.getStatusElement()));
- if (src.hasManufacturer())
- tgt.setManufacturer(convertReference(src.getManufacturer()));
+ if (src.hasSponsor())
+ tgt.setManufacturer(convertReference(src.getSponsor()));
if (src.hasDoseForm())
tgt.setDoseForm(convertCodeableConcept(src.getDoseForm()));
if (src.hasAmount())
@@ -221,8 +223,8 @@ public class MedicationKnowledge40_50 extends VersionConvertor_40_50 {
tgt.getItem().setConcept(convertCodeableConcept(src.getItemCodeableConcept()));
if (src.hasItemReference())
tgt.getItem().setReference(convertReference(src.getItemReference()));
- if (src.hasIsActive())
- tgt.setIsActiveElement(convertBoolean(src.getIsActiveElement()));
+ if (src.getIsActive())
+ tgt.setIsActive(new CodeableConcept(new Coding("ttp://terminology.hl7.org/CodeSystem/v3-RoleClass", "ACTI", "active ingredient ")));
if (src.hasStrength())
tgt.setStrength(convertRatio(src.getStrength()));
return tgt;
@@ -238,7 +240,7 @@ public class MedicationKnowledge40_50 extends VersionConvertor_40_50 {
if (src.getItem().hasReference())
tgt.setItem(convertType(src.getItem().getReference()));
if (src.hasIsActive())
- tgt.setIsActiveElement(convertBoolean(src.getIsActiveElement()));
+ tgt.setIsActive(src.getIsActive().hasCoding("http://terminology.hl7.org/CodeSystem/v3-RoleClass", "ACTI"));
if (src.hasStrengthRatio())
tgt.setStrength(convertRatio(src.getStrengthRatio()));
return tgt;
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement40_50.java
index 53289ed32..3b9995438 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicationStatement40_50.java
@@ -119,7 +119,7 @@ public class MedicationStatement40_50 extends VersionConvertor_40_50 {
VersionConvertor_40_50.copyElement(src, tgt);
switch(src.getValue()) {
case ACTIVE:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.ACTIVE);
+ tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.COMPLETED);
break;
case COMPLETED:
tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.COMPLETED);
@@ -128,19 +128,19 @@ public class MedicationStatement40_50 extends VersionConvertor_40_50 {
tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.ENTEREDINERROR);
break;
case INTENDED:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.INTENDED);
+ tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.UNKNOWN);
break;
case STOPPED:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.STOPPED);
+ tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.UNKNOWN);
break;
case ONHOLD:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.ONHOLD);
+ tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.UNKNOWN);
break;
case UNKNOWN:
tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.UNKNOWN);
break;
case NOTTAKEN:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.NOTTAKEN);
+ tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.COMPLETED);
break;
default:
tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.NULL);
@@ -155,30 +155,30 @@ public class MedicationStatement40_50 extends VersionConvertor_40_50 {
org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatusEnumFactory());
VersionConvertor_40_50.copyElement(src, tgt);
switch(src.getValue()) {
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.ACTIVE);
- break;
+// case ACTIVE:
+// tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.ACTIVE);
+// break;
case COMPLETED:
tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.COMPLETED);
break;
case ENTEREDINERROR:
tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.ENTEREDINERROR);
break;
- case INTENDED:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.INTENDED);
- break;
- case STOPPED:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.STOPPED);
- break;
- case ONHOLD:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.ONHOLD);
- break;
+// case UNKNOWN:
+// tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.INTENDED);
+// break;
+// case STOPPED:
+// tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.STOPPED);
+// break;
+// case ONHOLD:
+// tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.ONHOLD);
+// break;
case UNKNOWN:
tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.UNKNOWN);
break;
- case NOTTAKEN:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.NOTTAKEN);
- break;
+// case NOTTAKEN:
+// tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.NOTTAKEN);
+// break;
default:
tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.NULL);
break;
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicinalProductDefinition40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicinalProductDefinition40_50.java
deleted file mode 100644
index 70f84c3f0..000000000
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/MedicinalProductDefinition40_50.java
+++ /dev/null
@@ -1,344 +0,0 @@
-package org.hl7.fhir.convertors.conv40_50;
-
-
-import org.hl7.fhir.convertors.VersionConvertor_40_50;
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.r4.model.MarketingStatus;
-import org.hl7.fhir.r5.model.CodeableReference;
-
-/*
- Copyright (c) 2011+, HL7, Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of HL7 nor the names of its contributors may be used to
- endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-*/
-// Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0
-public class MedicinalProductDefinition40_50 extends VersionConvertor_40_50 {
-
- public static org.hl7.fhir.r5.model.MedicinalProductDefinition convertMedicinalProduct(org.hl7.fhir.r4.model.MedicinalProduct src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.MedicinalProductDefinition tgt = new org.hl7.fhir.r5.model.MedicinalProductDefinition();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
- if (src.hasDomain())
- tgt.getDomain().addCoding(convertCoding(src.getDomain()));
- // version (new)
- // status (new)
- // description (new)
- if (src.hasCombinedPharmaceuticalDoseForm())
- tgt.setCombinedPharmaceuticalDoseForm(convertCodeableConcept(src.getCombinedPharmaceuticalDoseForm()));
- // indication (new)
- if (src.hasLegalStatusOfSupply())
- tgt.setLegalStatusOfSupply(convertCodeableConcept(src.getLegalStatusOfSupply()));
- if (src.hasAdditionalMonitoringIndicator())
- tgt.setAdditionalMonitoringIndicator(convertCodeableConcept(src.getAdditionalMonitoringIndicator()));
- for (org.hl7.fhir.r4.model.StringType t : src.getSpecialMeasures()) {
- // specialMeasures string -> CodeableConcept
- org.hl7.fhir.r5.model.CodeableConcept c = new org.hl7.fhir.r5.model.CodeableConcept();
- tgt.addSpecialMeasures(c);
- c.setTextElement(convertString(t));
- }
- if (src.hasPaediatricUseIndicator())
- tgt.setPaediatricUseIndicator(convertCodeableConcept(src.getPaediatricUseIndicator()));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getProductClassification()) tgt.addClassification(convertCodeableConcept(t));
- for (org.hl7.fhir.r4.model.MarketingStatus t : src.getMarketingStatus()) tgt.addMarketingStatus(convertMarketingStatus(t));
- for (org.hl7.fhir.r4.model.Reference t : src.getPharmaceuticalProduct()) tgt.addPharmaceuticalProduct(convertReference(t));
- for (org.hl7.fhir.r4.model.Reference t : src.getPackagedMedicinalProduct()) tgt.addPackagedMedicinalProduct(convertReference(t));
- // ingredient (new)
- for (org.hl7.fhir.r4.model.Reference t : src.getAttachedDocument()) tgt.addAttachedDocument(convertReference(t));
- for (org.hl7.fhir.r4.model.Reference t : src.getMasterFile()) tgt.addMasterFile(convertReference(t));
- for (org.hl7.fhir.r4.model.Reference t : src.getContact()) {
- // contact (Reference -> complex
- org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionContactComponent c = new org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionContactComponent();
- tgt.addContact(c);
- c.setContact(convertReference(t));
- }
- for (org.hl7.fhir.r4.model.Reference t : src.getClinicalTrial()) tgt.addClinicalTrial(convertReference(t));
- for (org.hl7.fhir.r4.model.MedicinalProduct.MedicinalProductNameComponent srcName : src.getName()) {
- org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionNameComponent tgtName = new org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionNameComponent();
- copyElement(srcName, tgtName);
- tgt.addName(tgtName);
- tgtName.setProductNameElement(convertString(srcName.getProductNameElement()));
- //type (new)
- for (org.hl7.fhir.r4.model.MedicinalProduct.MedicinalProductNameNamePartComponent srcPart : srcName.getNamePart()) {
- org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionNameNamePartComponent tgtPart = new org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionNameNamePartComponent();
- copyElement(srcPart, tgtPart);
- tgtName.addNamePart(tgtPart);
- tgtPart.setPartElement(convertString(srcPart.getPartElement()));
- tgtPart.getType().addCoding(convertCoding(srcPart.getType()));
- }
- for (org.hl7.fhir.r4.model.MedicinalProduct.MedicinalProductNameCountryLanguageComponent srcLang : srcName.getCountryLanguage()) {
- org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionNameCountryLanguageComponent tgtLang = new org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionNameCountryLanguageComponent();
- copyElement(srcLang, tgtLang);
- tgtName.addCountryLanguage(tgtLang);
- tgtLang.setCountry(convertCodeableConcept(srcLang.getCountry()));
- tgtLang.setLanguage(convertCodeableConcept(srcLang.getLanguage()));
- }
- }
- for (org.hl7.fhir.r4.model.Identifier t : src.getCrossReference()) {
- // cross-reference Identifier -> complex - todo
-// org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionCrossReferenceComponent c = new org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionCrossReferenceComponent();
-// tgt.addCrossReference(c);
-// c.setProduct(convertIdentifier(t));
- }
- for (org.hl7.fhir.r4.model.MedicinalProduct.MedicinalProductManufacturingBusinessOperationComponent srcMBO : src.getManufacturingBusinessOperation()) {
- org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent tgtMBO = new org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent();
- copyElement(srcMBO, tgtMBO);
- tgt.addManufacturingBusinessOperation(tgtMBO);
- if (srcMBO.hasOperationType()) {
- tgtMBO.getType().setConcept(convertCodeableConcept(srcMBO.getOperationType()));
- // operationType -> type[x]
- }
- if (srcMBO.hasAuthorisationReferenceNumber())
- throw new FHIRException("Converting MedicinalProduct.ManufacturingBusinessOperation.authorizationReferenceNumber is not supported");
- if (srcMBO.hasEffectiveDate()) {
- // effectiveDate - dateTime -> Period
- org.hl7.fhir.r5.model.Period p = new org.hl7.fhir.r5.model.Period();
- tgtMBO.setEffectiveDate(p);
- p.setStartElement(convertDateTime(srcMBO.getEffectiveDateElement()));
- p.setEndElement(convertDateTime(srcMBO.getEffectiveDateElement()));
- }
- if (srcMBO.hasConfidentialityIndicator())
- tgtMBO.setConfidentialityIndicator(convertCodeableConcept(srcMBO.getConfidentialityIndicator()));
- for (org.hl7.fhir.r4.model.Reference t : srcMBO.getManufacturer()) tgtMBO.addManufacturer(convertReference(t));
- if (srcMBO.hasRegulator())
- throw new FHIRException("Converting MedicinalProduct.ManufacturingBusinessOperation.regulator is not supported");
- // added authorization
- }
- if (src.hasSpecialDesignation())
- throw new FHIRException("Converting MedicinalProduct.specialDesignation is not supported");
-
- return tgt;
- }
-// Todo convert references
-
- public static org.hl7.fhir.r4.model.MedicinalProduct convertMedicinalProductDefinition(org.hl7.fhir.r5.model.MedicinalProductDefinition src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.MedicinalProduct tgt = new org.hl7.fhir.r4.model.MedicinalProduct();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
- if (src.getDomain().hasCoding())
- tgt.setDomain(convertCoding(src.getDomain().getCodingFirstRep()));
- if (src.hasVersion())
- throw new FHIRException("Converting MedicinalProductDefinition.version is not supported");
- if (src.hasStatus())
- throw new FHIRException("Converting MedicinalProductDefinition.status is not supported");
- if (src.hasDescription())
- throw new FHIRException("Converting MedicinalProductDefinition.description is not supported");
- if (src.hasCombinedPharmaceuticalDoseForm())
- tgt.setCombinedPharmaceuticalDoseForm(convertCodeableConcept(src.getCombinedPharmaceuticalDoseForm()));
- if (src.hasIndication())
- throw new FHIRException("Converting MedicinalProductDefinition.indication is not supported");
- if (src.hasLegalStatusOfSupply())
- tgt.setLegalStatusOfSupply(convertCodeableConcept(src.getLegalStatusOfSupply()));
- if (src.hasAdditionalMonitoringIndicator())
- tgt.setAdditionalMonitoringIndicator(convertCodeableConcept(src.getAdditionalMonitoringIndicator()));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getSpecialMeasures()) {
- // specialMeasures CodeableConcept -> string
- if (t.hasText()) {
- org.hl7.fhir.r4.model.StringType s = tgt.addSpecialMeasuresElement();
- copyElement(t.getTextElement(), s);
- s.setValue(t.getText());
- }
- checkBase(t, "MedicinalProductDefinition.specialMeasures");
- if (t.hasCoding())
- throw new FHIRException("Converting MedicinalProductDefinition.specialMeasures.coding is not supported");
- }
- if (src.hasPaediatricUseIndicator())
- tgt.setPaediatricUseIndicator(convertCodeableConcept(src.getPaediatricUseIndicator()));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getClassification()) tgt.addProductClassification(convertCodeableConcept(t));
- for (org.hl7.fhir.r5.model.MarketingStatus t : src.getMarketingStatus()) tgt.addMarketingStatus(convertMarketingStatus(t));
- for (org.hl7.fhir.r5.model.Reference t : src.getPharmaceuticalProduct()) tgt.addPharmaceuticalProduct(convertReference(t));
- for (org.hl7.fhir.r5.model.Reference t : src.getPackagedMedicinalProduct()) tgt.addPackagedMedicinalProduct(convertReference(t));
- // ingredient (new)
- for (org.hl7.fhir.r5.model.Reference t : src.getAttachedDocument()) tgt.addAttachedDocument(convertReference(t));
- for (org.hl7.fhir.r5.model.Reference t : src.getMasterFile()) tgt.addMasterFile(convertReference(t));
- for (org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionContactComponent t : src.getContact()) {
- // contact complex -> reference
- if (t.hasContact()) {
- tgt.addContact(convertReference(t.getContact()));
- }
- checkBase(t, "MedicinalProductDefinition.contact");
- if (t.hasType())
- throw new FHIRException("Converting MedicinalProductDefinition.contact.type is not supported");
- }
- for (org.hl7.fhir.r5.model.Reference t : src.getClinicalTrial()) tgt.addClinicalTrial(convertReference(t));
- for (org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionNameComponent srcName : src.getName()) {
- org.hl7.fhir.r4.model.MedicinalProduct.MedicinalProductNameComponent tgtName = new org.hl7.fhir.r4.model.MedicinalProduct.MedicinalProductNameComponent();
- copyElement(srcName, tgtName);
- tgt.addName(tgtName);
- tgtName.setProductNameElement(convertString(srcName.getProductNameElement()));
- //type (new)
- for (org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionNameNamePartComponent srcPart : srcName.getNamePart()) {
- org.hl7.fhir.r4.model.MedicinalProduct.MedicinalProductNameNamePartComponent tgtPart = new org.hl7.fhir.r4.model.MedicinalProduct.MedicinalProductNameNamePartComponent();
- copyElement(srcPart, tgtPart);
- tgtName.addNamePart(tgtPart);
- tgtPart.setPartElement(convertString(srcPart.getPartElement()));
- if (srcPart.getType().hasCoding()) {
- tgtPart.setType(convertCoding(srcPart.getType().getCodingFirstRep()));
- }
- }
- for (org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionNameCountryLanguageComponent srcLang : srcName.getCountryLanguage()) {
- org.hl7.fhir.r4.model.MedicinalProduct.MedicinalProductNameCountryLanguageComponent tgtLang = new org.hl7.fhir.r4.model.MedicinalProduct.MedicinalProductNameCountryLanguageComponent();
- copyElement(srcLang, tgtLang);
- tgtName.addCountryLanguage(tgtLang);
- tgtLang.setCountry(convertCodeableConcept(srcLang.getCountry()));
- tgtLang.setLanguage(convertCodeableConcept(srcLang.getLanguage()));
- }
- }
- for (org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionCrossReferenceComponent t : src.getCrossReference()) {
- // cross-reference complex -> Identifier - todo
-// if (t.hasProduct()) {
-// if (t.getProduct() instanceof org.hl7.fhir.r5.model.Identifier)
-// tgt.addCrossReference(convertIdentifier((org.hl7.fhir.r5.model.Identifier)t.getProduct()));
-// else
-// throw new FHIRException("Converting MedicinalProductDefinition.crossReference.productReference is not supported");
-// }
- checkBase(t, "MedicinalProductDefinition.crossReference");
- if (t.hasType())
- throw new FHIRException("Converting MedicinalProductDefinition.crossReference.type is not supported");
- }
- for (org.hl7.fhir.r5.model.MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent srcMBO : src.getManufacturingBusinessOperation()) {
- org.hl7.fhir.r4.model.MedicinalProduct.MedicinalProductManufacturingBusinessOperationComponent tgtMBO = new org.hl7.fhir.r4.model.MedicinalProduct.MedicinalProductManufacturingBusinessOperationComponent();
- copyElement(srcMBO, tgtMBO);
- tgt.addManufacturingBusinessOperation(tgtMBO);
- if (srcMBO.hasType()) {
- // type[x] -> operationType
- if (srcMBO.getType().hasConcept())
- tgtMBO.setOperationType(convertCodeableConcept(srcMBO.getType().getConcept()));
- else
- throw new FHIRException("Converting MedicinalProductDefinition.manufacturingBusinessOperation.typeReference is not supported");
- }
- // added authorisationReferenceNumber
- if (srcMBO.hasEffectiveDate()) {
- // effectiveDate - Period -> dateTime
- org.hl7.fhir.r5.model.Period d = srcMBO.getEffectiveDate();
- checkBase(srcMBO, "MedicinalProductDefinition.manufacturingBusinessOperation.effectiveDate");
- if (d.hasStart() || d.hasEnd()) {
- if (d.hasStart() != d.hasEnd() || !d.getStart().equals(d.getEnd()))
- throw new FHIRException("Converting MedicinalProductDefinition.manufacturingBusinessOperation.effectiveDate is not supported when start is not identical to end");
- else
- tgtMBO.setEffectiveDateElement(convertDateTime(d.getStartElement()));
- }
- }
- if (srcMBO.hasAuthorization())
- throw new FHIRException("Converting MedicinalProductDefinition.manufacturingBusinessOperation.authorization is not supported");
- if (srcMBO.hasConfidentialityIndicator())
- tgtMBO.setConfidentialityIndicator(convertCodeableConcept(srcMBO.getConfidentialityIndicator()));
- for (org.hl7.fhir.r5.model.Reference t : srcMBO.getManufacturer()) tgtMBO.addManufacturer(convertReference(t));
- // Added regulator
- // added authorization
- }
- // added specialDesignation
- return tgt;
- }
-
- static public void checkBase(org.hl7.fhir.r5.model.Element e, String path) throws FHIRException {
- if (e.hasId())
- throw new FHIRException ("Converting " + path + ".id is not supported");
- if (e.hasExtension())
- throw new FHIRException ("Converting " + path + ".extension is not supported");
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertMedicationStatementStatus(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodesEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.ACTIVE);
- break;
- case COMPLETED:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.COMPLETED);
- break;
- case ENTEREDINERROR:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.ENTEREDINERROR);
- break;
- case INTENDED:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.INTENDED);
- break;
- case STOPPED:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.STOPPED);
- break;
- case ONHOLD:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.ONHOLD);
- break;
- case UNKNOWN:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.UNKNOWN);
- break;
- case NOTTAKEN:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.NOTTAKEN);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.MedicationUsage.MedicationUsageStatusCodes.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertMedicationStatementStatus(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatusEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.ACTIVE);
- break;
- case COMPLETED:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.COMPLETED);
- break;
- case ENTEREDINERROR:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.ENTEREDINERROR);
- break;
- case INTENDED:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.INTENDED);
- break;
- case STOPPED:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.STOPPED);
- break;
- case ONHOLD:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.ONHOLD);
- break;
- case UNKNOWN:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.UNKNOWN);
- break;
- case NOTTAKEN:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.NOTTAKEN);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.MedicationStatement.MedicationStatementStatus.NULL);
- break;
- }
- return tgt;
- }
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ObservationDefinition40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ObservationDefinition40_50.java
index 318430872..455e43472 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ObservationDefinition40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ObservationDefinition40_50.java
@@ -57,15 +57,15 @@ public class ObservationDefinition40_50 extends VersionConvertor_40_50 {
tgt.setPreferredReportNameElement(convertString(src.getPreferredReportNameElement()));
if (src.hasQuantitativeDetails())
tgt.setQuantitativeDetails(convertObservationDefinitionQuantitativeDetailsComponent(src.getQuantitativeDetails()));
- for (org.hl7.fhir.r4.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent t : src.getQualifiedInterval()) tgt.addQualifiedInterval(convertObservationDefinitionQualifiedIntervalComponent(t));
- if (src.hasValidCodedValueSet())
- tgt.setValidCodedValueSet(convertReference(src.getValidCodedValueSet()));
- if (src.hasNormalCodedValueSet())
- tgt.setNormalCodedValueSet(convertReference(src.getNormalCodedValueSet()));
- if (src.hasAbnormalCodedValueSet())
- tgt.setAbnormalCodedValueSet(convertReference(src.getAbnormalCodedValueSet()));
- if (src.hasCriticalCodedValueSet())
- tgt.setCriticalCodedValueSet(convertReference(src.getCriticalCodedValueSet()));
+// for (org.hl7.fhir.r4.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent t : src.getQualifiedInterval()) tgt.addQualifiedInterval(convertObservationDefinitionQualifiedIntervalComponent(t));
+// if (src.hasValidCodedValueSet())
+// tgt.setValidCodedValueSet(convertReference(src.getValidCodedValueSet()));
+// if (src.hasNormalCodedValueSet())
+// tgt.setNormalCodedValueSet(convertReference(src.getNormalCodedValueSet()));
+// if (src.hasAbnormalCodedValueSet())
+// tgt.setAbnormalCodedValueSet(convertReference(src.getAbnormalCodedValueSet()));
+// if (src.hasCriticalCodedValueSet())
+// tgt.setCriticalCodedValueSet(convertReference(src.getCriticalCodedValueSet()));
return tgt;
}
@@ -90,15 +90,15 @@ public class ObservationDefinition40_50 extends VersionConvertor_40_50 {
tgt.setPreferredReportNameElement(convertString(src.getPreferredReportNameElement()));
if (src.hasQuantitativeDetails())
tgt.setQuantitativeDetails(convertObservationDefinitionQuantitativeDetailsComponent(src.getQuantitativeDetails()));
- for (org.hl7.fhir.r5.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent t : src.getQualifiedInterval()) tgt.addQualifiedInterval(convertObservationDefinitionQualifiedIntervalComponent(t));
- if (src.hasValidCodedValueSet())
- tgt.setValidCodedValueSet(convertReference(src.getValidCodedValueSet()));
- if (src.hasNormalCodedValueSet())
- tgt.setNormalCodedValueSet(convertReference(src.getNormalCodedValueSet()));
- if (src.hasAbnormalCodedValueSet())
- tgt.setAbnormalCodedValueSet(convertReference(src.getAbnormalCodedValueSet()));
- if (src.hasCriticalCodedValueSet())
- tgt.setCriticalCodedValueSet(convertReference(src.getCriticalCodedValueSet()));
+// for (org.hl7.fhir.r5.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent t : src.getQualifiedInterval()) tgt.addQualifiedInterval(convertObservationDefinitionQualifiedIntervalComponent(t));
+// if (src.hasValidCodedValueSet())
+// tgt.setValidCodedValueSet(convertReference(src.getValidCodedValueSet()));
+// if (src.hasNormalCodedValueSet())
+// tgt.setNormalCodedValueSet(convertReference(src.getNormalCodedValueSet()));
+// if (src.hasAbnormalCodedValueSet())
+// tgt.setAbnormalCodedValueSet(convertReference(src.getAbnormalCodedValueSet()));
+// if (src.hasCriticalCodedValueSet())
+// tgt.setCriticalCodedValueSet(convertReference(src.getCriticalCodedValueSet()));
return tgt;
}
@@ -226,51 +226,51 @@ public class ObservationDefinition40_50 extends VersionConvertor_40_50 {
return tgt;
}
- public static org.hl7.fhir.r5.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent convertObservationDefinitionQualifiedIntervalComponent(org.hl7.fhir.r4.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent tgt = new org.hl7.fhir.r5.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent();
- copyElement(src, tgt);
- if (src.hasCategory())
- tgt.setCategoryElement(convertObservationRangeCategory(src.getCategoryElement()));
- if (src.hasRange())
- tgt.setRange(convertRange(src.getRange()));
- if (src.hasContext())
- tgt.setContext(convertCodeableConcept(src.getContext()));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getAppliesTo()) tgt.addAppliesTo(convertCodeableConcept(t));
- if (src.hasGender())
- tgt.setGenderElement(Enumerations40_50.convertAdministrativeGender(src.getGenderElement()));
- if (src.hasAge())
- tgt.setAge(convertRange(src.getAge()));
- if (src.hasGestationalAge())
- tgt.setGestationalAge(convertRange(src.getGestationalAge()));
- if (src.hasCondition())
- tgt.setConditionElement(convertString(src.getConditionElement()));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent convertObservationDefinitionQualifiedIntervalComponent(org.hl7.fhir.r5.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent tgt = new org.hl7.fhir.r4.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent();
- copyElement(src, tgt);
- if (src.hasCategory())
- tgt.setCategoryElement(convertObservationRangeCategory(src.getCategoryElement()));
- if (src.hasRange())
- tgt.setRange(convertRange(src.getRange()));
- if (src.hasContext())
- tgt.setContext(convertCodeableConcept(src.getContext()));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getAppliesTo()) tgt.addAppliesTo(convertCodeableConcept(t));
- if (src.hasGender())
- tgt.setGenderElement(Enumerations40_50.convertAdministrativeGender(src.getGenderElement()));
- if (src.hasAge())
- tgt.setAge(convertRange(src.getAge()));
- if (src.hasGestationalAge())
- tgt.setGestationalAge(convertRange(src.getGestationalAge()));
- if (src.hasCondition())
- tgt.setConditionElement(convertString(src.getConditionElement()));
- return tgt;
- }
+// public static org.hl7.fhir.r5.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent convertObservationDefinitionQualifiedIntervalComponent(org.hl7.fhir.r4.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent src) throws FHIRException {
+// if (src == null)
+// return null;
+// org.hl7.fhir.r5.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent tgt = new org.hl7.fhir.r5.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent();
+// copyElement(src, tgt);
+// if (src.hasCategory())
+// tgt.setCategoryElement(convertObservationRangeCategory(src.getCategoryElement()));
+// if (src.hasRange())
+// tgt.setRange(convertRange(src.getRange()));
+// if (src.hasContext())
+// tgt.setContext(convertCodeableConcept(src.getContext()));
+// for (org.hl7.fhir.r4.model.CodeableConcept t : src.getAppliesTo()) tgt.addAppliesTo(convertCodeableConcept(t));
+// if (src.hasGender())
+// tgt.setGenderElement(Enumerations40_50.convertAdministrativeGender(src.getGenderElement()));
+// if (src.hasAge())
+// tgt.setAge(convertRange(src.getAge()));
+// if (src.hasGestationalAge())
+// tgt.setGestationalAge(convertRange(src.getGestationalAge()));
+// if (src.hasCondition())
+// tgt.setConditionElement(convertString(src.getConditionElement()));
+// return tgt;
+// }
+//
+// public static org.hl7.fhir.r4.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent convertObservationDefinitionQualifiedIntervalComponent(org.hl7.fhir.r5.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent src) throws FHIRException {
+// if (src == null)
+// return null;
+// org.hl7.fhir.r4.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent tgt = new org.hl7.fhir.r4.model.ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent();
+// copyElement(src, tgt);
+// if (src.hasCategory())
+// tgt.setCategoryElement(convertObservationRangeCategory(src.getCategoryElement()));
+// if (src.hasRange())
+// tgt.setRange(convertRange(src.getRange()));
+// if (src.hasContext())
+// tgt.setContext(convertCodeableConcept(src.getContext()));
+// for (org.hl7.fhir.r5.model.CodeableConcept t : src.getAppliesTo()) tgt.addAppliesTo(convertCodeableConcept(t));
+// if (src.hasGender())
+// tgt.setGenderElement(Enumerations40_50.convertAdministrativeGender(src.getGenderElement()));
+// if (src.hasAge())
+// tgt.setAge(convertRange(src.getAge()));
+// if (src.hasGestationalAge())
+// tgt.setGestationalAge(convertRange(src.getGestationalAge()));
+// if (src.hasCondition())
+// tgt.setConditionElement(convertString(src.getConditionElement()));
+// return tgt;
+// }
static public org.hl7.fhir.r5.model.Enumeration convertObservationRangeCategory(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
if (src == null || src.isEmpty())
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentReconciliation40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentReconciliation40_50.java
deleted file mode 100644
index 3e832f368..000000000
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PaymentReconciliation40_50.java
+++ /dev/null
@@ -1,287 +0,0 @@
-package org.hl7.fhir.convertors.conv40_50;
-
-
-import org.hl7.fhir.convertors.VersionConvertor_40_50;
-import org.hl7.fhir.exceptions.FHIRException;
-
-/*
- Copyright (c) 2011+, HL7, Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of HL7 nor the names of its contributors may be used to
- endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-*/
-// Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0
-public class PaymentReconciliation40_50 extends VersionConvertor_40_50 {
-
- public static org.hl7.fhir.r5.model.PaymentReconciliation convertPaymentReconciliation(org.hl7.fhir.r4.model.PaymentReconciliation src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.PaymentReconciliation tgt = new org.hl7.fhir.r5.model.PaymentReconciliation();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- if (src.hasStatus())
- tgt.setStatusElement(convertPaymentReconciliationStatus(src.getStatusElement()));
- if (src.hasPeriod())
- tgt.setPeriod(convertPeriod(src.getPeriod()));
- if (src.hasCreated())
- tgt.setCreatedElement(convertDateTime(src.getCreatedElement()));
- if (src.hasPaymentIssuer())
- tgt.setPaymentIssuer(convertReference(src.getPaymentIssuer()));
- if (src.hasRequest())
- tgt.setRequest(convertReference(src.getRequest()));
- if (src.hasRequestor())
- tgt.setRequestor(convertReference(src.getRequestor()));
- if (src.hasOutcome())
- tgt.setOutcomeElement(convertRemittanceOutcome(src.getOutcomeElement()));
- if (src.hasDisposition())
- tgt.setDispositionElement(convertString(src.getDispositionElement()));
- if (src.hasPaymentDate())
- tgt.setPaymentDateElement(convertDate(src.getPaymentDateElement()));
- if (src.hasPaymentAmount())
- tgt.setPaymentAmount(convertMoney(src.getPaymentAmount()));
- if (src.hasPaymentIdentifier())
- tgt.setPaymentIdentifier(convertIdentifier(src.getPaymentIdentifier()));
- for (org.hl7.fhir.r4.model.PaymentReconciliation.DetailsComponent t : src.getDetail()) tgt.addDetail(convertDetailsComponent(t));
- if (src.hasFormCode())
- tgt.setFormCode(convertCodeableConcept(src.getFormCode()));
- for (org.hl7.fhir.r4.model.PaymentReconciliation.NotesComponent t : src.getProcessNote()) tgt.addProcessNote(convertNotesComponent(t));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.PaymentReconciliation convertPaymentReconciliation(org.hl7.fhir.r5.model.PaymentReconciliation src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.PaymentReconciliation tgt = new org.hl7.fhir.r4.model.PaymentReconciliation();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- if (src.hasStatus())
- tgt.setStatusElement(convertPaymentReconciliationStatus(src.getStatusElement()));
- if (src.hasPeriod())
- tgt.setPeriod(convertPeriod(src.getPeriod()));
- if (src.hasCreated())
- tgt.setCreatedElement(convertDateTime(src.getCreatedElement()));
- if (src.hasPaymentIssuer())
- tgt.setPaymentIssuer(convertReference(src.getPaymentIssuer()));
- if (src.hasRequest())
- tgt.setRequest(convertReference(src.getRequest()));
- if (src.hasRequestor())
- tgt.setRequestor(convertReference(src.getRequestor()));
- if (src.hasOutcome())
- tgt.setOutcomeElement(convertRemittanceOutcome(src.getOutcomeElement()));
- if (src.hasDisposition())
- tgt.setDispositionElement(convertString(src.getDispositionElement()));
- if (src.hasPaymentDate())
- tgt.setPaymentDateElement(convertDate(src.getPaymentDateElement()));
- if (src.hasPaymentAmount())
- tgt.setPaymentAmount(convertMoney(src.getPaymentAmount()));
- if (src.hasPaymentIdentifier())
- tgt.setPaymentIdentifier(convertIdentifier(src.getPaymentIdentifier()));
- for (org.hl7.fhir.r5.model.PaymentReconciliation.DetailsComponent t : src.getDetail()) tgt.addDetail(convertDetailsComponent(t));
- if (src.hasFormCode())
- tgt.setFormCode(convertCodeableConcept(src.getFormCode()));
- for (org.hl7.fhir.r5.model.PaymentReconciliation.NotesComponent t : src.getProcessNote()) tgt.addProcessNote(convertNotesComponent(t));
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertPaymentReconciliationStatus(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodesEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.ACTIVE);
- break;
- case CANCELLED:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.CANCELLED);
- break;
- case DRAFT:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.DRAFT);
- break;
- case ENTEREDINERROR:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.ENTEREDINERROR);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FinancialResourceStatusCodes.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertPaymentReconciliationStatus(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.PaymentReconciliation.PaymentReconciliationStatusEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.r4.model.PaymentReconciliation.PaymentReconciliationStatus.ACTIVE);
- break;
- case CANCELLED:
- tgt.setValue(org.hl7.fhir.r4.model.PaymentReconciliation.PaymentReconciliationStatus.CANCELLED);
- break;
- case DRAFT:
- tgt.setValue(org.hl7.fhir.r4.model.PaymentReconciliation.PaymentReconciliationStatus.DRAFT);
- break;
- case ENTEREDINERROR:
- tgt.setValue(org.hl7.fhir.r4.model.PaymentReconciliation.PaymentReconciliationStatus.ENTEREDINERROR);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.PaymentReconciliation.PaymentReconciliationStatus.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertRemittanceOutcome(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodesEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case QUEUED:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.QUEUED);
- break;
- case COMPLETE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.COMPLETE);
- break;
- case ERROR:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.ERROR);
- break;
- case PARTIAL:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.PARTIAL);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ClaimProcessingCodes.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertRemittanceOutcome(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.Enumerations.RemittanceOutcomeEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case QUEUED:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.QUEUED);
- break;
- case COMPLETE:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.COMPLETE);
- break;
- case ERROR:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.ERROR);
- break;
- case PARTIAL:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.PARTIAL);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.Enumerations.RemittanceOutcome.NULL);
- break;
- }
- return tgt;
- }
-
- public static org.hl7.fhir.r5.model.PaymentReconciliation.DetailsComponent convertDetailsComponent(org.hl7.fhir.r4.model.PaymentReconciliation.DetailsComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.PaymentReconciliation.DetailsComponent tgt = new org.hl7.fhir.r5.model.PaymentReconciliation.DetailsComponent();
- copyElement(src, tgt);
- if (src.hasIdentifier())
- tgt.setIdentifier(convertIdentifier(src.getIdentifier()));
- if (src.hasPredecessor())
- tgt.setPredecessor(convertIdentifier(src.getPredecessor()));
- if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
- if (src.hasRequest())
- tgt.setRequest(convertReference(src.getRequest()));
- if (src.hasSubmitter())
- tgt.setSubmitter(convertReference(src.getSubmitter()));
- if (src.hasResponse())
- tgt.setResponse(convertReference(src.getResponse()));
- if (src.hasDate())
- tgt.setDateElement(convertDate(src.getDateElement()));
- if (src.hasResponsible())
- tgt.setResponsible(convertReference(src.getResponsible()));
- if (src.hasPayee())
- tgt.setPayee(convertReference(src.getPayee()));
- if (src.hasAmount())
- tgt.setAmount(convertMoney(src.getAmount()));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.PaymentReconciliation.DetailsComponent convertDetailsComponent(org.hl7.fhir.r5.model.PaymentReconciliation.DetailsComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.PaymentReconciliation.DetailsComponent tgt = new org.hl7.fhir.r4.model.PaymentReconciliation.DetailsComponent();
- copyElement(src, tgt);
- if (src.hasIdentifier())
- tgt.setIdentifier(convertIdentifier(src.getIdentifier()));
- if (src.hasPredecessor())
- tgt.setPredecessor(convertIdentifier(src.getPredecessor()));
- if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
- if (src.hasRequest())
- tgt.setRequest(convertReference(src.getRequest()));
- if (src.hasSubmitter())
- tgt.setSubmitter(convertReference(src.getSubmitter()));
- if (src.hasResponse())
- tgt.setResponse(convertReference(src.getResponse()));
- if (src.hasDate())
- tgt.setDateElement(convertDate(src.getDateElement()));
- if (src.hasResponsible())
- tgt.setResponsible(convertReference(src.getResponsible()));
- if (src.hasPayee())
- tgt.setPayee(convertReference(src.getPayee()));
- if (src.hasAmount())
- tgt.setAmount(convertMoney(src.getAmount()));
- return tgt;
- }
-
- public static org.hl7.fhir.r5.model.PaymentReconciliation.NotesComponent convertNotesComponent(org.hl7.fhir.r4.model.PaymentReconciliation.NotesComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.PaymentReconciliation.NotesComponent tgt = new org.hl7.fhir.r5.model.PaymentReconciliation.NotesComponent();
- copyElement(src, tgt);
- if (src.hasType())
- tgt.setTypeElement(Enumerations40_50.convertNoteType(src.getTypeElement()));
- if (src.hasText())
- tgt.setTextElement(convertString(src.getTextElement()));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.PaymentReconciliation.NotesComponent convertNotesComponent(org.hl7.fhir.r5.model.PaymentReconciliation.NotesComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.PaymentReconciliation.NotesComponent tgt = new org.hl7.fhir.r4.model.PaymentReconciliation.NotesComponent();
- copyElement(src, tgt);
- if (src.hasType())
- tgt.setTypeElement(Enumerations40_50.convertNoteType(src.getTypeElement()));
- if (src.hasText())
- tgt.setTextElement(convertString(src.getTextElement()));
- return tgt;
- }
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PlanDefinition40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PlanDefinition40_50.java
index 784ec7123..f187d45a9 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PlanDefinition40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/PlanDefinition40_50.java
@@ -3,6 +3,9 @@ package org.hl7.fhir.convertors.conv40_50;
import org.hl7.fhir.convertors.VersionConvertor_40_50;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.DataRequirement;
+import org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionInputComponent;
+import org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionOutputComponent;
/*
Copyright (c) 2011+, HL7, Inc.
@@ -230,7 +233,7 @@ public class PlanDefinition40_50 extends VersionConvertor_40_50 {
tgt.setTextEquivalentElement(convertString(src.getTextEquivalentElement()));
if (src.hasPriority())
tgt.setPriorityElement(convertRequestPriority(src.getPriorityElement()));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getCode()) tgt.addCode(convertCodeableConcept(t));
+ for (org.hl7.fhir.r4.model.CodeableConcept t : src.getCode()) tgt.setCode(convertCodeableConcept(t));
for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReason()) tgt.addReason(convertCodeableConcept(t));
for (org.hl7.fhir.r4.model.RelatedArtifact t : src.getDocumentation()) tgt.addDocumentation(convertRelatedArtifact(t));
for (org.hl7.fhir.r4.model.IdType t : src.getGoalId()) tgt.getGoalId().add(convertId(t));
@@ -238,8 +241,8 @@ public class PlanDefinition40_50 extends VersionConvertor_40_50 {
tgt.setSubject(convertType(src.getSubject()));
for (org.hl7.fhir.r4.model.TriggerDefinition t : src.getTrigger()) tgt.addTrigger(convertTriggerDefinition(t));
for (org.hl7.fhir.r4.model.PlanDefinition.PlanDefinitionActionConditionComponent t : src.getCondition()) tgt.addCondition(convertPlanDefinitionActionConditionComponent(t));
- for (org.hl7.fhir.r4.model.DataRequirement t : src.getInput()) tgt.addInput(convertDataRequirement(t));
- for (org.hl7.fhir.r4.model.DataRequirement t : src.getOutput()) tgt.addOutput(convertDataRequirement(t));
+ for (org.hl7.fhir.r4.model.DataRequirement t : src.getInput()) tgt.addInput(wrapInput(convertDataRequirement(t)));
+ for (org.hl7.fhir.r4.model.DataRequirement t : src.getOutput()) tgt.addOutput(wrapOutput(convertDataRequirement(t)));
for (org.hl7.fhir.r4.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent t : src.getRelatedAction()) tgt.addRelatedAction(convertPlanDefinitionActionRelatedActionComponent(t));
if (src.hasTiming())
tgt.setTiming(convertType(src.getTiming()));
@@ -265,6 +268,14 @@ public class PlanDefinition40_50 extends VersionConvertor_40_50 {
return tgt;
}
+ private static PlanDefinitionActionOutputComponent wrapOutput(DataRequirement dr) {
+ return new PlanDefinitionActionOutputComponent().setRequirement(dr);
+ }
+
+ private static PlanDefinitionActionInputComponent wrapInput(DataRequirement dr) {
+ return new PlanDefinitionActionInputComponent().setRequirement(dr);
+ }
+
public static org.hl7.fhir.r4.model.PlanDefinition.PlanDefinitionActionComponent convertPlanDefinitionActionComponent(org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionComponent src) throws FHIRException {
if (src == null)
return null;
@@ -280,7 +291,7 @@ public class PlanDefinition40_50 extends VersionConvertor_40_50 {
tgt.setTextEquivalentElement(convertString(src.getTextEquivalentElement()));
if (src.hasPriority())
tgt.setPriorityElement(convertRequestPriority(src.getPriorityElement()));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getCode()) tgt.addCode(convertCodeableConcept(t));
+ if (src.hasCode()) tgt.addCode(convertCodeableConcept(src.getCode()));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getReason()) tgt.addReason(convertCodeableConcept(t));
for (org.hl7.fhir.r5.model.RelatedArtifact t : src.getDocumentation()) tgt.addDocumentation(convertRelatedArtifact(t));
for (org.hl7.fhir.r5.model.IdType t : src.getGoalId()) tgt.getGoalId().add(convertId(t));
@@ -288,8 +299,8 @@ public class PlanDefinition40_50 extends VersionConvertor_40_50 {
tgt.setSubject(convertType(src.getSubject()));
for (org.hl7.fhir.r5.model.TriggerDefinition t : src.getTrigger()) tgt.addTrigger(convertTriggerDefinition(t));
for (org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionConditionComponent t : src.getCondition()) tgt.addCondition(convertPlanDefinitionActionConditionComponent(t));
- for (org.hl7.fhir.r5.model.DataRequirement t : src.getInput()) tgt.addInput(convertDataRequirement(t));
- for (org.hl7.fhir.r5.model.DataRequirement t : src.getOutput()) tgt.addOutput(convertDataRequirement(t));
+ for (PlanDefinitionActionInputComponent t : src.getInput()) tgt.addInput(convertDataRequirement(t.getRequirement()));
+ for (PlanDefinitionActionOutputComponent t : src.getOutput()) tgt.addOutput(convertDataRequirement(t.getRequirement()));
for (org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent t : src.getRelatedAction()) tgt.addRelatedAction(convertPlanDefinitionActionRelatedActionComponent(t));
if (src.hasTiming())
tgt.setTiming(convertType(src.getTiming()));
@@ -665,7 +676,7 @@ public class PlanDefinition40_50 extends VersionConvertor_40_50 {
org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent tgt = new org.hl7.fhir.r5.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent();
copyElement(src, tgt);
if (src.hasActionId())
- tgt.setActionIdElement(convertId(src.getActionIdElement()));
+ tgt.setTargetIdElement(convertId(src.getActionIdElement()));
if (src.hasRelationship())
tgt.setRelationshipElement(convertActionRelationshipType(src.getRelationshipElement()));
if (src.hasOffset())
@@ -678,8 +689,8 @@ public class PlanDefinition40_50 extends VersionConvertor_40_50 {
return null;
org.hl7.fhir.r4.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent tgt = new org.hl7.fhir.r4.model.PlanDefinition.PlanDefinitionActionRelatedActionComponent();
copyElement(src, tgt);
- if (src.hasActionId())
- tgt.setActionIdElement(convertId(src.getActionIdElement()));
+ if (src.hasTargetId())
+ tgt.setActionIdElement(convertId(src.getTargetIdElement()));
if (src.hasRelationship())
tgt.setRelationshipElement(convertActionRelationshipType(src.getRelationshipElement()));
if (src.hasOffset())
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Questionnaire40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Questionnaire40_50.java
index 24f9afac1..30478c744 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Questionnaire40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Questionnaire40_50.java
@@ -3,7 +3,9 @@ package org.hl7.fhir.convertors.conv40_50;
import org.hl7.fhir.convertors.VersionConvertor_40_50;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType;
import org.hl7.fhir.r5.model.CodeType;
+import org.hl7.fhir.r5.model.Questionnaire.QuestionnaireAnswerConstraint;
/*
Copyright (c) 2011+, HL7, Inc.
@@ -137,9 +139,15 @@ public class Questionnaire40_50 extends VersionConvertor_40_50 {
if (src.hasPrefix())
tgt.setPrefixElement(convertString(src.getPrefixElement()));
if (src.hasText())
- tgt.setTextElement(convertString(src.getTextElement()));
- if (src.hasType())
+ tgt.setTextElement(convertStringToMarkdown(src.getTextElement()));
+ if (src.hasType()) {
tgt.setTypeElement(convertQuestionnaireItemType(src.getTypeElement()));
+ if (src.getType() == QuestionnaireItemType.CHOICE) {
+ tgt.setAnswerConstraint(QuestionnaireAnswerConstraint.OPTIONSONLY);
+ } else if (src.getType() == QuestionnaireItemType.OPENCHOICE) {
+ tgt.setAnswerConstraint(QuestionnaireAnswerConstraint.OPTIONSORSTRING);
+ }
+ }
for (org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemEnableWhenComponent t : src.getEnableWhen()) tgt.addEnableWhen(convertQuestionnaireItemEnableWhenComponent(t));
if (src.hasEnableBehavior())
tgt.setEnableBehaviorElement(convertEnableWhenBehavior(src.getEnableBehaviorElement()));
@@ -174,7 +182,7 @@ public class Questionnaire40_50 extends VersionConvertor_40_50 {
if (src.hasText())
tgt.setTextElement(convertString(src.getTextElement()));
if (src.hasType())
- tgt.setTypeElement(convertQuestionnaireItemType(src.getTypeElement()));
+ tgt.setTypeElement(convertQuestionnaireItemType(src.getTypeElement(), src.getAnswerConstraint()));
for (org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemEnableWhenComponent t : src.getEnableWhen()) tgt.addEnableWhen(convertQuestionnaireItemEnableWhenComponent(t));
if (src.hasEnableBehavior())
tgt.setEnableBehaviorElement(convertEnableWhenBehavior(src.getEnableBehaviorElement()));
@@ -237,10 +245,10 @@ public class Questionnaire40_50 extends VersionConvertor_40_50 {
tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.URL);
break;
case CHOICE:
- tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.CHOICE);
+ tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.CODING);
break;
case OPENCHOICE:
- tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.OPENCHOICE);
+ tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.CODING);
break;
case ATTACHMENT:
tgt.setValue(org.hl7.fhir.r5.model.Questionnaire.QuestionnaireItemType.ATTACHMENT);
@@ -258,7 +266,7 @@ public class Questionnaire40_50 extends VersionConvertor_40_50 {
return tgt;
}
- static public org.hl7.fhir.r4.model.Enumeration convertQuestionnaireItemType(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
+ static public org.hl7.fhir.r4.model.Enumeration convertQuestionnaireItemType(org.hl7.fhir.r5.model.Enumeration src, QuestionnaireAnswerConstraint constraint) throws FHIRException {
if (src == null || src.isEmpty())
return null;
org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemTypeEnumFactory());
@@ -298,12 +306,12 @@ public class Questionnaire40_50 extends VersionConvertor_40_50 {
case URL:
tgt.setValue(org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType.URL);
break;
- case CHOICE:
- tgt.setValue(org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType.CHOICE);
- break;
- case OPENCHOICE:
+ case CODING:
+ if (constraint == QuestionnaireAnswerConstraint.OPTIONSORSTRING)
tgt.setValue(org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType.OPENCHOICE);
- break;
+ else
+ tgt.setValue(org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType.CHOICE);
+ break;
case ATTACHMENT:
tgt.setValue(org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType.ATTACHMENT);
break;
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RequestGroup40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RequestGroup40_50.java
deleted file mode 100644
index 9ebd3f6b2..000000000
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/RequestGroup40_50.java
+++ /dev/null
@@ -1,790 +0,0 @@
-package org.hl7.fhir.convertors.conv40_50;
-
-
-import org.hl7.fhir.convertors.VersionConvertor_40_50;
-import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.r5.model.CodeableReference;
-
-/*
- Copyright (c) 2011+, HL7, Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of HL7 nor the names of its contributors may be used to
- endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-*/
-// Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0
-public class RequestGroup40_50 extends VersionConvertor_40_50 {
-
- public static org.hl7.fhir.r5.model.RequestGroup convertRequestGroup(org.hl7.fhir.r4.model.RequestGroup src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.RequestGroup tgt = new org.hl7.fhir.r5.model.RequestGroup();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- for (org.hl7.fhir.r4.model.CanonicalType t : src.getInstantiatesCanonical()) tgt.getInstantiatesCanonical().add(convertCanonical(t));
- for (org.hl7.fhir.r4.model.UriType t : src.getInstantiatesUri()) tgt.getInstantiatesUri().add(convertUri(t));
- for (org.hl7.fhir.r4.model.Reference t : src.getBasedOn()) tgt.addBasedOn(convertReference(t));
- for (org.hl7.fhir.r4.model.Reference t : src.getReplaces()) tgt.addReplaces(convertReference(t));
- if (src.hasGroupIdentifier())
- tgt.setGroupIdentifier(convertIdentifier(src.getGroupIdentifier()));
- if (src.hasStatus())
- tgt.setStatusElement(convertRequestStatus(src.getStatusElement()));
- if (src.hasIntent())
- tgt.setIntentElement(convertRequestIntent(src.getIntentElement()));
- if (src.hasPriority())
- tgt.setPriorityElement(convertRequestPriority(src.getPriorityElement()));
- if (src.hasCode())
- tgt.setCode(convertCodeableConcept(src.getCode()));
- if (src.hasSubject())
- tgt.setSubject(convertReference(src.getSubject()));
- if (src.hasEncounter())
- tgt.setEncounter(convertReference(src.getEncounter()));
- if (src.hasAuthoredOn())
- tgt.setAuthoredOnElement(convertDateTime(src.getAuthoredOnElement()));
- if (src.hasAuthor())
- tgt.setAuthor(convertReference(src.getAuthor()));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getReasonCode()) tgt.addReason(convertCodeableConceptToCodeableReference(t));
- for (org.hl7.fhir.r4.model.Reference t : src.getReasonReference()) tgt.addReason(convertReferenceToCodeableReference(t));
- for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t));
- for (org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionComponent t : src.getAction()) tgt.addAction(convertRequestGroupActionComponent(t));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.RequestGroup convertRequestGroup(org.hl7.fhir.r5.model.RequestGroup src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.RequestGroup tgt = new org.hl7.fhir.r4.model.RequestGroup();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- for (org.hl7.fhir.r5.model.CanonicalType t : src.getInstantiatesCanonical()) tgt.getInstantiatesCanonical().add(convertCanonical(t));
- for (org.hl7.fhir.r5.model.UriType t : src.getInstantiatesUri()) tgt.getInstantiatesUri().add(convertUri(t));
- for (org.hl7.fhir.r5.model.Reference t : src.getBasedOn()) tgt.addBasedOn(convertReference(t));
- for (org.hl7.fhir.r5.model.Reference t : src.getReplaces()) tgt.addReplaces(convertReference(t));
- if (src.hasGroupIdentifier())
- tgt.setGroupIdentifier(convertIdentifier(src.getGroupIdentifier()));
- if (src.hasStatus())
- tgt.setStatusElement(convertRequestStatus(src.getStatusElement()));
- if (src.hasIntent())
- tgt.setIntentElement(convertRequestIntent(src.getIntentElement()));
- if (src.hasPriority())
- tgt.setPriorityElement(convertRequestPriority(src.getPriorityElement()));
- if (src.hasCode())
- tgt.setCode(convertCodeableConcept(src.getCode()));
- if (src.hasSubject())
- tgt.setSubject(convertReference(src.getSubject()));
- if (src.hasEncounter())
- tgt.setEncounter(convertReference(src.getEncounter()));
- if (src.hasAuthoredOn())
- tgt.setAuthoredOnElement(convertDateTime(src.getAuthoredOnElement()));
- if (src.hasAuthor())
- tgt.setAuthor(convertReference(src.getAuthor()));
- for (CodeableReference t : src.getReason()) if (t.hasConcept())
- tgt.addReasonCode(convertCodeableConcept(t.getConcept()));
- for (CodeableReference t : src.getReason()) if (t.hasReference())
- tgt.addReasonReference(convertReference(t.getReference()));
- for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t));
- for (org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionComponent t : src.getAction()) tgt.addAction(convertRequestGroupActionComponent(t));
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertRequestStatus(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.RequestStatusEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case DRAFT:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestStatus.DRAFT);
- break;
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestStatus.ACTIVE);
- break;
- case ONHOLD:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestStatus.ONHOLD);
- break;
- case REVOKED:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestStatus.REVOKED);
- break;
- case COMPLETED:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestStatus.COMPLETED);
- break;
- case ENTEREDINERROR:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestStatus.ENTEREDINERROR);
- break;
- case UNKNOWN:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestStatus.UNKNOWN);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestStatus.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertRequestStatus(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.RequestGroup.RequestStatusEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case DRAFT:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestStatus.DRAFT);
- break;
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestStatus.ACTIVE);
- break;
- case ONHOLD:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestStatus.ONHOLD);
- break;
- case REVOKED:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestStatus.REVOKED);
- break;
- case COMPLETED:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestStatus.COMPLETED);
- break;
- case ENTEREDINERROR:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestStatus.ENTEREDINERROR);
- break;
- case UNKNOWN:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestStatus.UNKNOWN);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestStatus.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertRequestIntent(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.RequestIntentEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case PROPOSAL:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestIntent.PROPOSAL);
- break;
- case PLAN:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestIntent.PLAN);
- break;
- case DIRECTIVE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestIntent.DIRECTIVE);
- break;
- case ORDER:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestIntent.ORDER);
- break;
- case ORIGINALORDER:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestIntent.ORIGINALORDER);
- break;
- case REFLEXORDER:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestIntent.REFLEXORDER);
- break;
- case FILLERORDER:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestIntent.FILLERORDER);
- break;
- case INSTANCEORDER:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestIntent.INSTANCEORDER);
- break;
- case OPTION:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestIntent.OPTION);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestIntent.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertRequestIntent(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.RequestGroup.RequestIntentEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case PROPOSAL:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestIntent.PROPOSAL);
- break;
- case PLAN:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestIntent.PLAN);
- break;
- case DIRECTIVE:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestIntent.DIRECTIVE);
- break;
- case ORDER:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestIntent.ORDER);
- break;
- case ORIGINALORDER:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestIntent.ORIGINALORDER);
- break;
- case REFLEXORDER:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestIntent.REFLEXORDER);
- break;
- case FILLERORDER:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestIntent.FILLERORDER);
- break;
- case INSTANCEORDER:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestIntent.INSTANCEORDER);
- break;
- case OPTION:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestIntent.OPTION);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestIntent.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertRequestPriority(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.RequestPriorityEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ROUTINE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestPriority.ROUTINE);
- break;
- case URGENT:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestPriority.URGENT);
- break;
- case ASAP:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestPriority.ASAP);
- break;
- case STAT:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestPriority.STAT);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.RequestPriority.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertRequestPriority(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.RequestGroup.RequestPriorityEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ROUTINE:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestPriority.ROUTINE);
- break;
- case URGENT:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestPriority.URGENT);
- break;
- case ASAP:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestPriority.ASAP);
- break;
- case STAT:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestPriority.STAT);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.RequestPriority.NULL);
- break;
- }
- return tgt;
- }
-
- public static org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionComponent convertRequestGroupActionComponent(org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionComponent tgt = new org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionComponent();
- copyElement(src, tgt);
- if (src.hasPrefix())
- tgt.setPrefixElement(convertString(src.getPrefixElement()));
- if (src.hasTitle())
- tgt.setTitleElement(convertString(src.getTitleElement()));
- if (src.hasDescription())
- tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
- if (src.hasTextEquivalent())
- tgt.setTextEquivalentElement(convertString(src.getTextEquivalentElement()));
- if (src.hasPriority())
- tgt.setPriorityElement(convertRequestPriority(src.getPriorityElement()));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getCode()) tgt.addCode(convertCodeableConcept(t));
- for (org.hl7.fhir.r4.model.RelatedArtifact t : src.getDocumentation()) tgt.addDocumentation(convertRelatedArtifact(t));
- for (org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionConditionComponent t : src.getCondition()) tgt.addCondition(convertRequestGroupActionConditionComponent(t));
- for (org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionRelatedActionComponent t : src.getRelatedAction()) tgt.addRelatedAction(convertRequestGroupActionRelatedActionComponent(t));
- if (src.hasTiming())
- tgt.setTiming(convertType(src.getTiming()));
- for (org.hl7.fhir.r4.model.Reference t : src.getParticipant()) tgt.addParticipant(convertReference(t));
- if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
- if (src.hasGroupingBehavior())
- tgt.setGroupingBehaviorElement(convertActionGroupingBehavior(src.getGroupingBehaviorElement()));
- if (src.hasSelectionBehavior())
- tgt.setSelectionBehaviorElement(convertActionSelectionBehavior(src.getSelectionBehaviorElement()));
- if (src.hasRequiredBehavior())
- tgt.setRequiredBehaviorElement(convertActionRequiredBehavior(src.getRequiredBehaviorElement()));
- if (src.hasPrecheckBehavior())
- tgt.setPrecheckBehaviorElement(convertActionPrecheckBehavior(src.getPrecheckBehaviorElement()));
- if (src.hasCardinalityBehavior())
- tgt.setCardinalityBehaviorElement(convertActionCardinalityBehavior(src.getCardinalityBehaviorElement()));
- if (src.hasResource())
- tgt.setResource(convertReference(src.getResource()));
- for (org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionComponent t : src.getAction()) tgt.addAction(convertRequestGroupActionComponent(t));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionComponent convertRequestGroupActionComponent(org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionComponent tgt = new org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionComponent();
- copyElement(src, tgt);
- if (src.hasPrefix())
- tgt.setPrefixElement(convertString(src.getPrefixElement()));
- if (src.hasTitle())
- tgt.setTitleElement(convertString(src.getTitleElement()));
- if (src.hasDescription())
- tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
- if (src.hasTextEquivalent())
- tgt.setTextEquivalentElement(convertString(src.getTextEquivalentElement()));
- if (src.hasPriority())
- tgt.setPriorityElement(convertRequestPriority(src.getPriorityElement()));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getCode()) tgt.addCode(convertCodeableConcept(t));
- for (org.hl7.fhir.r5.model.RelatedArtifact t : src.getDocumentation()) tgt.addDocumentation(convertRelatedArtifact(t));
- for (org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionConditionComponent t : src.getCondition()) tgt.addCondition(convertRequestGroupActionConditionComponent(t));
- for (org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionRelatedActionComponent t : src.getRelatedAction()) tgt.addRelatedAction(convertRequestGroupActionRelatedActionComponent(t));
- if (src.hasTiming())
- tgt.setTiming(convertType(src.getTiming()));
- for (org.hl7.fhir.r5.model.Reference t : src.getParticipant()) tgt.addParticipant(convertReference(t));
- if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
- if (src.hasGroupingBehavior())
- tgt.setGroupingBehaviorElement(convertActionGroupingBehavior(src.getGroupingBehaviorElement()));
- if (src.hasSelectionBehavior())
- tgt.setSelectionBehaviorElement(convertActionSelectionBehavior(src.getSelectionBehaviorElement()));
- if (src.hasRequiredBehavior())
- tgt.setRequiredBehaviorElement(convertActionRequiredBehavior(src.getRequiredBehaviorElement()));
- if (src.hasPrecheckBehavior())
- tgt.setPrecheckBehaviorElement(convertActionPrecheckBehavior(src.getPrecheckBehaviorElement()));
- if (src.hasCardinalityBehavior())
- tgt.setCardinalityBehaviorElement(convertActionCardinalityBehavior(src.getCardinalityBehaviorElement()));
- if (src.hasResource())
- tgt.setResource(convertReference(src.getResource()));
- for (org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionComponent t : src.getAction()) tgt.addAction(convertRequestGroupActionComponent(t));
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertActionGroupingBehavior(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.ActionGroupingBehaviorEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case VISUALGROUP:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionGroupingBehavior.VISUALGROUP);
- break;
- case LOGICALGROUP:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionGroupingBehavior.LOGICALGROUP);
- break;
- case SENTENCEGROUP:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionGroupingBehavior.SENTENCEGROUP);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionGroupingBehavior.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertActionGroupingBehavior(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.RequestGroup.ActionGroupingBehaviorEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case VISUALGROUP:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionGroupingBehavior.VISUALGROUP);
- break;
- case LOGICALGROUP:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionGroupingBehavior.LOGICALGROUP);
- break;
- case SENTENCEGROUP:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionGroupingBehavior.SENTENCEGROUP);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionGroupingBehavior.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertActionSelectionBehavior(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.ActionSelectionBehaviorEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ANY:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionSelectionBehavior.ANY);
- break;
- case ALL:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionSelectionBehavior.ALL);
- break;
- case ALLORNONE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionSelectionBehavior.ALLORNONE);
- break;
- case EXACTLYONE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionSelectionBehavior.EXACTLYONE);
- break;
- case ATMOSTONE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionSelectionBehavior.ATMOSTONE);
- break;
- case ONEORMORE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionSelectionBehavior.ONEORMORE);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionSelectionBehavior.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertActionSelectionBehavior(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.RequestGroup.ActionSelectionBehaviorEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ANY:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionSelectionBehavior.ANY);
- break;
- case ALL:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionSelectionBehavior.ALL);
- break;
- case ALLORNONE:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionSelectionBehavior.ALLORNONE);
- break;
- case EXACTLYONE:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionSelectionBehavior.EXACTLYONE);
- break;
- case ATMOSTONE:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionSelectionBehavior.ATMOSTONE);
- break;
- case ONEORMORE:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionSelectionBehavior.ONEORMORE);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionSelectionBehavior.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertActionRequiredBehavior(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.ActionRequiredBehaviorEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case MUST:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRequiredBehavior.MUST);
- break;
- case COULD:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRequiredBehavior.COULD);
- break;
- case MUSTUNLESSDOCUMENTED:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRequiredBehavior.MUSTUNLESSDOCUMENTED);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRequiredBehavior.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertActionRequiredBehavior(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.RequestGroup.ActionRequiredBehaviorEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case MUST:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRequiredBehavior.MUST);
- break;
- case COULD:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRequiredBehavior.COULD);
- break;
- case MUSTUNLESSDOCUMENTED:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRequiredBehavior.MUSTUNLESSDOCUMENTED);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRequiredBehavior.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertActionPrecheckBehavior(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.ActionPrecheckBehaviorEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case YES:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionPrecheckBehavior.YES);
- break;
- case NO:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionPrecheckBehavior.NO);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionPrecheckBehavior.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertActionPrecheckBehavior(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.RequestGroup.ActionPrecheckBehaviorEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case YES:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionPrecheckBehavior.YES);
- break;
- case NO:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionPrecheckBehavior.NO);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionPrecheckBehavior.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertActionCardinalityBehavior(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.ActionCardinalityBehaviorEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case SINGLE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionCardinalityBehavior.SINGLE);
- break;
- case MULTIPLE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionCardinalityBehavior.MULTIPLE);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionCardinalityBehavior.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertActionCardinalityBehavior(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.RequestGroup.ActionCardinalityBehaviorEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case SINGLE:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionCardinalityBehavior.SINGLE);
- break;
- case MULTIPLE:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionCardinalityBehavior.MULTIPLE);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionCardinalityBehavior.NULL);
- break;
- }
- return tgt;
- }
-
- public static org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionConditionComponent convertRequestGroupActionConditionComponent(org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionConditionComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionConditionComponent tgt = new org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionConditionComponent();
- copyElement(src, tgt);
- if (src.hasKind())
- tgt.setKindElement(convertActionConditionKind(src.getKindElement()));
- if (src.hasExpression())
- tgt.setExpression(convertExpression(src.getExpression()));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionConditionComponent convertRequestGroupActionConditionComponent(org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionConditionComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionConditionComponent tgt = new org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionConditionComponent();
- copyElement(src, tgt);
- if (src.hasKind())
- tgt.setKindElement(convertActionConditionKind(src.getKindElement()));
- if (src.hasExpression())
- tgt.setExpression(convertExpression(src.getExpression()));
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertActionConditionKind(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.ActionConditionKindEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case APPLICABILITY:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionConditionKind.APPLICABILITY);
- break;
- case START:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionConditionKind.START);
- break;
- case STOP:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionConditionKind.STOP);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionConditionKind.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertActionConditionKind(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.RequestGroup.ActionConditionKindEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case APPLICABILITY:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionConditionKind.APPLICABILITY);
- break;
- case START:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionConditionKind.START);
- break;
- case STOP:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionConditionKind.STOP);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionConditionKind.NULL);
- break;
- }
- return tgt;
- }
-
- public static org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionRelatedActionComponent convertRequestGroupActionRelatedActionComponent(org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionRelatedActionComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionRelatedActionComponent tgt = new org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionRelatedActionComponent();
- copyElement(src, tgt);
- if (src.hasActionId())
- tgt.setActionIdElement(convertId(src.getActionIdElement()));
- if (src.hasRelationship())
- tgt.setRelationshipElement(convertActionRelationshipType(src.getRelationshipElement()));
- if (src.hasOffset())
- tgt.setOffset(convertType(src.getOffset()));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionRelatedActionComponent convertRequestGroupActionRelatedActionComponent(org.hl7.fhir.r5.model.RequestGroup.RequestGroupActionRelatedActionComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionRelatedActionComponent tgt = new org.hl7.fhir.r4.model.RequestGroup.RequestGroupActionRelatedActionComponent();
- copyElement(src, tgt);
- if (src.hasActionId())
- tgt.setActionIdElement(convertId(src.getActionIdElement()));
- if (src.hasRelationship())
- tgt.setRelationshipElement(convertActionRelationshipType(src.getRelationshipElement()));
- if (src.hasOffset())
- tgt.setOffset(convertType(src.getOffset()));
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertActionRelationshipType(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.Enumerations.ActionRelationshipTypeEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case BEFORESTART:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRelationshipType.BEFORESTART);
- break;
- case BEFORE:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRelationshipType.BEFORE);
- break;
- case BEFOREEND:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRelationshipType.BEFOREEND);
- break;
- case CONCURRENTWITHSTART:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRelationshipType.CONCURRENTWITHSTART);
- break;
- case CONCURRENT:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRelationshipType.CONCURRENT);
- break;
- case CONCURRENTWITHEND:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRelationshipType.CONCURRENTWITHEND);
- break;
- case AFTERSTART:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRelationshipType.AFTERSTART);
- break;
- case AFTER:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRelationshipType.AFTER);
- break;
- case AFTEREND:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRelationshipType.AFTEREND);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ActionRelationshipType.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertActionRelationshipType(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.RequestGroup.ActionRelationshipTypeEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case BEFORESTART:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRelationshipType.BEFORESTART);
- break;
- case BEFORE:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRelationshipType.BEFORE);
- break;
- case BEFOREEND:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRelationshipType.BEFOREEND);
- break;
- case CONCURRENTWITHSTART:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRelationshipType.CONCURRENTWITHSTART);
- break;
- case CONCURRENT:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRelationshipType.CONCURRENT);
- break;
- case CONCURRENTWITHEND:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRelationshipType.CONCURRENTWITHEND);
- break;
- case AFTERSTART:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRelationshipType.AFTERSTART);
- break;
- case AFTER:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRelationshipType.AFTER);
- break;
- case AFTEREND:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRelationshipType.AFTEREND);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.RequestGroup.ActionRelationshipType.NULL);
- break;
- }
- return tgt;
- }
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchStudy40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchStudy40_50.java
deleted file mode 100644
index e71bf297b..000000000
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchStudy40_50.java
+++ /dev/null
@@ -1,263 +0,0 @@
-package org.hl7.fhir.convertors.conv40_50;
-
-
-import org.hl7.fhir.convertors.VersionConvertor_40_50;
-import org.hl7.fhir.exceptions.FHIRException;
-
-/*
- Copyright (c) 2011+, HL7, Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of HL7 nor the names of its contributors may be used to
- endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-*/
-// Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0
-public class ResearchStudy40_50 extends VersionConvertor_40_50 {
-
- public static org.hl7.fhir.r5.model.ResearchStudy convertResearchStudy(org.hl7.fhir.r4.model.ResearchStudy src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.ResearchStudy tgt = new org.hl7.fhir.r5.model.ResearchStudy();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- if (src.hasTitle())
- tgt.setTitleElement(convertString(src.getTitleElement()));
- for (org.hl7.fhir.r4.model.Reference t : src.getProtocol()) tgt.addProtocol(convertReference(t));
- for (org.hl7.fhir.r4.model.Reference t : src.getPartOf()) tgt.addPartOf(convertReference(t));
- if (src.hasStatus())
- tgt.setStatusElement(convertResearchStudyStatus(src.getStatusElement()));
- if (src.hasPrimaryPurposeType())
- tgt.setPrimaryPurposeType(convertCodeableConcept(src.getPrimaryPurposeType()));
- if (src.hasPhase())
- tgt.setPhase(convertCodeableConcept(src.getPhase()));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getCategory()) tgt.addCategory(convertCodeableConcept(t));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getFocus()) tgt.addFocus(convertCodeableConcept(t));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getCondition()) tgt.addCondition(convertCodeableConcept(t));
- for (org.hl7.fhir.r4.model.ContactDetail t : src.getContact()) tgt.addContact(convertContactDetail(t));
- for (org.hl7.fhir.r4.model.RelatedArtifact t : src.getRelatedArtifact()) tgt.addRelatedArtifact(convertRelatedArtifact(t));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getKeyword()) tgt.addKeyword(convertCodeableConcept(t));
- for (org.hl7.fhir.r4.model.CodeableConcept t : src.getLocation()) tgt.addLocation(convertCodeableConcept(t));
- if (src.hasDescription())
- tgt.setDescriptionElement(convertMarkdown(src.getDescriptionElement()));
- for (org.hl7.fhir.r4.model.Reference t : src.getEnrollment()) tgt.addEnrollment(convertReference(t));
- if (src.hasPeriod())
- tgt.setPeriod(convertPeriod(src.getPeriod()));
- if (src.hasSponsor())
- tgt.setSponsor(convertReference(src.getSponsor()));
- if (src.hasPrincipalInvestigator())
- tgt.setPrincipalInvestigator(convertReference(src.getPrincipalInvestigator()));
- for (org.hl7.fhir.r4.model.Reference t : src.getSite()) tgt.addSite(convertReference(t));
- if (src.hasReasonStopped())
- tgt.setReasonStopped(convertCodeableConcept(src.getReasonStopped()));
- for (org.hl7.fhir.r4.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t));
- for (org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyArmComponent t : src.getArm()) tgt.addArm(convertResearchStudyArmComponent(t));
- for (org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyObjectiveComponent t : src.getObjective()) tgt.addObjective(convertResearchStudyObjectiveComponent(t));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.ResearchStudy convertResearchStudy(org.hl7.fhir.r5.model.ResearchStudy src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.ResearchStudy tgt = new org.hl7.fhir.r4.model.ResearchStudy();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- if (src.hasTitle())
- tgt.setTitleElement(convertString(src.getTitleElement()));
- for (org.hl7.fhir.r5.model.Reference t : src.getProtocol()) tgt.addProtocol(convertReference(t));
- for (org.hl7.fhir.r5.model.Reference t : src.getPartOf()) tgt.addPartOf(convertReference(t));
- if (src.hasStatus())
- tgt.setStatusElement(convertResearchStudyStatus(src.getStatusElement()));
- if (src.hasPrimaryPurposeType())
- tgt.setPrimaryPurposeType(convertCodeableConcept(src.getPrimaryPurposeType()));
- if (src.hasPhase())
- tgt.setPhase(convertCodeableConcept(src.getPhase()));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getCategory()) tgt.addCategory(convertCodeableConcept(t));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getFocus()) tgt.addFocus(convertCodeableConcept(t));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getCondition()) tgt.addCondition(convertCodeableConcept(t));
- for (org.hl7.fhir.r5.model.ContactDetail t : src.getContact()) tgt.addContact(convertContactDetail(t));
- for (org.hl7.fhir.r5.model.RelatedArtifact t : src.getRelatedArtifact()) tgt.addRelatedArtifact(convertRelatedArtifact(t));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getKeyword()) tgt.addKeyword(convertCodeableConcept(t));
- for (org.hl7.fhir.r5.model.CodeableConcept t : src.getLocation()) tgt.addLocation(convertCodeableConcept(t));
- if (src.hasDescription())
- tgt.setDescriptionElement(convertMarkdown(src.getDescriptionElement()));
- for (org.hl7.fhir.r5.model.Reference t : src.getEnrollment()) tgt.addEnrollment(convertReference(t));
- if (src.hasPeriod())
- tgt.setPeriod(convertPeriod(src.getPeriod()));
- if (src.hasSponsor())
- tgt.setSponsor(convertReference(src.getSponsor()));
- if (src.hasPrincipalInvestigator())
- tgt.setPrincipalInvestigator(convertReference(src.getPrincipalInvestigator()));
- for (org.hl7.fhir.r5.model.Reference t : src.getSite()) tgt.addSite(convertReference(t));
- if (src.hasReasonStopped())
- tgt.setReasonStopped(convertCodeableConcept(src.getReasonStopped()));
- for (org.hl7.fhir.r5.model.Annotation t : src.getNote()) tgt.addNote(convertAnnotation(t));
- for (org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyArmComponent t : src.getArm()) tgt.addArm(convertResearchStudyArmComponent(t));
- for (org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyObjectiveComponent t : src.getObjective()) tgt.addObjective(convertResearchStudyObjectiveComponent(t));
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertResearchStudyStatus(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyStatusEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyStatus.ACTIVE);
- break;
- case ADMINISTRATIVELYCOMPLETED:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyStatus.ADMINISTRATIVELYCOMPLETED);
- break;
- case APPROVED:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyStatus.APPROVED);
- break;
- case CLOSEDTOACCRUAL:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyStatus.CLOSEDTOACCRUAL);
- break;
- case CLOSEDTOACCRUALANDINTERVENTION:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyStatus.CLOSEDTOACCRUALANDINTERVENTION);
- break;
- case COMPLETED:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyStatus.COMPLETED);
- break;
- case DISAPPROVED:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyStatus.DISAPPROVED);
- break;
- case INREVIEW:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyStatus.INREVIEW);
- break;
- case TEMPORARILYCLOSEDTOACCRUAL:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyStatus.TEMPORARILYCLOSEDTOACCRUAL);
- break;
- case TEMPORARILYCLOSEDTOACCRUALANDINTERVENTION:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyStatus.TEMPORARILYCLOSEDTOACCRUALANDINTERVENTION);
- break;
- case WITHDRAWN:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyStatus.WITHDRAWN);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyStatus.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertResearchStudyStatus(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyStatusEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case ACTIVE:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyStatus.ACTIVE);
- break;
- case ADMINISTRATIVELYCOMPLETED:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyStatus.ADMINISTRATIVELYCOMPLETED);
- break;
- case APPROVED:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyStatus.APPROVED);
- break;
- case CLOSEDTOACCRUAL:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyStatus.CLOSEDTOACCRUAL);
- break;
- case CLOSEDTOACCRUALANDINTERVENTION:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyStatus.CLOSEDTOACCRUALANDINTERVENTION);
- break;
- case COMPLETED:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyStatus.COMPLETED);
- break;
- case DISAPPROVED:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyStatus.DISAPPROVED);
- break;
- case INREVIEW:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyStatus.INREVIEW);
- break;
- case TEMPORARILYCLOSEDTOACCRUAL:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyStatus.TEMPORARILYCLOSEDTOACCRUAL);
- break;
- case TEMPORARILYCLOSEDTOACCRUALANDINTERVENTION:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyStatus.TEMPORARILYCLOSEDTOACCRUALANDINTERVENTION);
- break;
- case WITHDRAWN:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyStatus.WITHDRAWN);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyStatus.NULL);
- break;
- }
- return tgt;
- }
-
- public static org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyArmComponent convertResearchStudyArmComponent(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyArmComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyArmComponent tgt = new org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyArmComponent();
- copyElement(src, tgt);
- if (src.hasName())
- tgt.setNameElement(convertString(src.getNameElement()));
- if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
- if (src.hasDescription())
- tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyArmComponent convertResearchStudyArmComponent(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyArmComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyArmComponent tgt = new org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyArmComponent();
- copyElement(src, tgt);
- if (src.hasName())
- tgt.setNameElement(convertString(src.getNameElement()));
- if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
- if (src.hasDescription())
- tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
- return tgt;
- }
-
- public static org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyObjectiveComponent convertResearchStudyObjectiveComponent(org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyObjectiveComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyObjectiveComponent tgt = new org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyObjectiveComponent();
- copyElement(src, tgt);
- if (src.hasName())
- tgt.setNameElement(convertString(src.getNameElement()));
- if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyObjectiveComponent convertResearchStudyObjectiveComponent(org.hl7.fhir.r5.model.ResearchStudy.ResearchStudyObjectiveComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyObjectiveComponent tgt = new org.hl7.fhir.r4.model.ResearchStudy.ResearchStudyObjectiveComponent();
- copyElement(src, tgt);
- if (src.hasName())
- tgt.setNameElement(convertString(src.getNameElement()));
- if (src.hasType())
- tgt.setType(convertCodeableConcept(src.getType()));
- return tgt;
- }
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchSubject40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchSubject40_50.java
deleted file mode 100644
index 4d5064dbe..000000000
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ResearchSubject40_50.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.hl7.fhir.convertors.conv40_50;
-
-
-import org.hl7.fhir.convertors.VersionConvertor_40_50;
-import org.hl7.fhir.exceptions.FHIRException;
-
-/*
- Copyright (c) 2011+, HL7, Inc.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of HL7 nor the names of its contributors may be used to
- endorse or promote products derived from this software without specific
- prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-*/
-// Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0
-public class ResearchSubject40_50 extends VersionConvertor_40_50 {
-
- public static org.hl7.fhir.r5.model.ResearchSubject convertResearchSubject(org.hl7.fhir.r4.model.ResearchSubject src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.ResearchSubject tgt = new org.hl7.fhir.r5.model.ResearchSubject();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r4.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- if (src.hasStatus())
- tgt.setStatusElement(convertResearchSubjectStatus(src.getStatusElement()));
- if (src.hasPeriod())
- tgt.setPeriod(convertPeriod(src.getPeriod()));
- if (src.hasStudy())
- tgt.setStudy(convertReference(src.getStudy()));
- if (src.hasIndividual())
- tgt.setIndividual(convertReference(src.getIndividual()));
- if (src.hasAssignedArm())
- tgt.setAssignedArmElement(convertString(src.getAssignedArmElement()));
- if (src.hasActualArm())
- tgt.setActualArmElement(convertString(src.getActualArmElement()));
- if (src.hasConsent())
- tgt.setConsent(convertReference(src.getConsent()));
- return tgt;
- }
-
- public static org.hl7.fhir.r4.model.ResearchSubject convertResearchSubject(org.hl7.fhir.r5.model.ResearchSubject src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r4.model.ResearchSubject tgt = new org.hl7.fhir.r4.model.ResearchSubject();
- copyDomainResource(src, tgt);
- for (org.hl7.fhir.r5.model.Identifier t : src.getIdentifier()) tgt.addIdentifier(convertIdentifier(t));
- if (src.hasStatus())
- tgt.setStatusElement(convertResearchSubjectStatus(src.getStatusElement()));
- if (src.hasPeriod())
- tgt.setPeriod(convertPeriod(src.getPeriod()));
- if (src.hasStudy())
- tgt.setStudy(convertReference(src.getStudy()));
- if (src.hasIndividual())
- tgt.setIndividual(convertReference(src.getIndividual()));
- if (src.hasAssignedArm())
- tgt.setAssignedArmElement(convertString(src.getAssignedArmElement()));
- if (src.hasActualArm())
- tgt.setActualArmElement(convertString(src.getActualArmElement()));
- if (src.hasConsent())
- tgt.setConsent(convertReference(src.getConsent()));
- return tgt;
- }
-
- static public org.hl7.fhir.r5.model.Enumeration convertResearchSubjectStatus(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatusEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case CANDIDATE:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.CANDIDATE);
- break;
- case ELIGIBLE:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.ELIGIBLE);
- break;
- case FOLLOWUP:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.FOLLOWUP);
- break;
- case INELIGIBLE:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.INELIGIBLE);
- break;
- case NOTREGISTERED:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.NOTREGISTERED);
- break;
- case OFFSTUDY:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.OFFSTUDY);
- break;
- case ONSTUDY:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.ONSTUDY);
- break;
- case ONSTUDYINTERVENTION:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.ONSTUDYINTERVENTION);
- break;
- case ONSTUDYOBSERVATION:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.ONSTUDYOBSERVATION);
- break;
- case PENDINGONSTUDY:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.PENDINGONSTUDY);
- break;
- case POTENTIALCANDIDATE:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.POTENTIALCANDIDATE);
- break;
- case SCREENING:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.SCREENING);
- break;
- case WITHDRAWN:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.WITHDRAWN);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.ResearchSubject.ResearchSubjectStatus.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertResearchSubjectStatus(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatusEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case CANDIDATE:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.CANDIDATE);
- break;
- case ELIGIBLE:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.ELIGIBLE);
- break;
- case FOLLOWUP:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.FOLLOWUP);
- break;
- case INELIGIBLE:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.INELIGIBLE);
- break;
- case NOTREGISTERED:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.NOTREGISTERED);
- break;
- case OFFSTUDY:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.OFFSTUDY);
- break;
- case ONSTUDY:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.ONSTUDY);
- break;
- case ONSTUDYINTERVENTION:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.ONSTUDYINTERVENTION);
- break;
- case ONSTUDYOBSERVATION:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.ONSTUDYOBSERVATION);
- break;
- case PENDINGONSTUDY:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.PENDINGONSTUDY);
- break;
- case POTENTIALCANDIDATE:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.POTENTIALCANDIDATE);
- break;
- case SCREENING:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.SCREENING);
- break;
- case WITHDRAWN:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.WITHDRAWN);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.ResearchSubject.ResearchSubjectStatus.NULL);
- break;
- }
- return tgt;
- }
-}
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap40_50.java
index f525cb558..8c9029b0b 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/StructureMap40_50.java
@@ -500,8 +500,8 @@ public class StructureMap40_50 extends VersionConvertor_40_50 {
copyElement(src, tgt);
if (src.hasContext())
tgt.setContextElement(convertId(src.getContextElement()));
- if (src.hasContextType())
- tgt.setContextTypeElement(convertStructureMapContextType(src.getContextTypeElement()));
+ if (src.hasContextType() && src.getContextType() != org.hl7.fhir.r4.model.StructureMap.StructureMapContextType.VARIABLE)
+ throw new Error("This conversion is not supported. Consult code maintainers"); // this should never happens - no one knows what the intent was here.
if (src.hasElement())
tgt.setElementElement(convertString(src.getElementElement()));
if (src.hasVariable())
@@ -524,8 +524,7 @@ public class StructureMap40_50 extends VersionConvertor_40_50 {
copyElement(src, tgt);
if (src.hasContext())
tgt.setContextElement(convertId(src.getContextElement()));
- if (src.hasContextType())
- tgt.setContextTypeElement(convertStructureMapContextType(src.getContextTypeElement()));
+ tgt.setContextType(org.hl7.fhir.r4.model.StructureMap.StructureMapContextType.VARIABLE);
if (src.hasElement())
tgt.setElementElement(convertString(src.getElementElement()));
if (src.hasVariable())
@@ -541,44 +540,6 @@ public class StructureMap40_50 extends VersionConvertor_40_50 {
return tgt;
}
- static public org.hl7.fhir.r5.model.Enumeration convertStructureMapContextType(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r5.model.Enumeration tgt = new org.hl7.fhir.r5.model.Enumeration<>(new org.hl7.fhir.r5.model.StructureMap.StructureMapContextTypeEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case TYPE:
- tgt.setValue(org.hl7.fhir.r5.model.StructureMap.StructureMapContextType.TYPE);
- break;
- case VARIABLE:
- tgt.setValue(org.hl7.fhir.r5.model.StructureMap.StructureMapContextType.VARIABLE);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r5.model.StructureMap.StructureMapContextType.NULL);
- break;
- }
- return tgt;
- }
-
- static public org.hl7.fhir.r4.model.Enumeration convertStructureMapContextType(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException {
- if (src == null || src.isEmpty())
- return null;
- org.hl7.fhir.r4.model.Enumeration tgt = new org.hl7.fhir.r4.model.Enumeration<>(new org.hl7.fhir.r4.model.StructureMap.StructureMapContextTypeEnumFactory());
- VersionConvertor_40_50.copyElement(src, tgt);
- switch(src.getValue()) {
- case TYPE:
- tgt.setValue(org.hl7.fhir.r4.model.StructureMap.StructureMapContextType.TYPE);
- break;
- case VARIABLE:
- tgt.setValue(org.hl7.fhir.r4.model.StructureMap.StructureMapContextType.VARIABLE);
- break;
- default:
- tgt.setValue(org.hl7.fhir.r4.model.StructureMap.StructureMapContextType.NULL);
- break;
- }
- return tgt;
- }
-
static public org.hl7.fhir.r5.model.Enumeration convertStructureMapTargetListMode(org.hl7.fhir.r4.model.Enumeration src) throws FHIRException {
if (src == null || src.isEmpty())
return null;
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Substance40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Substance40_50.java
index 664b77f25..32777d295 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Substance40_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Substance40_50.java
@@ -3,6 +3,7 @@ package org.hl7.fhir.convertors.conv40_50;
import org.hl7.fhir.convertors.VersionConvertor_40_50;
import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.Identifier;
/*
Copyright (c) 2011+, HL7, Inc.
@@ -45,10 +46,10 @@ public class Substance40_50 extends VersionConvertor_40_50 {
tgt.setStatusElement(convertFHIRSubstanceStatus(src.getStatusElement()));
for (org.hl7.fhir.r4.model.CodeableConcept t : src.getCategory()) tgt.addCategory(convertCodeableConcept(t));
if (src.hasCode())
- tgt.setCode(convertCodeableConcept(src.getCode()));
+ tgt.getCode().setConcept(convertCodeableConcept(src.getCode()));
if (src.hasDescription())
tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
- for (org.hl7.fhir.r4.model.Substance.SubstanceInstanceComponent t : src.getInstance()) tgt.addInstance(convertSubstanceInstanceComponent(t));
+ for (org.hl7.fhir.r4.model.Substance.SubstanceInstanceComponent t : src.getInstance()) convertSubstanceInstanceComponent(t, tgt);
for (org.hl7.fhir.r4.model.Substance.SubstanceIngredientComponent t : src.getIngredient()) tgt.addIngredient(convertSubstanceIngredientComponent(t));
return tgt;
}
@@ -62,11 +63,13 @@ public class Substance40_50 extends VersionConvertor_40_50 {
if (src.hasStatus())
tgt.setStatusElement(convertFHIRSubstanceStatus(src.getStatusElement()));
for (org.hl7.fhir.r5.model.CodeableConcept t : src.getCategory()) tgt.addCategory(convertCodeableConcept(t));
- if (src.hasCode())
- tgt.setCode(convertCodeableConcept(src.getCode()));
+ if (src.getCode().hasConcept())
+ tgt.setCode(convertCodeableConcept(src.getCode().getConcept()));
if (src.hasDescription())
tgt.setDescriptionElement(convertString(src.getDescriptionElement()));
- for (org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent t : src.getInstance()) tgt.addInstance(convertSubstanceInstanceComponent(t));
+ if (src.getInstance()) {
+ tgt.addInstance(convertSubstanceInstanceComponent(src));
+ }
for (org.hl7.fhir.r5.model.Substance.SubstanceIngredientComponent t : src.getIngredient()) tgt.addIngredient(convertSubstanceIngredientComponent(t));
return tgt;
}
@@ -115,27 +118,21 @@ public class Substance40_50 extends VersionConvertor_40_50 {
return tgt;
}
- public static org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent convertSubstanceInstanceComponent(org.hl7.fhir.r4.model.Substance.SubstanceInstanceComponent src) throws FHIRException {
- if (src == null)
- return null;
- org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent tgt = new org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent();
- copyElement(src, tgt);
- if (src.hasIdentifier())
- tgt.setIdentifier(convertIdentifier(src.getIdentifier()));
- if (src.hasExpiry())
- tgt.setExpiryElement(convertDateTime(src.getExpiryElement()));
- if (src.hasQuantity())
- tgt.setQuantity(convertSimpleQuantity(src.getQuantity()));
- return tgt;
+ public static void convertSubstanceInstanceComponent(org.hl7.fhir.r4.model.Substance.SubstanceInstanceComponent src, org.hl7.fhir.r5.model.Substance tgt) throws FHIRException {
+ tgt.setInstance(true);
+ if (src.hasIdentifier())
+ tgt.addIdentifier(convertIdentifier(src.getIdentifier()));
+ if (src.hasExpiry())
+ tgt.setExpiryElement(convertDateTime(src.getExpiryElement()));
+ if (src.hasQuantity())
+ tgt.setQuantity(convertSimpleQuantity(src.getQuantity()));
}
- public static org.hl7.fhir.r4.model.Substance.SubstanceInstanceComponent convertSubstanceInstanceComponent(org.hl7.fhir.r5.model.Substance.SubstanceInstanceComponent src) throws FHIRException {
- if (src == null)
- return null;
+ public static org.hl7.fhir.r4.model.Substance.SubstanceInstanceComponent convertSubstanceInstanceComponent(org.hl7.fhir.r5.model.Substance src) throws FHIRException {
org.hl7.fhir.r4.model.Substance.SubstanceInstanceComponent tgt = new org.hl7.fhir.r4.model.Substance.SubstanceInstanceComponent();
- copyElement(src, tgt);
- if (src.hasIdentifier())
- tgt.setIdentifier(convertIdentifier(src.getIdentifier()));
+ for (Identifier t : src.getIdentifier()) {
+ tgt.setIdentifier(convertIdentifier(t));
+ }
if (src.hasExpiry())
tgt.setExpiryElement(convertDateTime(src.getExpiryElement()));
if (src.hasQuantity())
diff --git a/org.hl7.fhir.core.generator/configuration/CodeableConcept.java b/org.hl7.fhir.core.generator/configuration/CodeableConcept.java
index 3668a4bc8..c1ff36027 100644
--- a/org.hl7.fhir.core.generator/configuration/CodeableConcept.java
+++ b/org.hl7.fhir.core.generator/configuration/CodeableConcept.java
@@ -87,4 +87,10 @@ public boolean hasCoding(String system, String code) {
res.setText(l.getText());
}
return res;
- }
\ No newline at end of file
+ }
+
+
+ public void addCoding(String system, String code, String display) {
+ getCoding().add(new Coding(system, code, display));
+ }
+
\ No newline at end of file
diff --git a/org.hl7.fhir.core.generator/configuration/CodeableReference.java b/org.hl7.fhir.core.generator/configuration/CodeableReference.java
new file mode 100644
index 000000000..f841efc05
--- /dev/null
+++ b/org.hl7.fhir.core.generator/configuration/CodeableReference.java
@@ -0,0 +1,10 @@
+
+ public CodeableReference(CodeableConcept cc) {
+ super();
+ setConcept(cc);
+ }
+
+ public CodeableReference(Reference ref) {
+ super();
+ setReference(ref);
+ }
diff --git a/org.hl7.fhir.core.generator/configuration/CompartmentDefinition.java b/org.hl7.fhir.core.generator/configuration/CompartmentDefinition.java
new file mode 100644
index 000000000..1ba0aaf06
--- /dev/null
+++ b/org.hl7.fhir.core.generator/configuration/CompartmentDefinition.java
@@ -0,0 +1,4 @@
+ public boolean supportsCopyright() {
+ return false;
+ }
+
\ No newline at end of file
diff --git a/org.hl7.fhir.core.generator/configuration/FHIRVersion.java b/org.hl7.fhir.core.generator/configuration/FHIRVersion.java
index c6158de5d..9a412df90 100644
--- a/org.hl7.fhir.core.generator/configuration/FHIRVersion.java
+++ b/org.hl7.fhir.core.generator/configuration/FHIRVersion.java
@@ -59,4 +59,10 @@ public String toCode(int len) {
@Override
public String toString() {
return toCode();
- }
\ No newline at end of file
+ }
+
+
+ public boolean isR4B() {
+ return toCode().startsWith("4.1");
+ }
+
\ No newline at end of file
diff --git a/org.hl7.fhir.core.generator/configuration/GraphDefinition.java b/org.hl7.fhir.core.generator/configuration/GraphDefinition.java
new file mode 100644
index 000000000..1ba0aaf06
--- /dev/null
+++ b/org.hl7.fhir.core.generator/configuration/GraphDefinition.java
@@ -0,0 +1,4 @@
+ public boolean supportsCopyright() {
+ return false;
+ }
+
\ No newline at end of file
diff --git a/org.hl7.fhir.core.generator/configuration/RdfParser.java b/org.hl7.fhir.core.generator/configuration/RdfParser.java
index 07d29263c..03f2204f0 100644
--- a/org.hl7.fhir.core.generator/configuration/RdfParser.java
+++ b/org.hl7.fhir.core.generator/configuration/RdfParser.java
@@ -8,10 +8,11 @@ package org.hl7.fhir.r5.formats;
{{startMark}}
import org.hl7.fhir.r5.model.*;
+import org.hl7.fhir.r5.model.StringType;
import org.hl7.fhir.utilities.Utilities;
import org.hl7.fhir.exceptions.FHIRFormatError;
import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.r5.utils.formats.Turtle.Complex;
+import org.hl7.fhir.utilities.turtle.Turtle.*;
import java.io.IOException;
public class RdfParser extends RdfParserBase {
diff --git a/org.hl7.fhir.core.generator/configuration/SearchParameter.java b/org.hl7.fhir.core.generator/configuration/SearchParameter.java
new file mode 100644
index 000000000..1ba0aaf06
--- /dev/null
+++ b/org.hl7.fhir.core.generator/configuration/SearchParameter.java
@@ -0,0 +1,4 @@
+ public boolean supportsCopyright() {
+ return false;
+ }
+
\ No newline at end of file
diff --git a/org.hl7.fhir.core.generator/configuration/configuration.ini b/org.hl7.fhir.core.generator/configuration/configuration.ini
index ee413bede..df3d08bbb 100644
--- a/org.hl7.fhir.core.generator/configuration/configuration.ini
+++ b/org.hl7.fhir.core.generator/configuration/configuration.ini
@@ -38,6 +38,7 @@ CapabilityStatement = org.hl7.fhir.instance.model.api.IBaseConformance
DataType = org.hl7.fhir.instance.model.api.IBaseDatatype, ca.uhn.fhir.model.api.IElement
ElementDefinition = org.hl7.fhir.instance.model.api.ICompositeType, org.hl7.fhir.r5.model.Enumerations.BindingStrength, org.hl7.fhir.r5.model.Enumerations.BindingStrengthEnumFactory, org.hl7.fhir.r5.utils.ToolingExtensions, org.hl7.fhir.instance.model.api.IBaseDatatypeElement, org.hl7.fhir.utilities.CommaSeparatedStringBuilder
Binary = org.hl7.fhir.instance.model.api.IBaseBinary
+ContactDetail = org.hl7.fhir.r5.model.ContactPoint.ContactPointSystem
[shared]
http://hl7.org/fhir/ValueSet/concept-map-relationship = true
diff --git a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaEnumerationsGenerator.java b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaEnumerationsGenerator.java
index d969dcfc8..395903ec2 100644
--- a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaEnumerationsGenerator.java
+++ b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaEnumerationsGenerator.java
@@ -155,6 +155,7 @@ public class JavaEnumerationsGenerator extends JavaBaseGenerator {
cc = makeConst(cc);
write(" case "+cc+": return \""+c.getCode()+"\";\r\n");
}
+ write(" case NULL: return null;\r\n");
write(" default: return \"?\";\r\n");
write(" }\r\n");
write(" }\r\n");
@@ -166,6 +167,7 @@ public class JavaEnumerationsGenerator extends JavaBaseGenerator {
cc = makeConst(cc);
write(" case "+cc+": return \""+c.getSystem()+"\";\r\n");
}
+ write(" case NULL: return null;\r\n");
write(" default: return \"?\";\r\n");
write(" }\r\n");
write(" }\r\n");
@@ -177,6 +179,7 @@ public class JavaEnumerationsGenerator extends JavaBaseGenerator {
cc = makeConst(cc);
write(" case "+cc+": return \""+Utilities.escapeJava(definitions.getCodeDefinition(c.getSystem(), c.getCode()))+"\";\r\n");
}
+ write(" case NULL: return null;\r\n");
write(" default: return \"?\";\r\n");
write(" }\r\n");
write(" }\r\n");
@@ -188,6 +191,7 @@ public class JavaEnumerationsGenerator extends JavaBaseGenerator {
cc = makeConst(cc);
write(" case "+cc+": return \""+Utilities.escapeJava(Utilities.noString(c.getDisplay()) ? c.getCode() : c.getDisplay())+"\";\r\n");
}
+ write(" case NULL: return null;\r\n");
write(" default: return \"?\";\r\n");
write(" }\r\n");
write(" }\r\n");
diff --git a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaParserJsonGenerator.java b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaParserJsonGenerator.java
index 8562e8c45..94bb81b44 100644
--- a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaParserJsonGenerator.java
+++ b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaParserJsonGenerator.java
@@ -240,7 +240,7 @@ public class JavaParserJsonGenerator extends JavaBaseGenerator {
if (ed.unbounded()) {
if (isPrimitive(ed.typeSummary()) || ed.typeSummary().startsWith("canonical(")) {
parser.append(" if (json.has(\""+name+"\")) {\r\n");
- parser.append(" JsonArray array = json.getAsJsonArray(\""+name+"\");\r\n");
+ parser.append(" JsonArray array = getJArray(json, \""+name+"\");\r\n");
parser.append(" for (int i = 0; i < array.size(); i++) {\r\n");
parser.append(" if (array.get(i).isJsonNull()) {\r\n");
if (en == null) {
@@ -255,7 +255,7 @@ public class JavaParserJsonGenerator extends JavaBaseGenerator {
parser.append(" }\r\n");
parser.append(" };\r\n");
parser.append(" if (json.has(\"_"+name+"\")) {\r\n");
- parser.append(" JsonArray array = json.getAsJsonArray(\"_"+name+"\");\r\n");
+ parser.append(" JsonArray array = getJArray(json, \"_"+name+"\");\r\n");
parser.append(" for (int i = 0; i < array.size(); i++) {\r\n");
parser.append(" if (i == res.get"+upFirst(name)+"().size())\r\n");
parser.append(" res.get"+upFirst(name)+"().add("+anprsr+");\r\n");
@@ -265,7 +265,7 @@ public class JavaParserJsonGenerator extends JavaBaseGenerator {
parser.append(" };\r\n");
} else {
parser.append(" if (json.has(\""+name+"\")) {\r\n");
- parser.append(" JsonArray array = json.getAsJsonArray(\""+name+"\");\r\n");
+ parser.append(" JsonArray array = getJArray(json, \""+name+"\");\r\n");
parser.append(" for (int i = 0; i < array.size(); i++) {\r\n");
parser.append(" res.get"+upFirst(getElementName(name, false))+"().add("+aprsr+");\r\n");
parser.append(" }\r\n");
diff --git a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaResourceGenerator.java b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaResourceGenerator.java
index 4458b939e..3edd105cd 100644
--- a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaResourceGenerator.java
+++ b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaResourceGenerator.java
@@ -311,14 +311,10 @@ public class JavaResourceGenerator extends JavaBaseGenerator {
} else {
SearchParameter comp0 = definitions.getSearchParams().get(sp.getComponent().get(0).getDefinition());
SearchParameter comp1 = definitions.getSearchParams().get(sp.getComponent().get(1).getDefinition());
- if (comp0 == null) {
- throw new Error("Couldn't find composite component " + sp.getComponent().get(0).getDefinition() + " on "+analysis.getName());
+ if (comp0 != null && comp1 != null) {
+ String[] compositeOf = new String[] { comp0.getCode(), comp1.getCode() };
+ writeSearchParameterField(analysis.getName(), clss, analysis.isAbstract(), sp, sp.getCode(), compositeOf, analysis.getSearchParams(), analysis.getName());
}
- if (comp1 == null) {
- throw new Error("Couldn't find composite component " + sp.getComponent().get(1).getDefinition() + " on "+analysis.getName());
- }
- String[] compositeOf = new String[] { comp0.getCode(), comp1.getCode() };
- writeSearchParameterField(analysis.getName(), clss, analysis.isAbstract(), sp, sp.getCode(), compositeOf, analysis.getSearchParams(), analysis.getName());
}
} else if (code.contains("[x]")) {
/*
@@ -333,7 +329,7 @@ public class JavaResourceGenerator extends JavaBaseGenerator {
}
if (config.getAdornments().containsKey(analysis.getClassName())) {
- write("// Manual code (from Configuration.txt)t:\r\n");
+ write("// Manual code (from Configuration.txt):\r\n");
write(config.getAdornments().get(analysis.getClassName())+"\r\n");
write("// end addition\r\n");
}
diff --git a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/engine/DefinitionsLoader.java b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/engine/DefinitionsLoader.java
index 2072038a5..78a91c589 100644
--- a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/engine/DefinitionsLoader.java
+++ b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/engine/DefinitionsLoader.java
@@ -4,6 +4,8 @@ import java.io.IOException;
import org.hl7.fhir.exceptions.FHIRFormatError;
import org.hl7.fhir.r5.formats.JsonParser;
+import org.hl7.fhir.r5.model.Bundle;
+import org.hl7.fhir.r5.model.Bundle.BundleEntryComponent;
import org.hl7.fhir.r5.model.CapabilityStatement;
import org.hl7.fhir.r5.model.CodeSystem;
import org.hl7.fhir.r5.model.CompartmentDefinition;
@@ -13,6 +15,7 @@ import org.hl7.fhir.r5.model.Resource;
import org.hl7.fhir.r5.model.SearchParameter;
import org.hl7.fhir.r5.model.StructureDefinition;
import org.hl7.fhir.r5.model.ValueSet;
+import org.hl7.fhir.utilities.Utilities;
import org.hl7.fhir.utilities.npm.NpmPackage;
import org.hl7.fhir.utilities.npm.ToolsVersion;
@@ -45,6 +48,29 @@ public class DefinitionsLoader {
for (String t : npm.listResources("CompartmentDefinition")) {
res.getCompartments().see((CompartmentDefinition) load(npm, t), null);
}
+ Bundle bnd = (Bundle) load(npm, "Bundle-searchParams.json");
+ if (bnd != null) {
+ for (BundleEntryComponent be : bnd.getEntry()) {
+ Resource r = be.getResource();
+ if (r instanceof CodeSystem) {
+ res.getCodeSystems().see((CodeSystem) r, null);
+ } else if (r instanceof ValueSet) {
+ res.getValuesets().see((ValueSet) r, null);
+ } else if (r instanceof ConceptMap) {
+ res.getConceptMaps().see((ConceptMap) r, null);
+ } else if (r instanceof CapabilityStatement) {
+ res.getStatements().see((CapabilityStatement) r, null);
+ } else if (r instanceof StructureDefinition) {
+ res.getStructures().see((StructureDefinition) r, null);
+ } else if (r instanceof OperationDefinition) {
+ res.getOperations().see((OperationDefinition) r, null);
+ } else if (r instanceof SearchParameter) {
+ res.getSearchParams().see((SearchParameter) r, null);
+ } else if (r instanceof CompartmentDefinition) {
+ res.getCompartments().see((CompartmentDefinition) r, null);
+ }
+ }
+ }
return res;
}
@@ -52,7 +78,9 @@ public class DefinitionsLoader {
try {
return new JsonParser().parse(npm.loadResource(t));
} catch (Exception e) {
- throw new Error("Error reading "+t+": "+e.getMessage(), e);
+ System.out.println("Error reading "+t+": "+e.getMessage());
+ e.printStackTrace();
+ return null;
}
}
}
\ No newline at end of file
diff --git a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/engine/JavaCoreGenerator.java b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/engine/JavaCoreGenerator.java
index e24a8ac84..cdf721684 100644
--- a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/engine/JavaCoreGenerator.java
+++ b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/engine/JavaCoreGenerator.java
@@ -53,7 +53,6 @@ public class JavaCoreGenerator {
new JavaCoreGenerator().generate(version, src, dest);
}
}
-
private void generate(String version, String src, String dest) throws Exception {
long start = System.currentTimeMillis();
@@ -65,7 +64,6 @@ public class JavaCoreGenerator {
String pid = "r5";
String jid = "r5";
-
FilesystemPackageCacheManager pcm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION);
System.out.println("Cache: "+pcm.getFolder());
System.out.println("Load hl7.fhir."+pid+".core");
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
index 4826c9e85..8590bcab8 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
@@ -863,12 +863,14 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
if (options.isUseClient()) {
// ok, first we try to validate locally
try {
- ValueSetCheckerSimple vsc = new ValueSetCheckerSimple(options, vs, this);
- res = vsc.validateCode(code);
- if (txCache != null) {
- txCache.cacheValidation(cacheToken, res, TerminologyCache.TRANSIENT);
+ ValueSetCheckerSimple vsc = new ValueSetCheckerSimple(options, vs, this);
+ if (!vsc.isServerSide(code.getSystem())) {
+ res = vsc.validateCode(code);
+ if (txCache != null) {
+ txCache.cacheValidation(cacheToken, res, TerminologyCache.TRANSIENT);
+ }
+ return res;
}
- return res;
} catch (Exception e) {
}
}
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/CanonicalResourceManager.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/CanonicalResourceManager.java
index d9893d099..efa9d4619 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/CanonicalResourceManager.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/CanonicalResourceManager.java
@@ -204,11 +204,13 @@ public class CanonicalResourceManager {
}
public void see(T r, PackageVersion packgeInfo) {
- if (!r.hasId()) {
- r.setId(UUID.randomUUID().toString());
+ if (r != null) {
+ if (!r.hasId()) {
+ r.setId(UUID.randomUUID().toString());
+ }
+ CanonicalResourceManager.CachedCanonicalResource cr = new CachedCanonicalResource(r, packgeInfo);
+ see(cr);
}
- CanonicalResourceManager.CachedCanonicalResource cr = new CachedCanonicalResource(r, packgeInfo);
- see(cr);
}
public void see(CachedCanonicalResource cr) {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParser.java
index 467fea529..c64b1c53d 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParser.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParser.java
@@ -2,8 +2,6 @@ package org.hl7.fhir.r5.formats;
// generated
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -32,7 +30,7 @@ package org.hl7.fhir.r5.formats;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Fri, Aug 21, 2020 14:46+1000 for FHIR v4.5.0
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
@@ -183,7 +181,7 @@ public class JsonParser extends JsonParserBase {
protected void parseBackboneElementProperties(JsonObject json, BackboneElement res) throws IOException, FHIRFormatError {
parseElementProperties(json, res);
if (json.has("modifierExtension")) {
- JsonArray array = json.getAsJsonArray("modifierExtension");
+ JsonArray array = getJArray(json, "modifierExtension");
for (int i = 0; i < array.size(); i++) {
res.getModifierExtension().add(parseExtension(array.get(i).getAsJsonObject()));
}
@@ -193,7 +191,7 @@ public class JsonParser extends JsonParserBase {
protected void parseBackboneTypeProperties(JsonObject json, BackboneType res) throws IOException, FHIRFormatError {
parseDataTypeProperties(json, res);
if (json.has("modifierExtension")) {
- JsonArray array = json.getAsJsonArray("modifierExtension");
+ JsonArray array = getJArray(json, "modifierExtension");
for (int i = 0; i < array.size(); i++) {
res.getModifierExtension().add(parseExtension(array.get(i).getAsJsonObject()));
}
@@ -211,7 +209,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_id"))
parseElementProperties(getJObject(json, "_id"), res.getIdElement());
if (json.has("extension")) {
- JsonArray array = json.getAsJsonArray("extension");
+ JsonArray array = getJArray(json, "extension");
for (int i = 0; i < array.size(); i++) {
res.getExtension().add(parseExtension(array.get(i).getAsJsonObject()));
}
@@ -239,7 +237,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_text"))
parseElementProperties(getJObject(json, "_text"), res.getTextElement());
if (json.has("line")) {
- JsonArray array = json.getAsJsonArray("line");
+ JsonArray array = getJArray(json, "line");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getLine().add(new StringType());
@@ -249,7 +247,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_line")) {
- JsonArray array = json.getAsJsonArray("_line");
+ JsonArray array = getJArray(json, "_line");
for (int i = 0; i < array.size(); i++) {
if (i == res.getLine().size())
res.getLine().add(parseString(null));
@@ -383,7 +381,7 @@ public class JsonParser extends JsonParserBase {
protected void parseCodeableConceptProperties(JsonObject json, CodeableConcept res) throws IOException, FHIRFormatError {
parseDataTypeProperties(json, res);
if (json.has("coding")) {
- JsonArray array = json.getAsJsonArray("coding");
+ JsonArray array = getJArray(json, "coding");
for (int i = 0; i < array.size(); i++) {
res.getCoding().add(parseCoding(array.get(i).getAsJsonObject()));
}
@@ -451,7 +449,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_name"))
parseElementProperties(getJObject(json, "_name"), res.getNameElement());
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
@@ -503,7 +501,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_name"))
parseElementProperties(getJObject(json, "_name"), res.getNameElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -533,7 +531,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_type"))
parseElementProperties(getJObject(json, "_type"), res.getTypeElement());
if (json.has("profile")) {
- JsonArray array = json.getAsJsonArray("profile");
+ JsonArray array = getJArray(json, "profile");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getProfile().add(new CanonicalType());
@@ -543,7 +541,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_profile")) {
- JsonArray array = json.getAsJsonArray("_profile");
+ JsonArray array = getJArray(json, "_profile");
for (int i = 0; i < array.size(); i++) {
if (i == res.getProfile().size())
res.getProfile().add(parseCanonical(null));
@@ -555,7 +553,7 @@ public class JsonParser extends JsonParserBase {
if (subject != null)
res.setSubject(subject);
if (json.has("mustSupport")) {
- JsonArray array = json.getAsJsonArray("mustSupport");
+ JsonArray array = getJArray(json, "mustSupport");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getMustSupport().add(new StringType());
@@ -565,7 +563,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_mustSupport")) {
- JsonArray array = json.getAsJsonArray("_mustSupport");
+ JsonArray array = getJArray(json, "_mustSupport");
for (int i = 0; i < array.size(); i++) {
if (i == res.getMustSupport().size())
res.getMustSupport().add(parseString(null));
@@ -574,13 +572,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("codeFilter")) {
- JsonArray array = json.getAsJsonArray("codeFilter");
+ JsonArray array = getJArray(json, "codeFilter");
for (int i = 0; i < array.size(); i++) {
res.getCodeFilter().add(parseDataRequirementCodeFilterComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("dateFilter")) {
- JsonArray array = json.getAsJsonArray("dateFilter");
+ JsonArray array = getJArray(json, "dateFilter");
for (int i = 0; i < array.size(); i++) {
res.getDateFilter().add(parseDataRequirementDateFilterComponent(array.get(i).getAsJsonObject()));
}
@@ -590,7 +588,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_limit"))
parseElementProperties(getJObject(json, "_limit"), res.getLimitElement());
if (json.has("sort")) {
- JsonArray array = json.getAsJsonArray("sort");
+ JsonArray array = getJArray(json, "sort");
for (int i = 0; i < array.size(); i++) {
res.getSort().add(parseDataRequirementSortComponent(array.get(i).getAsJsonObject()));
}
@@ -618,7 +616,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_valueSet"))
parseElementProperties(getJObject(json, "_valueSet"), res.getValueSetElement());
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseCoding(array.get(i).getAsJsonObject()));
}
@@ -691,7 +689,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_text"))
parseElementProperties(getJObject(json, "_text"), res.getTextElement());
if (json.has("additionalInstruction")) {
- JsonArray array = json.getAsJsonArray("additionalInstruction");
+ JsonArray array = getJArray(json, "additionalInstruction");
for (int i = 0; i < array.size(); i++) {
res.getAdditionalInstruction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -712,7 +710,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("method"))
res.setMethod(parseCodeableConcept(getJObject(json, "method")));
if (json.has("doseAndRate")) {
- JsonArray array = json.getAsJsonArray("doseAndRate");
+ JsonArray array = getJArray(json, "doseAndRate");
for (int i = 0; i < array.size(); i++) {
res.getDoseAndRate().add(parseDosageDoseAndRateComponent(array.get(i).getAsJsonObject()));
}
@@ -766,7 +764,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_path"))
parseElementProperties(getJObject(json, "_path"), res.getPathElement());
if (json.has("representation")) {
- JsonArray array = json.getAsJsonArray("representation");
+ JsonArray array = getJArray(json, "representation");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getRepresentation().add(new Enumeration(new ElementDefinition.PropertyRepresentationEnumFactory(), ElementDefinition.PropertyRepresentation.NULL));
@@ -776,7 +774,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_representation")) {
- JsonArray array = json.getAsJsonArray("_representation");
+ JsonArray array = getJArray(json, "_representation");
for (int i = 0; i < array.size(); i++) {
if (i == res.getRepresentation().size())
res.getRepresentation().add(parseEnumeration(null, ElementDefinition.PropertyRepresentation.NULL, new ElementDefinition.PropertyRepresentationEnumFactory()));
@@ -797,7 +795,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_label"))
parseElementProperties(getJObject(json, "_label"), res.getLabelElement());
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseCoding(array.get(i).getAsJsonObject()));
}
@@ -821,7 +819,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_requirements"))
parseElementProperties(getJObject(json, "_requirements"), res.getRequirementsElement());
if (json.has("alias")) {
- JsonArray array = json.getAsJsonArray("alias");
+ JsonArray array = getJArray(json, "alias");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getAlias().add(new StringType());
@@ -831,7 +829,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_alias")) {
- JsonArray array = json.getAsJsonArray("_alias");
+ JsonArray array = getJArray(json, "_alias");
for (int i = 0; i < array.size(); i++) {
if (i == res.getAlias().size())
res.getAlias().add(parseString(null));
@@ -854,7 +852,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_contentReference"))
parseElementProperties(getJObject(json, "_contentReference"), res.getContentReferenceElement());
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseElementDefinitionTypeRefComponent(array.get(i).getAsJsonObject()));
}
@@ -877,7 +875,7 @@ public class JsonParser extends JsonParserBase {
if (pattern != null)
res.setPattern(pattern);
if (json.has("example")) {
- JsonArray array = json.getAsJsonArray("example");
+ JsonArray array = getJArray(json, "example");
for (int i = 0; i < array.size(); i++) {
res.getExample().add(parseElementDefinitionExampleComponent(array.get(i).getAsJsonObject()));
}
@@ -893,7 +891,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_maxLength"))
parseElementProperties(getJObject(json, "_maxLength"), res.getMaxLengthElement());
if (json.has("condition")) {
- JsonArray array = json.getAsJsonArray("condition");
+ JsonArray array = getJArray(json, "condition");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getCondition().add(new IdType());
@@ -903,7 +901,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_condition")) {
- JsonArray array = json.getAsJsonArray("_condition");
+ JsonArray array = getJArray(json, "_condition");
for (int i = 0; i < array.size(); i++) {
if (i == res.getCondition().size())
res.getCondition().add(parseId(null));
@@ -912,7 +910,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("constraint")) {
- JsonArray array = json.getAsJsonArray("constraint");
+ JsonArray array = getJArray(json, "constraint");
for (int i = 0; i < array.size(); i++) {
res.getConstraint().add(parseElementDefinitionConstraintComponent(array.get(i).getAsJsonObject()));
}
@@ -936,7 +934,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("binding"))
res.setBinding(parseElementDefinitionBindingComponent(getJObject(json, "binding")));
if (json.has("mapping")) {
- JsonArray array = json.getAsJsonArray("mapping");
+ JsonArray array = getJArray(json, "mapping");
for (int i = 0; i < array.size(); i++) {
res.getMapping().add(parseElementDefinitionMappingComponent(array.get(i).getAsJsonObject()));
}
@@ -952,7 +950,7 @@ public class JsonParser extends JsonParserBase {
protected void parseElementDefinitionSlicingComponentProperties(JsonObject json, ElementDefinition.ElementDefinitionSlicingComponent res) throws IOException, FHIRFormatError {
parseElementProperties(json, res);
if (json.has("discriminator")) {
- JsonArray array = json.getAsJsonArray("discriminator");
+ JsonArray array = getJArray(json, "discriminator");
for (int i = 0; i < array.size(); i++) {
res.getDiscriminator().add(parseElementDefinitionSlicingDiscriminatorComponent(array.get(i).getAsJsonObject()));
}
@@ -1024,7 +1022,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_code"))
parseElementProperties(getJObject(json, "_code"), res.getCodeElement());
if (json.has("profile")) {
- JsonArray array = json.getAsJsonArray("profile");
+ JsonArray array = getJArray(json, "profile");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getProfile().add(new CanonicalType());
@@ -1034,7 +1032,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_profile")) {
- JsonArray array = json.getAsJsonArray("_profile");
+ JsonArray array = getJArray(json, "_profile");
for (int i = 0; i < array.size(); i++) {
if (i == res.getProfile().size())
res.getProfile().add(parseCanonical(null));
@@ -1043,7 +1041,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("targetProfile")) {
- JsonArray array = json.getAsJsonArray("targetProfile");
+ JsonArray array = getJArray(json, "targetProfile");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getTargetProfile().add(new CanonicalType());
@@ -1053,7 +1051,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_targetProfile")) {
- JsonArray array = json.getAsJsonArray("_targetProfile");
+ JsonArray array = getJArray(json, "_targetProfile");
for (int i = 0; i < array.size(); i++) {
if (i == res.getTargetProfile().size())
res.getTargetProfile().add(parseCanonical(null));
@@ -1062,7 +1060,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("aggregation")) {
- JsonArray array = json.getAsJsonArray("aggregation");
+ JsonArray array = getJArray(json, "aggregation");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getAggregation().add(new Enumeration(new ElementDefinition.AggregationModeEnumFactory(), ElementDefinition.AggregationMode.NULL));
@@ -1072,7 +1070,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_aggregation")) {
- JsonArray array = json.getAsJsonArray("_aggregation");
+ JsonArray array = getJArray(json, "_aggregation");
for (int i = 0; i < array.size(); i++) {
if (i == res.getAggregation().size())
res.getAggregation().add(parseEnumeration(null, ElementDefinition.AggregationMode.NULL, new ElementDefinition.AggregationModeEnumFactory()));
@@ -1257,7 +1255,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_family"))
parseElementProperties(getJObject(json, "_family"), res.getFamilyElement());
if (json.has("given")) {
- JsonArray array = json.getAsJsonArray("given");
+ JsonArray array = getJArray(json, "given");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getGiven().add(new StringType());
@@ -1267,7 +1265,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_given")) {
- JsonArray array = json.getAsJsonArray("_given");
+ JsonArray array = getJArray(json, "_given");
for (int i = 0; i < array.size(); i++) {
if (i == res.getGiven().size())
res.getGiven().add(parseString(null));
@@ -1276,7 +1274,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("prefix")) {
- JsonArray array = json.getAsJsonArray("prefix");
+ JsonArray array = getJArray(json, "prefix");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPrefix().add(new StringType());
@@ -1286,7 +1284,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_prefix")) {
- JsonArray array = json.getAsJsonArray("_prefix");
+ JsonArray array = getJArray(json, "_prefix");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPrefix().size())
res.getPrefix().add(parseString(null));
@@ -1295,7 +1293,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("suffix")) {
- JsonArray array = json.getAsJsonArray("suffix");
+ JsonArray array = getJArray(json, "suffix");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSuffix().add(new StringType());
@@ -1305,7 +1303,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_suffix")) {
- JsonArray array = json.getAsJsonArray("_suffix");
+ JsonArray array = getJArray(json, "_suffix");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSuffix().size())
res.getSuffix().add(parseString(null));
@@ -1388,7 +1386,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_source"))
parseElementProperties(getJObject(json, "_source"), res.getSourceElement());
if (json.has("profile")) {
- JsonArray array = json.getAsJsonArray("profile");
+ JsonArray array = getJArray(json, "profile");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getProfile().add(new CanonicalType());
@@ -1398,7 +1396,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_profile")) {
- JsonArray array = json.getAsJsonArray("_profile");
+ JsonArray array = getJArray(json, "_profile");
for (int i = 0; i < array.size(); i++) {
if (i == res.getProfile().size())
res.getProfile().add(parseCanonical(null));
@@ -1407,13 +1405,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("security")) {
- JsonArray array = json.getAsJsonArray("security");
+ JsonArray array = getJArray(json, "security");
for (int i = 0; i < array.size(); i++) {
res.getSecurity().add(parseCoding(array.get(i).getAsJsonObject()));
}
};
if (json.has("tag")) {
- JsonArray array = json.getAsJsonArray("tag");
+ JsonArray array = getJArray(json, "tag");
for (int i = 0; i < array.size(); i++) {
res.getTag().add(parseCoding(array.get(i).getAsJsonObject()));
}
@@ -1467,7 +1465,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -1479,7 +1477,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("bottomOfFirstInterval"))
res.setBottomOfFirstInterval(parseQuantity(getJObject(json, "bottomOfFirstInterval")));
if (json.has("interval")) {
- JsonArray array = json.getAsJsonArray("interval");
+ JsonArray array = getJArray(json, "interval");
for (int i = 0; i < array.size(); i++) {
res.getInterval().add(parseOrderedDistributionIntervalComponent(array.get(i).getAsJsonObject()));
}
@@ -1501,7 +1499,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_rankOrder"))
parseElementProperties(getJObject(json, "_rankOrder"), res.getRankOrderElement());
if (json.has("intervalStatistic")) {
- JsonArray array = json.getAsJsonArray("intervalStatistic");
+ JsonArray array = getJArray(json, "intervalStatistic");
for (int i = 0; i < array.size(); i++) {
res.getIntervalStatistic().add(parseStatistic(array.get(i).getAsJsonObject()));
}
@@ -1608,7 +1606,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_shape"))
parseElementProperties(getJObject(json, "_shape"), res.getShapeElement());
if (json.has("color")) {
- JsonArray array = json.getAsJsonArray("color");
+ JsonArray array = getJArray(json, "color");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getColor().add(new StringType());
@@ -1618,7 +1616,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_color")) {
- JsonArray array = json.getAsJsonArray("_color");
+ JsonArray array = getJArray(json, "_color");
for (int i = 0; i < array.size(); i++) {
if (i == res.getColor().size())
res.getColor().add(parseString(null));
@@ -1627,7 +1625,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("imprint")) {
- JsonArray array = json.getAsJsonArray("imprint");
+ JsonArray array = getJArray(json, "imprint");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getImprint().add(new StringType());
@@ -1637,7 +1635,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_imprint")) {
- JsonArray array = json.getAsJsonArray("_imprint");
+ JsonArray array = getJArray(json, "_imprint");
for (int i = 0; i < array.size(); i++) {
if (i == res.getImprint().size())
res.getImprint().add(parseString(null));
@@ -1646,7 +1644,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("image")) {
- JsonArray array = json.getAsJsonArray("image");
+ JsonArray array = getJArray(json, "image");
for (int i = 0; i < array.size(); i++) {
res.getImage().add(parseAttachment(array.get(i).getAsJsonObject()));
}
@@ -1669,7 +1667,7 @@ public class JsonParser extends JsonParserBase {
if (period != null)
res.setPeriod(period);
if (json.has("specialPrecautionsForStorage")) {
- JsonArray array = json.getAsJsonArray("specialPrecautionsForStorage");
+ JsonArray array = getJArray(json, "specialPrecautionsForStorage");
for (int i = 0; i < array.size(); i++) {
res.getSpecialPrecautionsForStorage().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -1734,6 +1732,22 @@ public class JsonParser extends JsonParserBase {
res.setDenominator(parseQuantity(getJObject(json, "denominator")));
}
+ protected RatioRange parseRatioRange(JsonObject json) throws IOException, FHIRFormatError {
+ RatioRange res = new RatioRange();
+ parseRatioRangeProperties(json, res);
+ return res;
+ }
+
+ protected void parseRatioRangeProperties(JsonObject json, RatioRange res) throws IOException, FHIRFormatError {
+ parseDataTypeProperties(json, res);
+ if (json.has("lowNumerator"))
+ res.setLowNumerator(parseQuantity(getJObject(json, "lowNumerator")));
+ if (json.has("highNumerator"))
+ res.setHighNumerator(parseQuantity(getJObject(json, "highNumerator")));
+ if (json.has("denominator"))
+ res.setDenominator(parseQuantity(getJObject(json, "denominator")));
+ }
+
protected Reference parseReference(JsonObject json) throws IOException, FHIRFormatError {
Reference res = new Reference();
parseReferenceProperties(json, res);
@@ -1839,7 +1853,7 @@ public class JsonParser extends JsonParserBase {
protected void parseSignatureProperties(JsonObject json, Signature res) throws IOException, FHIRFormatError {
parseDataTypeProperties(json, res);
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCoding(array.get(i).getAsJsonObject()));
}
@@ -1879,29 +1893,35 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("statisticType"))
res.setStatisticType(parseCodeableConcept(getJObject(json, "statisticType")));
+ if (json.has("category"))
+ res.setCategory(parseCodeableConcept(getJObject(json, "category")));
if (json.has("quantity"))
res.setQuantity(parseQuantity(getJObject(json, "quantity")));
if (json.has("numberOfEvents"))
- res.setNumberOfEventsElement(parseInteger(json.get("numberOfEvents").getAsLong()));
+ res.setNumberOfEventsElement(parseUnsignedInt(json.get("numberOfEvents").getAsString()));
if (json.has("_numberOfEvents"))
parseElementProperties(getJObject(json, "_numberOfEvents"), res.getNumberOfEventsElement());
+ if (json.has("numberAffected"))
+ res.setNumberAffectedElement(parseUnsignedInt(json.get("numberAffected").getAsString()));
+ if (json.has("_numberAffected"))
+ parseElementProperties(getJObject(json, "_numberAffected"), res.getNumberAffectedElement());
if (json.has("sampleSize"))
res.setSampleSize(parseStatisticSampleSizeComponent(getJObject(json, "sampleSize")));
if (json.has("attributeEstimate")) {
- JsonArray array = json.getAsJsonArray("attributeEstimate");
+ JsonArray array = getJArray(json, "attributeEstimate");
for (int i = 0; i < array.size(); i++) {
res.getAttributeEstimate().add(parseStatisticAttributeEstimateComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("modelCharacteristic")) {
- JsonArray array = json.getAsJsonArray("modelCharacteristic");
+ JsonArray array = getJArray(json, "modelCharacteristic");
for (int i = 0; i < array.size(); i++) {
res.getModelCharacteristic().add(parseStatisticModelCharacteristicComponent(array.get(i).getAsJsonObject()));
}
@@ -1921,21 +1941,21 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("numberOfStudies"))
- res.setNumberOfStudiesElement(parseInteger(json.get("numberOfStudies").getAsLong()));
+ res.setNumberOfStudiesElement(parseUnsignedInt(json.get("numberOfStudies").getAsString()));
if (json.has("_numberOfStudies"))
parseElementProperties(getJObject(json, "_numberOfStudies"), res.getNumberOfStudiesElement());
if (json.has("numberOfParticipants"))
- res.setNumberOfParticipantsElement(parseInteger(json.get("numberOfParticipants").getAsLong()));
+ res.setNumberOfParticipantsElement(parseUnsignedInt(json.get("numberOfParticipants").getAsString()));
if (json.has("_numberOfParticipants"))
parseElementProperties(getJObject(json, "_numberOfParticipants"), res.getNumberOfParticipantsElement());
if (json.has("knownDataCount"))
- res.setKnownDataCountElement(parseInteger(json.get("knownDataCount").getAsLong()));
+ res.setKnownDataCountElement(parseUnsignedInt(json.get("knownDataCount").getAsString()));
if (json.has("_knownDataCount"))
parseElementProperties(getJObject(json, "_knownDataCount"), res.getKnownDataCountElement());
}
@@ -1953,7 +1973,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -1969,7 +1989,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("range"))
res.setRange(parseRange(getJObject(json, "range")));
if (json.has("attributeEstimate")) {
- JsonArray array = json.getAsJsonArray("attributeEstimate");
+ JsonArray array = getJArray(json, "attributeEstimate");
for (int i = 0; i < array.size(); i++) {
res.getAttributeEstimate().add(parseStatisticAttributeEstimateAttributeEstimateComponent(array.get(i).getAsJsonObject()));
}
@@ -1989,7 +2009,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -2016,11 +2036,10 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(json, res);
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
- DataType value = parseType("value", json);
- if (value != null)
- res.setValue(value);
+ if (json.has("value"))
+ res.setValue(parseQuantity(getJObject(json, "value")));
if (json.has("variable")) {
- JsonArray array = json.getAsJsonArray("variable");
+ JsonArray array = getJArray(json, "variable");
for (int i = 0; i < array.size(); i++) {
res.getVariable().add(parseStatisticModelCharacteristicVariableComponent(array.get(i).getAsJsonObject()));
}
@@ -2042,19 +2061,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_handling"))
parseElementProperties(getJObject(json, "_handling"), res.getHandlingElement());
if (json.has("valueCategory")) {
- JsonArray array = json.getAsJsonArray("valueCategory");
+ JsonArray array = getJArray(json, "valueCategory");
for (int i = 0; i < array.size(); i++) {
res.getValueCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("valueQuantity")) {
- JsonArray array = json.getAsJsonArray("valueQuantity");
+ JsonArray array = getJArray(json, "valueQuantity");
for (int i = 0; i < array.size(); i++) {
res.getValueQuantity().add(parseQuantity(array.get(i).getAsJsonObject()));
}
};
if (json.has("valueRange")) {
- JsonArray array = json.getAsJsonArray("valueRange");
+ JsonArray array = getJArray(json, "valueRange");
for (int i = 0; i < array.size(); i++) {
res.getValueRange().add(parseRange(array.get(i).getAsJsonObject()));
}
@@ -2070,7 +2089,7 @@ public class JsonParser extends JsonParserBase {
protected void parseTimingProperties(JsonObject json, Timing res) throws IOException, FHIRFormatError {
parseBackboneTypeProperties(json, res);
if (json.has("event")) {
- JsonArray array = json.getAsJsonArray("event");
+ JsonArray array = getJArray(json, "event");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getEvent().add(new DateTimeType());
@@ -2080,7 +2099,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_event")) {
- JsonArray array = json.getAsJsonArray("_event");
+ JsonArray array = getJArray(json, "_event");
for (int i = 0; i < array.size(); i++) {
if (i == res.getEvent().size())
res.getEvent().add(parseDateTime(null));
@@ -2146,7 +2165,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_periodUnit"))
parseElementProperties(getJObject(json, "_periodUnit"), res.getPeriodUnitElement());
if (json.has("dayOfWeek")) {
- JsonArray array = json.getAsJsonArray("dayOfWeek");
+ JsonArray array = getJArray(json, "dayOfWeek");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDayOfWeek().add(new Enumeration(new Enumerations.DaysOfWeekEnumFactory(), Enumerations.DaysOfWeek.NULL));
@@ -2156,7 +2175,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_dayOfWeek")) {
- JsonArray array = json.getAsJsonArray("_dayOfWeek");
+ JsonArray array = getJArray(json, "_dayOfWeek");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDayOfWeek().size())
res.getDayOfWeek().add(parseEnumeration(null, Enumerations.DaysOfWeek.NULL, new Enumerations.DaysOfWeekEnumFactory()));
@@ -2165,7 +2184,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("timeOfDay")) {
- JsonArray array = json.getAsJsonArray("timeOfDay");
+ JsonArray array = getJArray(json, "timeOfDay");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getTimeOfDay().add(new TimeType());
@@ -2175,7 +2194,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_timeOfDay")) {
- JsonArray array = json.getAsJsonArray("_timeOfDay");
+ JsonArray array = getJArray(json, "_timeOfDay");
for (int i = 0; i < array.size(); i++) {
if (i == res.getTimeOfDay().size())
res.getTimeOfDay().add(parseTime(null));
@@ -2184,7 +2203,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("when")) {
- JsonArray array = json.getAsJsonArray("when");
+ JsonArray array = getJArray(json, "when");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getWhen().add(new Enumeration(new Timing.EventTimingEnumFactory(), Timing.EventTiming.NULL));
@@ -2194,7 +2213,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_when")) {
- JsonArray array = json.getAsJsonArray("_when");
+ JsonArray array = getJArray(json, "_when");
for (int i = 0; i < array.size(); i++) {
if (i == res.getWhen().size())
res.getWhen().add(parseEnumeration(null, Timing.EventTiming.NULL, new Timing.EventTimingEnumFactory()));
@@ -2228,7 +2247,7 @@ public class JsonParser extends JsonParserBase {
if (timing != null)
res.setTiming(timing);
if (json.has("data")) {
- JsonArray array = json.getAsJsonArray("data");
+ JsonArray array = getJArray(json, "data");
for (int i = 0; i < array.size(); i++) {
res.getData().add(parseDataRequirement(array.get(i).getAsJsonObject()));
}
@@ -2261,19 +2280,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("text"))
res.setText(parseNarrative(getJObject(json, "text")));
if (json.has("contained")) {
- JsonArray array = json.getAsJsonArray("contained");
+ JsonArray array = getJArray(json, "contained");
for (int i = 0; i < array.size(); i++) {
res.getContained().add(parseResource(array.get(i).getAsJsonObject()));
}
};
if (json.has("extension")) {
- JsonArray array = json.getAsJsonArray("extension");
+ JsonArray array = getJArray(json, "extension");
for (int i = 0; i < array.size(); i++) {
res.getExtension().add(parseExtension(array.get(i).getAsJsonObject()));
}
};
if (json.has("modifierExtension")) {
- JsonArray array = json.getAsJsonArray("modifierExtension");
+ JsonArray array = getJArray(json, "modifierExtension");
for (int i = 0; i < array.size(); i++) {
res.getModifierExtension().add(parseExtension(array.get(i).getAsJsonObject()));
}
@@ -2311,7 +2330,7 @@ public class JsonParser extends JsonParserBase {
protected void parseAccountProperties(JsonObject json, Account res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -2327,7 +2346,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_name"))
parseElementProperties(getJObject(json, "_name"), res.getNameElement());
if (json.has("subject")) {
- JsonArray array = json.getAsJsonArray("subject");
+ JsonArray array = getJArray(json, "subject");
for (int i = 0; i < array.size(); i++) {
res.getSubject().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -2335,7 +2354,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("servicePeriod"))
res.setServicePeriod(parsePeriod(getJObject(json, "servicePeriod")));
if (json.has("coverage")) {
- JsonArray array = json.getAsJsonArray("coverage");
+ JsonArray array = getJArray(json, "coverage");
for (int i = 0; i < array.size(); i++) {
res.getCoverage().add(parseAccountCoverageComponent(array.get(i).getAsJsonObject()));
}
@@ -2347,7 +2366,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("guarantor")) {
- JsonArray array = json.getAsJsonArray("guarantor");
+ JsonArray array = getJArray(json, "guarantor");
for (int i = 0; i < array.size(); i++) {
res.getGuarantor().add(parseAccountGuarantorComponent(array.get(i).getAsJsonObject()));
}
@@ -2403,7 +2422,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -2444,7 +2463,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -2454,13 +2473,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -2488,43 +2507,43 @@ public class JsonParser extends JsonParserBase {
if (json.has("effectivePeriod"))
res.setEffectivePeriod(parsePeriod(getJObject(json, "effectivePeriod")));
if (json.has("topic")) {
- JsonArray array = json.getAsJsonArray("topic");
+ JsonArray array = getJArray(json, "topic");
for (int i = 0; i < array.size(); i++) {
res.getTopic().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("editor")) {
- JsonArray array = json.getAsJsonArray("editor");
+ JsonArray array = getJArray(json, "editor");
for (int i = 0; i < array.size(); i++) {
res.getEditor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("reviewer")) {
- JsonArray array = json.getAsJsonArray("reviewer");
+ JsonArray array = getJArray(json, "reviewer");
for (int i = 0; i < array.size(); i++) {
res.getReviewer().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("endorser")) {
- JsonArray array = json.getAsJsonArray("endorser");
+ JsonArray array = getJArray(json, "endorser");
for (int i = 0; i < array.size(); i++) {
res.getEndorser().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedArtifact")) {
- JsonArray array = json.getAsJsonArray("relatedArtifact");
+ JsonArray array = getJArray(json, "relatedArtifact");
for (int i = 0; i < array.size(); i++) {
res.getRelatedArtifact().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
}
};
if (json.has("library")) {
- JsonArray array = json.getAsJsonArray("library");
+ JsonArray array = getJArray(json, "library");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getLibrary().add(new CanonicalType());
@@ -2534,7 +2553,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_library")) {
- JsonArray array = json.getAsJsonArray("_library");
+ JsonArray array = getJArray(json, "_library");
for (int i = 0; i < array.size(); i++) {
if (i == res.getLibrary().size())
res.getLibrary().add(parseCanonical(null));
@@ -2568,9 +2587,9 @@ public class JsonParser extends JsonParserBase {
if (timing != null)
res.setTiming(timing);
if (json.has("location"))
- res.setLocation(parseReference(getJObject(json, "location")));
+ res.setLocation(parseCodeableReference(getJObject(json, "location")));
if (json.has("participant")) {
- JsonArray array = json.getAsJsonArray("participant");
+ JsonArray array = getJArray(json, "participant");
for (int i = 0; i < array.size(); i++) {
res.getParticipant().add(parseActivityDefinitionParticipantComponent(array.get(i).getAsJsonObject()));
}
@@ -2581,31 +2600,31 @@ public class JsonParser extends JsonParserBase {
if (json.has("quantity"))
res.setQuantity(parseQuantity(getJObject(json, "quantity")));
if (json.has("dosage")) {
- JsonArray array = json.getAsJsonArray("dosage");
+ JsonArray array = getJArray(json, "dosage");
for (int i = 0; i < array.size(); i++) {
res.getDosage().add(parseDosage(array.get(i).getAsJsonObject()));
}
};
if (json.has("bodySite")) {
- JsonArray array = json.getAsJsonArray("bodySite");
+ JsonArray array = getJArray(json, "bodySite");
for (int i = 0; i < array.size(); i++) {
res.getBodySite().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("specimenRequirement")) {
- JsonArray array = json.getAsJsonArray("specimenRequirement");
+ JsonArray array = getJArray(json, "specimenRequirement");
for (int i = 0; i < array.size(); i++) {
res.getSpecimenRequirement().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("observationRequirement")) {
- JsonArray array = json.getAsJsonArray("observationRequirement");
+ JsonArray array = getJArray(json, "observationRequirement");
for (int i = 0; i < array.size(); i++) {
res.getObservationRequirement().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("observationResultRequirement")) {
- JsonArray array = json.getAsJsonArray("observationResultRequirement");
+ JsonArray array = getJArray(json, "observationResultRequirement");
for (int i = 0; i < array.size(); i++) {
res.getObservationResultRequirement().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -2615,7 +2634,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_transform"))
parseElementProperties(getJObject(json, "_transform"), res.getTransformElement());
if (json.has("dynamicValue")) {
- JsonArray array = json.getAsJsonArray("dynamicValue");
+ JsonArray array = getJArray(json, "dynamicValue");
for (int i = 0; i < array.size(); i++) {
res.getDynamicValue().add(parseActivityDefinitionDynamicValueComponent(array.get(i).getAsJsonObject()));
}
@@ -2634,8 +2653,12 @@ public class JsonParser extends JsonParserBase {
res.setTypeElement(parseEnumeration(json.get("type").getAsString(), Enumerations.ActionParticipantType.NULL, new Enumerations.ActionParticipantTypeEnumFactory()));
if (json.has("_type"))
parseElementProperties(getJObject(json, "_type"), res.getTypeElement());
+ if (json.has("typeReference"))
+ res.setTypeReference(parseReference(getJObject(json, "typeReference")));
if (json.has("role"))
res.setRole(parseCodeableConcept(getJObject(json, "role")));
+ if (json.has("function"))
+ res.setFunction(parseCodeableConcept(getJObject(json, "function")));
}
protected ActivityDefinition.ActivityDefinitionDynamicValueComponent parseActivityDefinitionDynamicValueComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -2663,13 +2686,13 @@ public class JsonParser extends JsonParserBase {
protected void parseAdministrableProductDefinitionProperties(JsonObject json, AdministrableProductDefinition res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("subject")) {
- JsonArray array = json.getAsJsonArray("subject");
+ JsonArray array = getJArray(json, "subject");
for (int i = 0; i < array.size(); i++) {
res.getSubject().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -2679,31 +2702,31 @@ public class JsonParser extends JsonParserBase {
if (json.has("unitOfPresentation"))
res.setUnitOfPresentation(parseCodeableConcept(getJObject(json, "unitOfPresentation")));
if (json.has("producedFrom")) {
- JsonArray array = json.getAsJsonArray("producedFrom");
+ JsonArray array = getJArray(json, "producedFrom");
for (int i = 0; i < array.size(); i++) {
res.getProducedFrom().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("ingredient")) {
- JsonArray array = json.getAsJsonArray("ingredient");
+ JsonArray array = getJArray(json, "ingredient");
for (int i = 0; i < array.size(); i++) {
res.getIngredient().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("device")) {
- JsonArray array = json.getAsJsonArray("device");
+ JsonArray array = getJArray(json, "device");
for (int i = 0; i < array.size(); i++) {
res.getDevice().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("property")) {
- JsonArray array = json.getAsJsonArray("property");
+ JsonArray array = getJArray(json, "property");
for (int i = 0; i < array.size(); i++) {
res.getProperty().add(parseAdministrableProductDefinitionPropertyComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("routeOfAdministration")) {
- JsonArray array = json.getAsJsonArray("routeOfAdministration");
+ JsonArray array = getJArray(json, "routeOfAdministration");
for (int i = 0; i < array.size(); i++) {
res.getRouteOfAdministration().add(parseAdministrableProductDefinitionRouteOfAdministrationComponent(array.get(i).getAsJsonObject()));
}
@@ -2748,7 +2771,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("maxTreatmentPeriod"))
res.setMaxTreatmentPeriod(parseDuration(getJObject(json, "maxTreatmentPeriod")));
if (json.has("targetSpecies")) {
- JsonArray array = json.getAsJsonArray("targetSpecies");
+ JsonArray array = getJArray(json, "targetSpecies");
for (int i = 0; i < array.size(); i++) {
res.getTargetSpecies().add(parseAdministrableProductDefinitionRouteOfAdministrationTargetSpeciesComponent(array.get(i).getAsJsonObject()));
}
@@ -2766,7 +2789,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
if (json.has("withdrawalPeriod")) {
- JsonArray array = json.getAsJsonArray("withdrawalPeriod");
+ JsonArray array = getJArray(json, "withdrawalPeriod");
for (int i = 0; i < array.size(); i++) {
res.getWithdrawalPeriod().add(parseAdministrableProductDefinitionRouteOfAdministrationTargetSpeciesWithdrawalPeriodComponent(array.get(i).getAsJsonObject()));
}
@@ -2800,7 +2823,7 @@ public class JsonParser extends JsonParserBase {
protected void parseAdverseEventProperties(JsonObject json, AdverseEvent res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -2814,7 +2837,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_actuality"))
parseElementProperties(getJObject(json, "_actuality"), res.getActualityElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -2837,7 +2860,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_recordedDate"))
parseElementProperties(getJObject(json, "_recordedDate"), res.getRecordedDateElement());
if (json.has("resultingCondition")) {
- JsonArray array = json.getAsJsonArray("resultingCondition");
+ JsonArray array = getJArray(json, "resultingCondition");
for (int i = 0; i < array.size(); i++) {
res.getResultingCondition().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -2846,48 +2869,52 @@ public class JsonParser extends JsonParserBase {
res.setLocation(parseReference(getJObject(json, "location")));
if (json.has("seriousness"))
res.setSeriousness(parseCodeableConcept(getJObject(json, "seriousness")));
- if (json.has("outcome"))
- res.setOutcome(parseCodeableConcept(getJObject(json, "outcome")));
+ if (json.has("outcome")) {
+ JsonArray array = getJArray(json, "outcome");
+ for (int i = 0; i < array.size(); i++) {
+ res.getOutcome().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("recorder"))
res.setRecorder(parseReference(getJObject(json, "recorder")));
if (json.has("participant")) {
- JsonArray array = json.getAsJsonArray("participant");
+ JsonArray array = getJArray(json, "participant");
for (int i = 0; i < array.size(); i++) {
res.getParticipant().add(parseAdverseEventParticipantComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("suspectEntity")) {
- JsonArray array = json.getAsJsonArray("suspectEntity");
+ JsonArray array = getJArray(json, "suspectEntity");
for (int i = 0; i < array.size(); i++) {
res.getSuspectEntity().add(parseAdverseEventSuspectEntityComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("contributingFactor")) {
- JsonArray array = json.getAsJsonArray("contributingFactor");
+ JsonArray array = getJArray(json, "contributingFactor");
for (int i = 0; i < array.size(); i++) {
res.getContributingFactor().add(parseAdverseEventContributingFactorComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("preventiveAction")) {
- JsonArray array = json.getAsJsonArray("preventiveAction");
+ JsonArray array = getJArray(json, "preventiveAction");
for (int i = 0; i < array.size(); i++) {
res.getPreventiveAction().add(parseAdverseEventPreventiveActionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("mitigatingAction")) {
- JsonArray array = json.getAsJsonArray("mitigatingAction");
+ JsonArray array = getJArray(json, "mitigatingAction");
for (int i = 0; i < array.size(); i++) {
res.getMitigatingAction().add(parseAdverseEventMitigatingActionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("supportingInfo")) {
- JsonArray array = json.getAsJsonArray("supportingInfo");
+ JsonArray array = getJArray(json, "supportingInfo");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInfo().add(parseAdverseEventSupportingInfoComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("study")) {
- JsonArray array = json.getAsJsonArray("study");
+ JsonArray array = getJArray(json, "study");
for (int i = 0; i < array.size(); i++) {
res.getStudy().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -3000,7 +3027,7 @@ public class JsonParser extends JsonParserBase {
protected void parseAllergyIntoleranceProperties(JsonObject json, AllergyIntolerance res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -3014,7 +3041,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_type"))
parseElementProperties(getJObject(json, "_type"), res.getTypeElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getCategory().add(new Enumeration(new AllergyIntolerance.AllergyIntoleranceCategoryEnumFactory(), AllergyIntolerance.AllergyIntoleranceCategory.NULL));
@@ -3024,7 +3051,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_category")) {
- JsonArray array = json.getAsJsonArray("_category");
+ JsonArray array = getJArray(json, "_category");
for (int i = 0; i < array.size(); i++) {
if (i == res.getCategory().size())
res.getCategory().add(parseEnumeration(null, AllergyIntolerance.AllergyIntoleranceCategory.NULL, new AllergyIntolerance.AllergyIntoleranceCategoryEnumFactory()));
@@ -3058,13 +3085,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_lastOccurrence"))
parseElementProperties(getJObject(json, "_lastOccurrence"), res.getLastOccurrenceElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("reaction")) {
- JsonArray array = json.getAsJsonArray("reaction");
+ JsonArray array = getJArray(json, "reaction");
for (int i = 0; i < array.size(); i++) {
res.getReaction().add(parseAllergyIntoleranceReactionComponent(array.get(i).getAsJsonObject()));
}
@@ -3082,9 +3109,9 @@ public class JsonParser extends JsonParserBase {
if (json.has("substance"))
res.setSubstance(parseCodeableConcept(getJObject(json, "substance")));
if (json.has("manifestation")) {
- JsonArray array = json.getAsJsonArray("manifestation");
+ JsonArray array = getJArray(json, "manifestation");
for (int i = 0; i < array.size(); i++) {
- res.getManifestation().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ res.getManifestation().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("description"))
@@ -3102,7 +3129,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("exposureRoute"))
res.setExposureRoute(parseCodeableConcept(getJObject(json, "exposureRoute")));
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -3118,7 +3145,7 @@ public class JsonParser extends JsonParserBase {
protected void parseAppointmentProperties(JsonObject json, Appointment res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -3130,19 +3157,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("cancelationReason"))
res.setCancelationReason(parseCodeableConcept(getJObject(json, "cancelationReason")));
if (json.has("serviceCategory")) {
- JsonArray array = json.getAsJsonArray("serviceCategory");
+ JsonArray array = getJArray(json, "serviceCategory");
for (int i = 0; i < array.size(); i++) {
res.getServiceCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("serviceType")) {
- JsonArray array = json.getAsJsonArray("serviceType");
+ JsonArray array = getJArray(json, "serviceType");
for (int i = 0; i < array.size(); i++) {
res.getServiceType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("specialty")) {
- JsonArray array = json.getAsJsonArray("specialty");
+ JsonArray array = getJArray(json, "specialty");
for (int i = 0; i < array.size(); i++) {
res.getSpecialty().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -3150,21 +3177,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("appointmentType"))
res.setAppointmentType(parseCodeableConcept(getJObject(json, "appointmentType")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("priority"))
- res.setPriorityElement(parseUnsignedInt(json.get("priority").getAsString()));
- if (json.has("_priority"))
- parseElementProperties(getJObject(json, "_priority"), res.getPriorityElement());
+ res.setPriority(parseCodeableConcept(getJObject(json, "priority")));
if (json.has("description"))
res.setDescriptionElement(parseString(json.get("description").getAsString()));
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("supportingInformation")) {
- JsonArray array = json.getAsJsonArray("supportingInformation");
+ JsonArray array = getJArray(json, "supportingInformation");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInformation().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -3182,7 +3207,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_minutesDuration"))
parseElementProperties(getJObject(json, "_minutesDuration"), res.getMinutesDurationElement());
if (json.has("slot")) {
- JsonArray array = json.getAsJsonArray("slot");
+ JsonArray array = getJArray(json, "slot");
for (int i = 0; i < array.size(); i++) {
res.getSlot().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -3200,19 +3225,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_patientInstruction"))
parseElementProperties(getJObject(json, "_patientInstruction"), res.getPatientInstructionElement());
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("participant")) {
- JsonArray array = json.getAsJsonArray("participant");
+ JsonArray array = getJArray(json, "participant");
for (int i = 0; i < array.size(); i++) {
res.getParticipant().add(parseAppointmentParticipantComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("requestedPeriod")) {
- JsonArray array = json.getAsJsonArray("requestedPeriod");
+ JsonArray array = getJArray(json, "requestedPeriod");
for (int i = 0; i < array.size(); i++) {
res.getRequestedPeriod().add(parsePeriod(array.get(i).getAsJsonObject()));
}
@@ -3228,7 +3253,7 @@ public class JsonParser extends JsonParserBase {
protected void parseAppointmentParticipantComponentProperties(JsonObject json, Appointment.AppointmentParticipantComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -3256,7 +3281,7 @@ public class JsonParser extends JsonParserBase {
protected void parseAppointmentResponseProperties(JsonObject json, AppointmentResponse res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -3272,7 +3297,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_end"))
parseElementProperties(getJObject(json, "_end"), res.getEndElement());
if (json.has("participantType")) {
- JsonArray array = json.getAsJsonArray("participantType");
+ JsonArray array = getJArray(json, "participantType");
for (int i = 0; i < array.size(); i++) {
res.getParticipantType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -3300,7 +3325,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCoding(getJObject(json, "type")));
if (json.has("subtype")) {
- JsonArray array = json.getAsJsonArray("subtype");
+ JsonArray array = getJArray(json, "subtype");
for (int i = 0; i < array.size(); i++) {
res.getSubtype().add(parseCoding(array.get(i).getAsJsonObject()));
}
@@ -3322,13 +3347,21 @@ public class JsonParser extends JsonParserBase {
if (json.has("outcome"))
res.setOutcome(parseCodeableConcept(getJObject(json, "outcome")));
if (json.has("purposeOfEvent")) {
- JsonArray array = json.getAsJsonArray("purposeOfEvent");
+ JsonArray array = getJArray(json, "purposeOfEvent");
for (int i = 0; i < array.size(); i++) {
res.getPurposeOfEvent().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("basedOn")) {
+ JsonArray array = getJArray(json, "basedOn");
+ for (int i = 0; i < array.size(); i++) {
+ res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("encounter"))
+ res.setEncounter(parseReference(getJObject(json, "encounter")));
if (json.has("agent")) {
- JsonArray array = json.getAsJsonArray("agent");
+ JsonArray array = getJArray(json, "agent");
for (int i = 0; i < array.size(); i++) {
res.getAgent().add(parseAuditEventAgentComponent(array.get(i).getAsJsonObject()));
}
@@ -3336,7 +3369,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("source"))
res.setSource(parseAuditEventSourceComponent(getJObject(json, "source")));
if (json.has("entity")) {
- JsonArray array = json.getAsJsonArray("entity");
+ JsonArray array = getJArray(json, "entity");
for (int i = 0; i < array.size(); i++) {
res.getEntity().add(parseAuditEventEntityComponent(array.get(i).getAsJsonObject()));
}
@@ -3354,7 +3387,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("role")) {
- JsonArray array = json.getAsJsonArray("role");
+ JsonArray array = getJArray(json, "role");
for (int i = 0; i < array.size(); i++) {
res.getRole().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -3376,7 +3409,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("location"))
res.setLocation(parseReference(getJObject(json, "location")));
if (json.has("policy")) {
- JsonArray array = json.getAsJsonArray("policy");
+ JsonArray array = getJArray(json, "policy");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPolicy().add(new UriType());
@@ -3386,7 +3419,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_policy")) {
- JsonArray array = json.getAsJsonArray("_policy");
+ JsonArray array = getJArray(json, "_policy");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPolicy().size())
res.getPolicy().add(parseUri(null));
@@ -3399,7 +3432,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("network"))
res.setNetwork(parseAuditEventAgentNetworkComponent(getJObject(json, "network")));
if (json.has("purposeOfUse")) {
- JsonArray array = json.getAsJsonArray("purposeOfUse");
+ JsonArray array = getJArray(json, "purposeOfUse");
for (int i = 0; i < array.size(); i++) {
res.getPurposeOfUse().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -3439,7 +3472,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("observer"))
res.setObserver(parseReference(getJObject(json, "observer")));
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCoding(array.get(i).getAsJsonObject()));
}
@@ -3463,7 +3496,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("lifecycle"))
res.setLifecycle(parseCoding(getJObject(json, "lifecycle")));
if (json.has("securityLabel")) {
- JsonArray array = json.getAsJsonArray("securityLabel");
+ JsonArray array = getJArray(json, "securityLabel");
for (int i = 0; i < array.size(); i++) {
res.getSecurityLabel().add(parseCoding(array.get(i).getAsJsonObject()));
}
@@ -3477,7 +3510,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_query"))
parseElementProperties(getJObject(json, "_query"), res.getQueryElement());
if (json.has("detail")) {
- JsonArray array = json.getAsJsonArray("detail");
+ JsonArray array = getJArray(json, "detail");
for (int i = 0; i < array.size(); i++) {
res.getDetail().add(parseAuditEventEntityDetailComponent(array.get(i).getAsJsonObject()));
}
@@ -3510,7 +3543,7 @@ public class JsonParser extends JsonParserBase {
protected void parseBasicProperties(JsonObject json, Basic res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -3556,7 +3589,7 @@ public class JsonParser extends JsonParserBase {
protected void parseBiologicallyDerivedProductProperties(JsonObject json, BiologicallyDerivedProduct res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -3572,7 +3605,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("request")) {
- JsonArray array = json.getAsJsonArray("request");
+ JsonArray array = getJArray(json, "request");
for (int i = 0; i < array.size(); i++) {
res.getRequest().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -3582,7 +3615,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_quantity"))
parseElementProperties(getJObject(json, "_quantity"), res.getQuantityElement());
if (json.has("parent")) {
- JsonArray array = json.getAsJsonArray("parent");
+ JsonArray array = getJArray(json, "parent");
for (int i = 0; i < array.size(); i++) {
res.getParent().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -3590,7 +3623,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("collection"))
res.setCollection(parseBiologicallyDerivedProductCollectionComponent(getJObject(json, "collection")));
if (json.has("processing")) {
- JsonArray array = json.getAsJsonArray("processing");
+ JsonArray array = getJArray(json, "processing");
for (int i = 0; i < array.size(); i++) {
res.getProcessing().add(parseBiologicallyDerivedProductProcessingComponent(array.get(i).getAsJsonObject()));
}
@@ -3598,7 +3631,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("manipulation"))
res.setManipulation(parseBiologicallyDerivedProductManipulationComponent(getJObject(json, "manipulation")));
if (json.has("storage")) {
- JsonArray array = json.getAsJsonArray("storage");
+ JsonArray array = getJArray(json, "storage");
for (int i = 0; i < array.size(); i++) {
res.getStorage().add(parseBiologicallyDerivedProductStorageComponent(array.get(i).getAsJsonObject()));
}
@@ -3693,7 +3726,7 @@ public class JsonParser extends JsonParserBase {
protected void parseBodyStructureProperties(JsonObject json, BodyStructure res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -3707,7 +3740,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("location"))
res.setLocation(parseCodeableConcept(getJObject(json, "location")));
if (json.has("locationQualifier")) {
- JsonArray array = json.getAsJsonArray("locationQualifier");
+ JsonArray array = getJArray(json, "locationQualifier");
for (int i = 0; i < array.size(); i++) {
res.getLocationQualifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -3717,7 +3750,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("image")) {
- JsonArray array = json.getAsJsonArray("image");
+ JsonArray array = getJArray(json, "image");
for (int i = 0; i < array.size(); i++) {
res.getImage().add(parseAttachment(array.get(i).getAsJsonObject()));
}
@@ -3749,13 +3782,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_total"))
parseElementProperties(getJObject(json, "_total"), res.getTotalElement());
if (json.has("link")) {
- JsonArray array = json.getAsJsonArray("link");
+ JsonArray array = getJArray(json, "link");
for (int i = 0; i < array.size(); i++) {
res.getLink().add(parseBundleLinkComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("entry")) {
- JsonArray array = json.getAsJsonArray("entry");
+ JsonArray array = getJArray(json, "entry");
for (int i = 0; i < array.size(); i++) {
res.getEntry().add(parseBundleEntryComponent(array.get(i).getAsJsonObject()));
}
@@ -3791,7 +3824,7 @@ public class JsonParser extends JsonParserBase {
protected void parseBundleEntryComponentProperties(JsonObject json, Bundle.BundleEntryComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("link")) {
- JsonArray array = json.getAsJsonArray("link");
+ JsonArray array = getJArray(json, "link");
for (int i = 0; i < array.size(); i++) {
res.getLink().add(parseBundleLinkComponent(array.get(i).getAsJsonObject()));
}
@@ -3931,7 +3964,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -3941,13 +3974,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -3965,7 +3998,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_kind"))
parseElementProperties(getJObject(json, "_kind"), res.getKindElement());
if (json.has("instantiates")) {
- JsonArray array = json.getAsJsonArray("instantiates");
+ JsonArray array = getJArray(json, "instantiates");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiates().add(new CanonicalType());
@@ -3975,7 +4008,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiates")) {
- JsonArray array = json.getAsJsonArray("_instantiates");
+ JsonArray array = getJArray(json, "_instantiates");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiates().size())
res.getInstantiates().add(parseCanonical(null));
@@ -3984,7 +4017,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("imports")) {
- JsonArray array = json.getAsJsonArray("imports");
+ JsonArray array = getJArray(json, "imports");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getImports().add(new CanonicalType());
@@ -3994,7 +4027,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_imports")) {
- JsonArray array = json.getAsJsonArray("_imports");
+ JsonArray array = getJArray(json, "_imports");
for (int i = 0; i < array.size(); i++) {
if (i == res.getImports().size())
res.getImports().add(parseCanonical(null));
@@ -4011,7 +4044,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_fhirVersion"))
parseElementProperties(getJObject(json, "_fhirVersion"), res.getFhirVersionElement());
if (json.has("format")) {
- JsonArray array = json.getAsJsonArray("format");
+ JsonArray array = getJArray(json, "format");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getFormat().add(new CodeType());
@@ -4021,7 +4054,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_format")) {
- JsonArray array = json.getAsJsonArray("_format");
+ JsonArray array = getJArray(json, "_format");
for (int i = 0; i < array.size(); i++) {
if (i == res.getFormat().size())
res.getFormat().add(parseCode(null));
@@ -4030,7 +4063,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("patchFormat")) {
- JsonArray array = json.getAsJsonArray("patchFormat");
+ JsonArray array = getJArray(json, "patchFormat");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPatchFormat().add(new CodeType());
@@ -4040,7 +4073,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_patchFormat")) {
- JsonArray array = json.getAsJsonArray("_patchFormat");
+ JsonArray array = getJArray(json, "_patchFormat");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPatchFormat().size())
res.getPatchFormat().add(parseCode(null));
@@ -4049,7 +4082,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("implementationGuide")) {
- JsonArray array = json.getAsJsonArray("implementationGuide");
+ JsonArray array = getJArray(json, "implementationGuide");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getImplementationGuide().add(new CanonicalType());
@@ -4059,7 +4092,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_implementationGuide")) {
- JsonArray array = json.getAsJsonArray("_implementationGuide");
+ JsonArray array = getJArray(json, "_implementationGuide");
for (int i = 0; i < array.size(); i++) {
if (i == res.getImplementationGuide().size())
res.getImplementationGuide().add(parseCanonical(null));
@@ -4068,19 +4101,19 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("rest")) {
- JsonArray array = json.getAsJsonArray("rest");
+ JsonArray array = getJArray(json, "rest");
for (int i = 0; i < array.size(); i++) {
res.getRest().add(parseCapabilityStatementRestComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("messaging")) {
- JsonArray array = json.getAsJsonArray("messaging");
+ JsonArray array = getJArray(json, "messaging");
for (int i = 0; i < array.size(); i++) {
res.getMessaging().add(parseCapabilityStatementMessagingComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("document")) {
- JsonArray array = json.getAsJsonArray("document");
+ JsonArray array = getJArray(json, "document");
for (int i = 0; i < array.size(); i++) {
res.getDocument().add(parseCapabilityStatementDocumentComponent(array.get(i).getAsJsonObject()));
}
@@ -4148,31 +4181,31 @@ public class JsonParser extends JsonParserBase {
if (json.has("security"))
res.setSecurity(parseCapabilityStatementRestSecurityComponent(getJObject(json, "security")));
if (json.has("resource")) {
- JsonArray array = json.getAsJsonArray("resource");
+ JsonArray array = getJArray(json, "resource");
for (int i = 0; i < array.size(); i++) {
res.getResource().add(parseCapabilityStatementRestResourceComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("interaction")) {
- JsonArray array = json.getAsJsonArray("interaction");
+ JsonArray array = getJArray(json, "interaction");
for (int i = 0; i < array.size(); i++) {
res.getInteraction().add(parseCapabilityStatementSystemInteractionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("searchParam")) {
- JsonArray array = json.getAsJsonArray("searchParam");
+ JsonArray array = getJArray(json, "searchParam");
for (int i = 0; i < array.size(); i++) {
res.getSearchParam().add(parseCapabilityStatementRestResourceSearchParamComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("operation")) {
- JsonArray array = json.getAsJsonArray("operation");
+ JsonArray array = getJArray(json, "operation");
for (int i = 0; i < array.size(); i++) {
res.getOperation().add(parseCapabilityStatementRestResourceOperationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("compartment")) {
- JsonArray array = json.getAsJsonArray("compartment");
+ JsonArray array = getJArray(json, "compartment");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getCompartment().add(new CanonicalType());
@@ -4182,7 +4215,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_compartment")) {
- JsonArray array = json.getAsJsonArray("_compartment");
+ JsonArray array = getJArray(json, "_compartment");
for (int i = 0; i < array.size(); i++) {
if (i == res.getCompartment().size())
res.getCompartment().add(parseCanonical(null));
@@ -4205,7 +4238,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_cors"))
parseElementProperties(getJObject(json, "_cors"), res.getCorsElement());
if (json.has("service")) {
- JsonArray array = json.getAsJsonArray("service");
+ JsonArray array = getJArray(json, "service");
for (int i = 0; i < array.size(); i++) {
res.getService().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -4233,7 +4266,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_profile"))
parseElementProperties(getJObject(json, "_profile"), res.getProfileElement());
if (json.has("supportedProfile")) {
- JsonArray array = json.getAsJsonArray("supportedProfile");
+ JsonArray array = getJArray(json, "supportedProfile");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSupportedProfile().add(new CanonicalType());
@@ -4243,7 +4276,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_supportedProfile")) {
- JsonArray array = json.getAsJsonArray("_supportedProfile");
+ JsonArray array = getJArray(json, "_supportedProfile");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSupportedProfile().size())
res.getSupportedProfile().add(parseCanonical(null));
@@ -4256,7 +4289,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_documentation"))
parseElementProperties(getJObject(json, "_documentation"), res.getDocumentationElement());
if (json.has("interaction")) {
- JsonArray array = json.getAsJsonArray("interaction");
+ JsonArray array = getJArray(json, "interaction");
for (int i = 0; i < array.size(); i++) {
res.getInteraction().add(parseCapabilityStatementResourceInteractionComponent(array.get(i).getAsJsonObject()));
}
@@ -4290,7 +4323,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_conditionalDelete"))
parseElementProperties(getJObject(json, "_conditionalDelete"), res.getConditionalDeleteElement());
if (json.has("referencePolicy")) {
- JsonArray array = json.getAsJsonArray("referencePolicy");
+ JsonArray array = getJArray(json, "referencePolicy");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getReferencePolicy().add(new Enumeration(new CapabilityStatement.ReferenceHandlingPolicyEnumFactory(), CapabilityStatement.ReferenceHandlingPolicy.NULL));
@@ -4300,7 +4333,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_referencePolicy")) {
- JsonArray array = json.getAsJsonArray("_referencePolicy");
+ JsonArray array = getJArray(json, "_referencePolicy");
for (int i = 0; i < array.size(); i++) {
if (i == res.getReferencePolicy().size())
res.getReferencePolicy().add(parseEnumeration(null, CapabilityStatement.ReferenceHandlingPolicy.NULL, new CapabilityStatement.ReferenceHandlingPolicyEnumFactory()));
@@ -4309,7 +4342,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("searchInclude")) {
- JsonArray array = json.getAsJsonArray("searchInclude");
+ JsonArray array = getJArray(json, "searchInclude");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSearchInclude().add(new StringType());
@@ -4319,7 +4352,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_searchInclude")) {
- JsonArray array = json.getAsJsonArray("_searchInclude");
+ JsonArray array = getJArray(json, "_searchInclude");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSearchInclude().size())
res.getSearchInclude().add(parseString(null));
@@ -4328,7 +4361,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("searchRevInclude")) {
- JsonArray array = json.getAsJsonArray("searchRevInclude");
+ JsonArray array = getJArray(json, "searchRevInclude");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSearchRevInclude().add(new StringType());
@@ -4338,7 +4371,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_searchRevInclude")) {
- JsonArray array = json.getAsJsonArray("_searchRevInclude");
+ JsonArray array = getJArray(json, "_searchRevInclude");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSearchRevInclude().size())
res.getSearchRevInclude().add(parseString(null));
@@ -4347,13 +4380,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("searchParam")) {
- JsonArray array = json.getAsJsonArray("searchParam");
+ JsonArray array = getJArray(json, "searchParam");
for (int i = 0; i < array.size(); i++) {
res.getSearchParam().add(parseCapabilityStatementRestResourceSearchParamComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("operation")) {
- JsonArray array = json.getAsJsonArray("operation");
+ JsonArray array = getJArray(json, "operation");
for (int i = 0; i < array.size(); i++) {
res.getOperation().add(parseCapabilityStatementRestResourceOperationComponent(array.get(i).getAsJsonObject()));
}
@@ -4453,7 +4486,7 @@ public class JsonParser extends JsonParserBase {
protected void parseCapabilityStatementMessagingComponentProperties(JsonObject json, CapabilityStatement.CapabilityStatementMessagingComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("endpoint")) {
- JsonArray array = json.getAsJsonArray("endpoint");
+ JsonArray array = getJArray(json, "endpoint");
for (int i = 0; i < array.size(); i++) {
res.getEndpoint().add(parseCapabilityStatementMessagingEndpointComponent(array.get(i).getAsJsonObject()));
}
@@ -4467,7 +4500,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_documentation"))
parseElementProperties(getJObject(json, "_documentation"), res.getDocumentationElement());
if (json.has("supportedMessage")) {
- JsonArray array = json.getAsJsonArray("supportedMessage");
+ JsonArray array = getJArray(json, "supportedMessage");
for (int i = 0; i < array.size(); i++) {
res.getSupportedMessage().add(parseCapabilityStatementMessagingSupportedMessageComponent(array.get(i).getAsJsonObject()));
}
@@ -4571,7 +4604,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -4581,13 +4614,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -4605,7 +4638,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_kind"))
parseElementProperties(getJObject(json, "_kind"), res.getKindElement());
if (json.has("instantiates")) {
- JsonArray array = json.getAsJsonArray("instantiates");
+ JsonArray array = getJArray(json, "instantiates");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiates().add(new CanonicalType());
@@ -4615,7 +4648,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiates")) {
- JsonArray array = json.getAsJsonArray("_instantiates");
+ JsonArray array = getJArray(json, "_instantiates");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiates().size())
res.getInstantiates().add(parseCanonical(null));
@@ -4624,7 +4657,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("imports")) {
- JsonArray array = json.getAsJsonArray("imports");
+ JsonArray array = getJArray(json, "imports");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getImports().add(new CanonicalType());
@@ -4634,7 +4667,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_imports")) {
- JsonArray array = json.getAsJsonArray("_imports");
+ JsonArray array = getJArray(json, "_imports");
for (int i = 0; i < array.size(); i++) {
if (i == res.getImports().size())
res.getImports().add(parseCanonical(null));
@@ -4651,7 +4684,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_fhirVersion"))
parseElementProperties(getJObject(json, "_fhirVersion"), res.getFhirVersionElement());
if (json.has("format")) {
- JsonArray array = json.getAsJsonArray("format");
+ JsonArray array = getJArray(json, "format");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getFormat().add(new CodeType());
@@ -4661,7 +4694,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_format")) {
- JsonArray array = json.getAsJsonArray("_format");
+ JsonArray array = getJArray(json, "_format");
for (int i = 0; i < array.size(); i++) {
if (i == res.getFormat().size())
res.getFormat().add(parseCode(null));
@@ -4670,7 +4703,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("patchFormat")) {
- JsonArray array = json.getAsJsonArray("patchFormat");
+ JsonArray array = getJArray(json, "patchFormat");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPatchFormat().add(new CodeType());
@@ -4680,7 +4713,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_patchFormat")) {
- JsonArray array = json.getAsJsonArray("_patchFormat");
+ JsonArray array = getJArray(json, "_patchFormat");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPatchFormat().size())
res.getPatchFormat().add(parseCode(null));
@@ -4689,7 +4722,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("implementationGuide")) {
- JsonArray array = json.getAsJsonArray("implementationGuide");
+ JsonArray array = getJArray(json, "implementationGuide");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getImplementationGuide().add(new CanonicalType());
@@ -4699,7 +4732,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_implementationGuide")) {
- JsonArray array = json.getAsJsonArray("_implementationGuide");
+ JsonArray array = getJArray(json, "_implementationGuide");
for (int i = 0; i < array.size(); i++) {
if (i == res.getImplementationGuide().size())
res.getImplementationGuide().add(parseCanonical(null));
@@ -4708,7 +4741,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("rest")) {
- JsonArray array = json.getAsJsonArray("rest");
+ JsonArray array = getJArray(json, "rest");
for (int i = 0; i < array.size(); i++) {
res.getRest().add(parseCapabilityStatement2RestComponent(array.get(i).getAsJsonObject()));
}
@@ -4773,32 +4806,38 @@ public class JsonParser extends JsonParserBase {
res.setDocumentationElement(parseMarkdown(json.get("documentation").getAsString()));
if (json.has("_documentation"))
parseElementProperties(getJObject(json, "_documentation"), res.getDocumentationElement());
+ if (json.has("feature")) {
+ JsonArray array = getJArray(json, "feature");
+ for (int i = 0; i < array.size(); i++) {
+ res.getFeature().add(parseCapabilityStatement2RestFeatureComponent(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("resource")) {
- JsonArray array = json.getAsJsonArray("resource");
+ JsonArray array = getJArray(json, "resource");
for (int i = 0; i < array.size(); i++) {
res.getResource().add(parseCapabilityStatement2RestResourceComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("interaction")) {
- JsonArray array = json.getAsJsonArray("interaction");
+ JsonArray array = getJArray(json, "interaction");
for (int i = 0; i < array.size(); i++) {
res.getInteraction().add(parseCapabilityStatement2SystemInteractionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("searchParam")) {
- JsonArray array = json.getAsJsonArray("searchParam");
+ JsonArray array = getJArray(json, "searchParam");
for (int i = 0; i < array.size(); i++) {
res.getSearchParam().add(parseCapabilityStatement2RestResourceSearchParamComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("operation")) {
- JsonArray array = json.getAsJsonArray("operation");
+ JsonArray array = getJArray(json, "operation");
for (int i = 0; i < array.size(); i++) {
res.getOperation().add(parseCapabilityStatement2RestResourceOperationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("compartment")) {
- JsonArray array = json.getAsJsonArray("compartment");
+ JsonArray array = getJArray(json, "compartment");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getCompartment().add(new CanonicalType());
@@ -4808,7 +4847,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_compartment")) {
- JsonArray array = json.getAsJsonArray("_compartment");
+ JsonArray array = getJArray(json, "_compartment");
for (int i = 0; i < array.size(); i++) {
if (i == res.getCompartment().size())
res.getCompartment().add(parseCanonical(null));
@@ -4818,6 +4857,24 @@ public class JsonParser extends JsonParserBase {
};
}
+ protected CapabilityStatement2.CapabilityStatement2RestFeatureComponent parseCapabilityStatement2RestFeatureComponent(JsonObject json) throws IOException, FHIRFormatError {
+ CapabilityStatement2.CapabilityStatement2RestFeatureComponent res = new CapabilityStatement2.CapabilityStatement2RestFeatureComponent();
+ parseCapabilityStatement2RestFeatureComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCapabilityStatement2RestFeatureComponentProperties(JsonObject json, CapabilityStatement2.CapabilityStatement2RestFeatureComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("code"))
+ res.setCodeElement(parseEnumeration(json.get("code").getAsString(), CapabilityStatement2.CapabilityFeature.NULL, new CapabilityStatement2.CapabilityFeatureEnumFactory()));
+ if (json.has("_code"))
+ parseElementProperties(getJObject(json, "_code"), res.getCodeElement());
+ if (json.has("value"))
+ res.setValueElement(parseEnumeration(json.get("value").getAsString(), CapabilityStatement2.CapabilityFeatureValue.NULL, new CapabilityStatement2.CapabilityFeatureValueEnumFactory()));
+ if (json.has("_value"))
+ parseElementProperties(getJObject(json, "_value"), res.getValueElement());
+ }
+
protected CapabilityStatement2.CapabilityStatement2RestResourceComponent parseCapabilityStatement2RestResourceComponent(JsonObject json) throws IOException, FHIRFormatError {
CapabilityStatement2.CapabilityStatement2RestResourceComponent res = new CapabilityStatement2.CapabilityStatement2RestResourceComponent();
parseCapabilityStatement2RestResourceComponentProperties(json, res);
@@ -4835,7 +4892,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_profile"))
parseElementProperties(getJObject(json, "_profile"), res.getProfileElement());
if (json.has("supportedProfile")) {
- JsonArray array = json.getAsJsonArray("supportedProfile");
+ JsonArray array = getJArray(json, "supportedProfile");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSupportedProfile().add(new CanonicalType());
@@ -4845,7 +4902,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_supportedProfile")) {
- JsonArray array = json.getAsJsonArray("_supportedProfile");
+ JsonArray array = getJArray(json, "_supportedProfile");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSupportedProfile().size())
res.getSupportedProfile().add(parseCanonical(null));
@@ -4857,20 +4914,26 @@ public class JsonParser extends JsonParserBase {
res.setDocumentationElement(parseMarkdown(json.get("documentation").getAsString()));
if (json.has("_documentation"))
parseElementProperties(getJObject(json, "_documentation"), res.getDocumentationElement());
+ if (json.has("feature")) {
+ JsonArray array = getJArray(json, "feature");
+ for (int i = 0; i < array.size(); i++) {
+ res.getFeature().add(parseCapabilityStatement2RestFeatureComponent(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("interaction")) {
- JsonArray array = json.getAsJsonArray("interaction");
+ JsonArray array = getJArray(json, "interaction");
for (int i = 0; i < array.size(); i++) {
res.getInteraction().add(parseCapabilityStatement2ResourceInteractionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("searchParam")) {
- JsonArray array = json.getAsJsonArray("searchParam");
+ JsonArray array = getJArray(json, "searchParam");
for (int i = 0; i < array.size(); i++) {
res.getSearchParam().add(parseCapabilityStatement2RestResourceSearchParamComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("operation")) {
- JsonArray array = json.getAsJsonArray("operation");
+ JsonArray array = getJArray(json, "operation");
for (int i = 0; i < array.size(); i++) {
res.getOperation().add(parseCapabilityStatement2RestResourceOperationComponent(array.get(i).getAsJsonObject()));
}
@@ -4893,6 +4956,12 @@ public class JsonParser extends JsonParserBase {
res.setDocumentationElement(parseMarkdown(json.get("documentation").getAsString()));
if (json.has("_documentation"))
parseElementProperties(getJObject(json, "_documentation"), res.getDocumentationElement());
+ if (json.has("feature")) {
+ JsonArray array = getJArray(json, "feature");
+ for (int i = 0; i < array.size(); i++) {
+ res.getFeature().add(parseCapabilityStatement2RestFeatureComponent(array.get(i).getAsJsonObject()));
+ }
+ };
}
protected CapabilityStatement2.CapabilityStatement2RestResourceSearchParamComponent parseCapabilityStatement2RestResourceSearchParamComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -4919,6 +4988,12 @@ public class JsonParser extends JsonParserBase {
res.setDocumentationElement(parseMarkdown(json.get("documentation").getAsString()));
if (json.has("_documentation"))
parseElementProperties(getJObject(json, "_documentation"), res.getDocumentationElement());
+ if (json.has("feature")) {
+ JsonArray array = getJArray(json, "feature");
+ for (int i = 0; i < array.size(); i++) {
+ res.getFeature().add(parseCapabilityStatement2RestFeatureComponent(array.get(i).getAsJsonObject()));
+ }
+ };
}
protected CapabilityStatement2.CapabilityStatement2RestResourceOperationComponent parseCapabilityStatement2RestResourceOperationComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -4941,6 +5016,12 @@ public class JsonParser extends JsonParserBase {
res.setDocumentationElement(parseMarkdown(json.get("documentation").getAsString()));
if (json.has("_documentation"))
parseElementProperties(getJObject(json, "_documentation"), res.getDocumentationElement());
+ if (json.has("feature")) {
+ JsonArray array = getJArray(json, "feature");
+ for (int i = 0; i < array.size(); i++) {
+ res.getFeature().add(parseCapabilityStatement2RestFeatureComponent(array.get(i).getAsJsonObject()));
+ }
+ };
}
protected CapabilityStatement2.SystemInteractionComponent parseCapabilityStatement2SystemInteractionComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -4959,6 +5040,12 @@ public class JsonParser extends JsonParserBase {
res.setDocumentationElement(parseMarkdown(json.get("documentation").getAsString()));
if (json.has("_documentation"))
parseElementProperties(getJObject(json, "_documentation"), res.getDocumentationElement());
+ if (json.has("feature")) {
+ JsonArray array = getJArray(json, "feature");
+ for (int i = 0; i < array.size(); i++) {
+ res.getFeature().add(parseCapabilityStatement2RestFeatureComponent(array.get(i).getAsJsonObject()));
+ }
+ };
}
protected CarePlan parseCarePlan(JsonObject json) throws IOException, FHIRFormatError {
@@ -4970,13 +5057,13 @@ public class JsonParser extends JsonParserBase {
protected void parseCarePlanProperties(JsonObject json, CarePlan res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -4986,7 +5073,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -4995,7 +5082,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -5005,7 +5092,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -5014,19 +5101,19 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("replaces")) {
- JsonArray array = json.getAsJsonArray("replaces");
+ JsonArray array = getJArray(json, "replaces");
for (int i = 0; i < array.size(); i++) {
res.getReplaces().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
res.getPartOf().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -5040,7 +5127,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_intent"))
parseElementProperties(getJObject(json, "_intent"), res.getIntentElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -5066,43 +5153,43 @@ public class JsonParser extends JsonParserBase {
if (json.has("author"))
res.setAuthor(parseReference(getJObject(json, "author")));
if (json.has("contributor")) {
- JsonArray array = json.getAsJsonArray("contributor");
+ JsonArray array = getJArray(json, "contributor");
for (int i = 0; i < array.size(); i++) {
res.getContributor().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("careTeam")) {
- JsonArray array = json.getAsJsonArray("careTeam");
+ JsonArray array = getJArray(json, "careTeam");
for (int i = 0; i < array.size(); i++) {
res.getCareTeam().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("addresses")) {
- JsonArray array = json.getAsJsonArray("addresses");
+ JsonArray array = getJArray(json, "addresses");
for (int i = 0; i < array.size(); i++) {
res.getAddresses().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("supportingInfo")) {
- JsonArray array = json.getAsJsonArray("supportingInfo");
+ JsonArray array = getJArray(json, "supportingInfo");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInfo().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("goal")) {
- JsonArray array = json.getAsJsonArray("goal");
+ JsonArray array = getJArray(json, "goal");
for (int i = 0; i < array.size(); i++) {
res.getGoal().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("activity")) {
- JsonArray array = json.getAsJsonArray("activity");
+ JsonArray array = getJArray(json, "activity");
for (int i = 0; i < array.size(); i++) {
res.getActivity().add(parseCarePlanActivityComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -5117,38 +5204,38 @@ public class JsonParser extends JsonParserBase {
protected void parseCarePlanActivityComponentProperties(JsonObject json, CarePlan.CarePlanActivityComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- if (json.has("outcome")) {
- JsonArray array = json.getAsJsonArray("outcome");
+ if (json.has("performedActivity")) {
+ JsonArray array = getJArray(json, "performedActivity");
for (int i = 0; i < array.size(); i++) {
- res.getOutcome().add(parseCodeableReference(array.get(i).getAsJsonObject()));
+ res.getPerformedActivity().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("progress")) {
- JsonArray array = json.getAsJsonArray("progress");
+ JsonArray array = getJArray(json, "progress");
for (int i = 0; i < array.size(); i++) {
res.getProgress().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
- if (json.has("reference"))
- res.setReference(parseReference(getJObject(json, "reference")));
- if (json.has("detail"))
- res.setDetail(parseCarePlanActivityDetailComponent(getJObject(json, "detail")));
+ if (json.has("plannedActivityReference"))
+ res.setPlannedActivityReference(parseReference(getJObject(json, "plannedActivityReference")));
+ if (json.has("plannedActivityDetail"))
+ res.setPlannedActivityDetail(parseCarePlanActivityPlannedActivityDetailComponent(getJObject(json, "plannedActivityDetail")));
}
- protected CarePlan.CarePlanActivityDetailComponent parseCarePlanActivityDetailComponent(JsonObject json) throws IOException, FHIRFormatError {
- CarePlan.CarePlanActivityDetailComponent res = new CarePlan.CarePlanActivityDetailComponent();
- parseCarePlanActivityDetailComponentProperties(json, res);
+ protected CarePlan.CarePlanActivityPlannedActivityDetailComponent parseCarePlanActivityPlannedActivityDetailComponent(JsonObject json) throws IOException, FHIRFormatError {
+ CarePlan.CarePlanActivityPlannedActivityDetailComponent res = new CarePlan.CarePlanActivityPlannedActivityDetailComponent();
+ parseCarePlanActivityPlannedActivityDetailComponentProperties(json, res);
return res;
}
- protected void parseCarePlanActivityDetailComponentProperties(JsonObject json, CarePlan.CarePlanActivityDetailComponent res) throws IOException, FHIRFormatError {
+ protected void parseCarePlanActivityPlannedActivityDetailComponentProperties(JsonObject json, CarePlan.CarePlanActivityPlannedActivityDetailComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("kind"))
res.setKindElement(parseEnumeration(json.get("kind").getAsString(), CarePlan.CarePlanActivityKind.NULL, new CarePlan.CarePlanActivityKindEnumFactory()));
if (json.has("_kind"))
parseElementProperties(getJObject(json, "_kind"), res.getKindElement());
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -5158,7 +5245,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -5167,7 +5254,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -5177,7 +5264,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -5188,13 +5275,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("goal")) {
- JsonArray array = json.getAsJsonArray("goal");
+ JsonArray array = getJArray(json, "goal");
for (int i = 0; i < array.size(); i++) {
res.getGoal().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -5218,7 +5305,7 @@ public class JsonParser extends JsonParserBase {
if (reported != null)
res.setReported(reported);
if (json.has("performer")) {
- JsonArray array = json.getAsJsonArray("performer");
+ JsonArray array = getJArray(json, "performer");
for (int i = 0; i < array.size(); i++) {
res.getPerformer().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -5245,7 +5332,7 @@ public class JsonParser extends JsonParserBase {
protected void parseCareTeamProperties(JsonObject json, CareTeam res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -5255,7 +5342,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -5269,31 +5356,31 @@ public class JsonParser extends JsonParserBase {
if (json.has("period"))
res.setPeriod(parsePeriod(getJObject(json, "period")));
if (json.has("participant")) {
- JsonArray array = json.getAsJsonArray("participant");
+ JsonArray array = getJArray(json, "participant");
for (int i = 0; i < array.size(); i++) {
res.getParticipant().add(parseCareTeamParticipantComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("managingOrganization")) {
- JsonArray array = json.getAsJsonArray("managingOrganization");
+ JsonArray array = getJArray(json, "managingOrganization");
for (int i = 0; i < array.size(); i++) {
res.getManagingOrganization().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -5328,7 +5415,7 @@ public class JsonParser extends JsonParserBase {
protected void parseCatalogEntryProperties(JsonObject json, CatalogEntry res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -5354,7 +5441,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("referencedItem"))
res.setReferencedItem(parseReference(getJObject(json, "referencedItem")));
if (json.has("relatedEntry")) {
- JsonArray array = json.getAsJsonArray("relatedEntry");
+ JsonArray array = getJArray(json, "relatedEntry");
for (int i = 0; i < array.size(); i++) {
res.getRelatedEntry().add(parseCatalogEntryRelatedEntryComponent(array.get(i).getAsJsonObject()));
}
@@ -5362,7 +5449,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("updatedBy"))
res.setUpdatedBy(parseReference(getJObject(json, "updatedBy")));
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -5370,7 +5457,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("estimatedDuration"))
res.setEstimatedDuration(parseDuration(getJObject(json, "estimatedDuration")));
if (json.has("billingCode")) {
- JsonArray array = json.getAsJsonArray("billingCode");
+ JsonArray array = getJArray(json, "billingCode");
for (int i = 0; i < array.size(); i++) {
res.getBillingCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -5418,13 +5505,13 @@ public class JsonParser extends JsonParserBase {
protected void parseChargeItemProperties(JsonObject json, ChargeItem res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("definitionUri")) {
- JsonArray array = json.getAsJsonArray("definitionUri");
+ JsonArray array = getJArray(json, "definitionUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDefinitionUri().add(new UriType());
@@ -5434,7 +5521,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_definitionUri")) {
- JsonArray array = json.getAsJsonArray("_definitionUri");
+ JsonArray array = getJArray(json, "_definitionUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDefinitionUri().size())
res.getDefinitionUri().add(parseUri(null));
@@ -5443,7 +5530,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("definitionCanonical")) {
- JsonArray array = json.getAsJsonArray("definitionCanonical");
+ JsonArray array = getJArray(json, "definitionCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDefinitionCanonical().add(new CanonicalType());
@@ -5453,7 +5540,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_definitionCanonical")) {
- JsonArray array = json.getAsJsonArray("_definitionCanonical");
+ JsonArray array = getJArray(json, "_definitionCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDefinitionCanonical().size())
res.getDefinitionCanonical().add(parseCanonical(null));
@@ -5466,7 +5553,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
res.getPartOf().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -5481,7 +5568,7 @@ public class JsonParser extends JsonParserBase {
if (occurrence != null)
res.setOccurrence(occurrence);
if (json.has("performer")) {
- JsonArray array = json.getAsJsonArray("performer");
+ JsonArray array = getJArray(json, "performer");
for (int i = 0; i < array.size(); i++) {
res.getPerformer().add(parseChargeItemPerformerComponent(array.get(i).getAsJsonObject()));
}
@@ -5495,7 +5582,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("quantity"))
res.setQuantity(parseQuantity(getJObject(json, "quantity")));
if (json.has("bodysite")) {
- JsonArray array = json.getAsJsonArray("bodysite");
+ JsonArray array = getJArray(json, "bodysite");
for (int i = 0; i < array.size(); i++) {
res.getBodysite().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -5517,13 +5604,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_enteredDate"))
parseElementProperties(getJObject(json, "_enteredDate"), res.getEnteredDateElement());
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("service")) {
- JsonArray array = json.getAsJsonArray("service");
+ JsonArray array = getJArray(json, "service");
for (int i = 0; i < array.size(); i++) {
res.getService().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -5532,19 +5619,19 @@ public class JsonParser extends JsonParserBase {
if (product != null)
res.setProduct(product);
if (json.has("account")) {
- JsonArray array = json.getAsJsonArray("account");
+ JsonArray array = getJArray(json, "account");
for (int i = 0; i < array.size(); i++) {
res.getAccount().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("supportingInformation")) {
- JsonArray array = json.getAsJsonArray("supportingInformation");
+ JsonArray array = getJArray(json, "supportingInformation");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInformation().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -5578,7 +5665,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -5592,7 +5679,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_title"))
parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
if (json.has("derivedFromUri")) {
- JsonArray array = json.getAsJsonArray("derivedFromUri");
+ JsonArray array = getJArray(json, "derivedFromUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDerivedFromUri().add(new UriType());
@@ -5602,7 +5689,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_derivedFromUri")) {
- JsonArray array = json.getAsJsonArray("_derivedFromUri");
+ JsonArray array = getJArray(json, "_derivedFromUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDerivedFromUri().size())
res.getDerivedFromUri().add(parseUri(null));
@@ -5611,7 +5698,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPartOf().add(new CanonicalType());
@@ -5621,7 +5708,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_partOf")) {
- JsonArray array = json.getAsJsonArray("_partOf");
+ JsonArray array = getJArray(json, "_partOf");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPartOf().size())
res.getPartOf().add(parseCanonical(null));
@@ -5630,7 +5717,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("replaces")) {
- JsonArray array = json.getAsJsonArray("replaces");
+ JsonArray array = getJArray(json, "replaces");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getReplaces().add(new CanonicalType());
@@ -5640,7 +5727,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_replaces")) {
- JsonArray array = json.getAsJsonArray("_replaces");
+ JsonArray array = getJArray(json, "_replaces");
for (int i = 0; i < array.size(); i++) {
if (i == res.getReplaces().size())
res.getReplaces().add(parseCanonical(null));
@@ -5665,7 +5752,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -5675,13 +5762,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -5703,19 +5790,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
if (json.has("instance")) {
- JsonArray array = json.getAsJsonArray("instance");
+ JsonArray array = getJArray(json, "instance");
for (int i = 0; i < array.size(); i++) {
res.getInstance().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("applicability")) {
- JsonArray array = json.getAsJsonArray("applicability");
+ JsonArray array = getJArray(json, "applicability");
for (int i = 0; i < array.size(); i++) {
res.getApplicability().add(parseChargeItemDefinitionApplicabilityComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("propertyGroup")) {
- JsonArray array = json.getAsJsonArray("propertyGroup");
+ JsonArray array = getJArray(json, "propertyGroup");
for (int i = 0; i < array.size(); i++) {
res.getPropertyGroup().add(parseChargeItemDefinitionPropertyGroupComponent(array.get(i).getAsJsonObject()));
}
@@ -5753,13 +5840,13 @@ public class JsonParser extends JsonParserBase {
protected void parseChargeItemDefinitionPropertyGroupComponentProperties(JsonObject json, ChargeItemDefinition.ChargeItemDefinitionPropertyGroupComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("applicability")) {
- JsonArray array = json.getAsJsonArray("applicability");
+ JsonArray array = getJArray(json, "applicability");
for (int i = 0; i < array.size(); i++) {
res.getApplicability().add(parseChargeItemDefinitionApplicabilityComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("priceComponent")) {
- JsonArray array = json.getAsJsonArray("priceComponent");
+ JsonArray array = getJArray(json, "priceComponent");
for (int i = 0; i < array.size(); i++) {
res.getPriceComponent().add(parseChargeItemDefinitionPropertyGroupPriceComponentComponent(array.get(i).getAsJsonObject()));
}
@@ -5800,139 +5887,368 @@ public class JsonParser extends JsonParserBase {
res.setUrlElement(parseUri(json.get("url").getAsString()));
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
+ if (json.has("identifier")) {
+ JsonArray array = getJArray(json, "identifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("version"))
+ res.setVersionElement(parseString(json.get("version").getAsString()));
+ if (json.has("_version"))
+ parseElementProperties(getJObject(json, "_version"), res.getVersionElement());
+ if (json.has("name"))
+ res.setNameElement(parseString(json.get("name").getAsString()));
+ if (json.has("_name"))
+ parseElementProperties(getJObject(json, "_name"), res.getNameElement());
+ if (json.has("title"))
+ res.setTitleElement(parseString(json.get("title").getAsString()));
+ if (json.has("_title"))
+ parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
if (json.has("status"))
res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
+ if (json.has("experimental"))
+ res.setExperimentalElement(parseBoolean(json.get("experimental").getAsBoolean()));
+ if (json.has("_experimental"))
+ parseElementProperties(getJObject(json, "_experimental"), res.getExperimentalElement());
+ if (json.has("date"))
+ res.setDateElement(parseDateTime(json.get("date").getAsString()));
+ if (json.has("_date"))
+ parseElementProperties(getJObject(json, "_date"), res.getDateElement());
+ if (json.has("publisher"))
+ res.setPublisherElement(parseString(json.get("publisher").getAsString()));
+ if (json.has("_publisher"))
+ parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
+ if (json.has("contact")) {
+ JsonArray array = getJArray(json, "contact");
+ for (int i = 0; i < array.size(); i++) {
+ res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("description"))
+ res.setDescriptionElement(parseMarkdown(json.get("description").getAsString()));
+ if (json.has("_description"))
+ parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("jurisdiction")) {
+ JsonArray array = getJArray(json, "jurisdiction");
+ for (int i = 0; i < array.size(); i++) {
+ res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("purpose"))
+ res.setPurposeElement(parseMarkdown(json.get("purpose").getAsString()));
+ if (json.has("_purpose"))
+ parseElementProperties(getJObject(json, "_purpose"), res.getPurposeElement());
+ if (json.has("copyright"))
+ res.setCopyrightElement(parseMarkdown(json.get("copyright").getAsString()));
+ if (json.has("_copyright"))
+ parseElementProperties(getJObject(json, "_copyright"), res.getCopyrightElement());
+ if (json.has("approvalDate"))
+ res.setApprovalDateElement(parseDate(json.get("approvalDate").getAsString()));
+ if (json.has("_approvalDate"))
+ parseElementProperties(getJObject(json, "_approvalDate"), res.getApprovalDateElement());
+ if (json.has("lastReviewDate"))
+ res.setLastReviewDateElement(parseDate(json.get("lastReviewDate").getAsString()));
+ if (json.has("_lastReviewDate"))
+ parseElementProperties(getJObject(json, "_lastReviewDate"), res.getLastReviewDateElement());
+ if (json.has("effectivePeriod"))
+ res.setEffectivePeriod(parsePeriod(getJObject(json, "effectivePeriod")));
+ if (json.has("author")) {
+ JsonArray array = getJArray(json, "author");
+ for (int i = 0; i < array.size(); i++) {
+ res.getAuthor().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("editor")) {
+ JsonArray array = getJArray(json, "editor");
+ for (int i = 0; i < array.size(); i++) {
+ res.getEditor().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("reviewer")) {
+ JsonArray array = getJArray(json, "reviewer");
+ for (int i = 0; i < array.size(); i++) {
+ res.getReviewer().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("endorser")) {
+ JsonArray array = getJArray(json, "endorser");
+ for (int i = 0; i < array.size(); i++) {
+ res.getEndorser().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("summary")) {
+ JsonArray array = getJArray(json, "summary");
+ for (int i = 0; i < array.size(); i++) {
+ res.getSummary().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("classification")) {
+ JsonArray array = getJArray(json, "classification");
+ for (int i = 0; i < array.size(); i++) {
+ res.getClassification().add(parseCitationClassificationComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("note")) {
+ JsonArray array = getJArray(json, "note");
+ for (int i = 0; i < array.size(); i++) {
+ res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("currentState")) {
+ JsonArray array = getJArray(json, "currentState");
+ for (int i = 0; i < array.size(); i++) {
+ res.getCurrentState().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("statusDate")) {
+ JsonArray array = getJArray(json, "statusDate");
+ for (int i = 0; i < array.size(); i++) {
+ res.getStatusDate().add(parseCitationStatusDateComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("relatesTo")) {
+ JsonArray array = getJArray(json, "relatesTo");
+ for (int i = 0; i < array.size(); i++) {
+ res.getRelatesTo().add(parseCitationRelatesToComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("citedArtifact"))
+ res.setCitedArtifact(parseCitationCitedArtifactComponent(getJObject(json, "citedArtifact")));
+ }
+
+ protected Citation.CitationClassificationComponent parseCitationClassificationComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationClassificationComponent res = new Citation.CitationClassificationComponent();
+ parseCitationClassificationComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationClassificationComponentProperties(JsonObject json, Citation.CitationClassificationComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("classifier")) {
+ JsonArray array = getJArray(json, "classifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getClassifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ }
+
+ protected Citation.CitationStatusDateComponent parseCitationStatusDateComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationStatusDateComponent res = new Citation.CitationStatusDateComponent();
+ parseCitationStatusDateComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationStatusDateComponentProperties(JsonObject json, Citation.CitationStatusDateComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("activity"))
+ res.setActivity(parseCodeableConcept(getJObject(json, "activity")));
+ if (json.has("actual"))
+ res.setActualElement(parseBoolean(json.get("actual").getAsBoolean()));
+ if (json.has("_actual"))
+ parseElementProperties(getJObject(json, "_actual"), res.getActualElement());
+ if (json.has("period"))
+ res.setPeriod(parsePeriod(getJObject(json, "period")));
+ }
+
+ protected Citation.CitationRelatesToComponent parseCitationRelatesToComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationRelatesToComponent res = new Citation.CitationRelatesToComponent();
+ parseCitationRelatesToComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationRelatesToComponentProperties(JsonObject json, Citation.CitationRelatesToComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("relationshipType"))
+ res.setRelationshipType(parseCodeableConcept(getJObject(json, "relationshipType")));
+ if (json.has("targetClassifier")) {
+ JsonArray array = getJArray(json, "targetClassifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getTargetClassifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ DataType target = parseType("target", json);
+ if (target != null)
+ res.setTarget(target);
+ }
+
+ protected Citation.CitationCitedArtifactComponent parseCitationCitedArtifactComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactComponent res = new Citation.CitationCitedArtifactComponent();
+ parseCitationCitedArtifactComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationCitedArtifactComponentProperties(JsonObject json, Citation.CitationCitedArtifactComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedIdentifier")) {
- JsonArray array = json.getAsJsonArray("relatedIdentifier");
+ JsonArray array = getJArray(json, "relatedIdentifier");
for (int i = 0; i < array.size(); i++) {
res.getRelatedIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
- if (json.has("summary")) {
- JsonArray array = json.getAsJsonArray("summary");
+ if (json.has("dateAccessed"))
+ res.setDateAccessedElement(parseDateTime(json.get("dateAccessed").getAsString()));
+ if (json.has("_dateAccessed"))
+ parseElementProperties(getJObject(json, "_dateAccessed"), res.getDateAccessedElement());
+ if (json.has("version"))
+ res.setVersion(parseCitationCitedArtifactVersionComponent(getJObject(json, "version")));
+ if (json.has("currentState")) {
+ JsonArray array = getJArray(json, "currentState");
for (int i = 0; i < array.size(); i++) {
- res.getSummary().add(parseCitationSummaryComponent(array.get(i).getAsJsonObject()));
+ res.getCurrentState().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
- if (json.has("dateCited"))
- res.setDateCitedElement(parseDateTime(json.get("dateCited").getAsString()));
- if (json.has("_dateCited"))
- parseElementProperties(getJObject(json, "_dateCited"), res.getDateCitedElement());
- if (json.has("variantCitation"))
- res.setVariantCitation(parseCitationVariantCitationComponent(getJObject(json, "variantCitation")));
- if (json.has("publishingModel"))
- res.setPublishingModel(parseCodeableConcept(getJObject(json, "publishingModel")));
- if (json.has("journal"))
- res.setJournal(parseCitationJournalComponent(getJObject(json, "journal")));
- if (json.has("publicationInfo"))
- res.setPublicationInfo(parseCitationPublicationInfoComponent(getJObject(json, "publicationInfo")));
- if (json.has("articleTitle"))
- res.setArticleTitleElement(parseMarkdown(json.get("articleTitle").getAsString()));
- if (json.has("_articleTitle"))
- parseElementProperties(getJObject(json, "_articleTitle"), res.getArticleTitleElement());
- if (json.has("alternativeTitle")) {
- JsonArray array = json.getAsJsonArray("alternativeTitle");
+ if (json.has("statusDate")) {
+ JsonArray array = getJArray(json, "statusDate");
for (int i = 0; i < array.size(); i++) {
- res.getAlternativeTitle().add(parseCitationAlternativeTitleComponent(array.get(i).getAsJsonObject()));
+ res.getStatusDate().add(parseCitationCitedArtifactStatusDateComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("pagination"))
- res.setPagination(parseCitationPaginationComponent(getJObject(json, "pagination")));
- if (json.has("articleUrl")) {
- JsonArray array = json.getAsJsonArray("articleUrl");
+ if (json.has("title")) {
+ JsonArray array = getJArray(json, "title");
for (int i = 0; i < array.size(); i++) {
- res.getArticleUrl().add(parseCitationArticleUrlComponent(array.get(i).getAsJsonObject()));
+ res.getTitle().add(parseCitationCitedArtifactTitleComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("abstract"))
- res.setAbstractElement(parseMarkdown(json.get("abstract").getAsString()));
- if (json.has("_abstract"))
- parseElementProperties(getJObject(json, "_abstract"), res.getAbstractElement());
- if (json.has("abstractCopyright"))
- res.setAbstractCopyrightElement(parseMarkdown(json.get("abstractCopyright").getAsString()));
- if (json.has("_abstractCopyright"))
- parseElementProperties(getJObject(json, "_abstractCopyright"), res.getAbstractCopyrightElement());
- if (json.has("alternativeAbstract")) {
- JsonArray array = json.getAsJsonArray("alternativeAbstract");
+ if (json.has("abstract")) {
+ JsonArray array = getJArray(json, "abstract");
for (int i = 0; i < array.size(); i++) {
- res.getAlternativeAbstract().add(parseCitationAlternativeAbstractComponent(array.get(i).getAsJsonObject()));
+ res.getAbstract().add(parseCitationCitedArtifactAbstractComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("part"))
+ res.setPart(parseCitationCitedArtifactPartComponent(getJObject(json, "part")));
+ if (json.has("relatesTo")) {
+ JsonArray array = getJArray(json, "relatesTo");
+ for (int i = 0; i < array.size(); i++) {
+ res.getRelatesTo().add(parseCitationCitedArtifactRelatesToComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("publicationForm")) {
+ JsonArray array = getJArray(json, "publicationForm");
+ for (int i = 0; i < array.size(); i++) {
+ res.getPublicationForm().add(parseCitationCitedArtifactPublicationFormComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("webLocation")) {
+ JsonArray array = getJArray(json, "webLocation");
+ for (int i = 0; i < array.size(); i++) {
+ res.getWebLocation().add(parseCitationCitedArtifactWebLocationComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("classification")) {
+ JsonArray array = getJArray(json, "classification");
+ for (int i = 0; i < array.size(); i++) {
+ res.getClassification().add(parseCitationCitedArtifactClassificationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("contributorship"))
- res.setContributorship(parseCitationContributorshipComponent(getJObject(json, "contributorship")));
- if (json.has("articleLanguage"))
- res.setArticleLanguage(parseCodeableConcept(getJObject(json, "articleLanguage")));
- if (json.has("alternativeForm")) {
- JsonArray array = json.getAsJsonArray("alternativeForm");
- for (int i = 0; i < array.size(); i++) {
- res.getAlternativeForm().add(parseCitationAlternativeFormComponent(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("classifier")) {
- JsonArray array = json.getAsJsonArray("classifier");
- for (int i = 0; i < array.size(); i++) {
- res.getClassifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("keywordList")) {
- JsonArray array = json.getAsJsonArray("keywordList");
- for (int i = 0; i < array.size(); i++) {
- res.getKeywordList().add(parseCitationKeywordListComponent(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("relatedArtifact")) {
- JsonArray array = json.getAsJsonArray("relatedArtifact");
- for (int i = 0; i < array.size(); i++) {
- res.getRelatedArtifact().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
- }
- };
+ res.setContributorship(parseCitationCitedArtifactContributorshipComponent(getJObject(json, "contributorship")));
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
- if (json.has("medlinePubMed"))
- res.setMedlinePubMed(parseCitationMedlinePubMedComponent(getJObject(json, "medlinePubMed")));
}
- protected Citation.CitationSummaryComponent parseCitationSummaryComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationSummaryComponent res = new Citation.CitationSummaryComponent();
- parseCitationSummaryComponentProperties(json, res);
+ protected Citation.CitationCitedArtifactVersionComponent parseCitationCitedArtifactVersionComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactVersionComponent res = new Citation.CitationCitedArtifactVersionComponent();
+ parseCitationCitedArtifactVersionComponentProperties(json, res);
return res;
}
- protected void parseCitationSummaryComponentProperties(JsonObject json, Citation.CitationSummaryComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationCitedArtifactVersionComponentProperties(JsonObject json, Citation.CitationCitedArtifactVersionComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- if (json.has("style"))
- res.setStyle(parseCodeableConcept(getJObject(json, "style")));
+ if (json.has("value"))
+ res.setValueElement(parseString(json.get("value").getAsString()));
+ if (json.has("_value"))
+ parseElementProperties(getJObject(json, "_value"), res.getValueElement());
+ if (json.has("baseCitation"))
+ res.setBaseCitation(parseReference(getJObject(json, "baseCitation")));
+ }
+
+ protected Citation.CitationCitedArtifactStatusDateComponent parseCitationCitedArtifactStatusDateComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactStatusDateComponent res = new Citation.CitationCitedArtifactStatusDateComponent();
+ parseCitationCitedArtifactStatusDateComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationCitedArtifactStatusDateComponentProperties(JsonObject json, Citation.CitationCitedArtifactStatusDateComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("activity"))
+ res.setActivity(parseCodeableConcept(getJObject(json, "activity")));
+ if (json.has("actual"))
+ res.setActualElement(parseBoolean(json.get("actual").getAsBoolean()));
+ if (json.has("_actual"))
+ parseElementProperties(getJObject(json, "_actual"), res.getActualElement());
+ if (json.has("period"))
+ res.setPeriod(parsePeriod(getJObject(json, "period")));
+ }
+
+ protected Citation.CitationCitedArtifactTitleComponent parseCitationCitedArtifactTitleComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactTitleComponent res = new Citation.CitationCitedArtifactTitleComponent();
+ parseCitationCitedArtifactTitleComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationCitedArtifactTitleComponentProperties(JsonObject json, Citation.CitationCitedArtifactTitleComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("language"))
+ res.setLanguage(parseCodeableConcept(getJObject(json, "language")));
if (json.has("text"))
res.setTextElement(parseMarkdown(json.get("text").getAsString()));
if (json.has("_text"))
parseElementProperties(getJObject(json, "_text"), res.getTextElement());
}
- protected Citation.CitationVariantCitationComponent parseCitationVariantCitationComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationVariantCitationComponent res = new Citation.CitationVariantCitationComponent();
- parseCitationVariantCitationComponentProperties(json, res);
+ protected Citation.CitationCitedArtifactAbstractComponent parseCitationCitedArtifactAbstractComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactAbstractComponent res = new Citation.CitationCitedArtifactAbstractComponent();
+ parseCitationCitedArtifactAbstractComponentProperties(json, res);
return res;
}
- protected void parseCitationVariantCitationComponentProperties(JsonObject json, Citation.CitationVariantCitationComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationCitedArtifactAbstractComponentProperties(JsonObject json, Citation.CitationCitedArtifactAbstractComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("language"))
+ res.setLanguage(parseCodeableConcept(getJObject(json, "language")));
+ if (json.has("text"))
+ res.setTextElement(parseMarkdown(json.get("text").getAsString()));
+ if (json.has("_text"))
+ parseElementProperties(getJObject(json, "_text"), res.getTextElement());
+ if (json.has("copyright"))
+ res.setCopyrightElement(parseMarkdown(json.get("copyright").getAsString()));
+ if (json.has("_copyright"))
+ parseElementProperties(getJObject(json, "_copyright"), res.getCopyrightElement());
+ }
+
+ protected Citation.CitationCitedArtifactPartComponent parseCitationCitedArtifactPartComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactPartComponent res = new Citation.CitationCitedArtifactPartComponent();
+ parseCitationCitedArtifactPartComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationCitedArtifactPartComponentProperties(JsonObject json, Citation.CitationCitedArtifactPartComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
@@ -5944,39 +6260,114 @@ public class JsonParser extends JsonParserBase {
res.setBaseCitation(parseReference(getJObject(json, "baseCitation")));
}
- protected Citation.CitationJournalComponent parseCitationJournalComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationJournalComponent res = new Citation.CitationJournalComponent();
- parseCitationJournalComponentProperties(json, res);
+ protected Citation.CitationCitedArtifactRelatesToComponent parseCitationCitedArtifactRelatesToComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactRelatesToComponent res = new Citation.CitationCitedArtifactRelatesToComponent();
+ parseCitationCitedArtifactRelatesToComponentProperties(json, res);
return res;
}
- protected void parseCitationJournalComponentProperties(JsonObject json, Citation.CitationJournalComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationCitedArtifactRelatesToComponentProperties(JsonObject json, Citation.CitationCitedArtifactRelatesToComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
+ if (json.has("relationshipType"))
+ res.setRelationshipType(parseCodeableConcept(getJObject(json, "relationshipType")));
+ if (json.has("targetClassifier")) {
+ JsonArray array = getJArray(json, "targetClassifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getTargetClassifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ DataType target = parseType("target", json);
+ if (target != null)
+ res.setTarget(target);
+ }
+
+ protected Citation.CitationCitedArtifactPublicationFormComponent parseCitationCitedArtifactPublicationFormComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactPublicationFormComponent res = new Citation.CitationCitedArtifactPublicationFormComponent();
+ parseCitationCitedArtifactPublicationFormComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationCitedArtifactPublicationFormComponentProperties(JsonObject json, Citation.CitationCitedArtifactPublicationFormComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("publishedIn"))
+ res.setPublishedIn(parseCitationCitedArtifactPublicationFormPublishedInComponent(getJObject(json, "publishedIn")));
+ if (json.has("periodicRelease"))
+ res.setPeriodicRelease(parseCitationCitedArtifactPublicationFormPeriodicReleaseComponent(getJObject(json, "periodicRelease")));
+ if (json.has("articleDate"))
+ res.setArticleDateElement(parseDateTime(json.get("articleDate").getAsString()));
+ if (json.has("_articleDate"))
+ parseElementProperties(getJObject(json, "_articleDate"), res.getArticleDateElement());
+ if (json.has("lastRevisionDate"))
+ res.setLastRevisionDateElement(parseDateTime(json.get("lastRevisionDate").getAsString()));
+ if (json.has("_lastRevisionDate"))
+ parseElementProperties(getJObject(json, "_lastRevisionDate"), res.getLastRevisionDateElement());
+ if (json.has("language")) {
+ JsonArray array = getJArray(json, "language");
+ for (int i = 0; i < array.size(); i++) {
+ res.getLanguage().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("accessionNumber"))
+ res.setAccessionNumberElement(parseString(json.get("accessionNumber").getAsString()));
+ if (json.has("_accessionNumber"))
+ parseElementProperties(getJObject(json, "_accessionNumber"), res.getAccessionNumberElement());
+ if (json.has("pageString"))
+ res.setPageStringElement(parseString(json.get("pageString").getAsString()));
+ if (json.has("_pageString"))
+ parseElementProperties(getJObject(json, "_pageString"), res.getPageStringElement());
+ if (json.has("firstPage"))
+ res.setFirstPageElement(parseString(json.get("firstPage").getAsString()));
+ if (json.has("_firstPage"))
+ parseElementProperties(getJObject(json, "_firstPage"), res.getFirstPageElement());
+ if (json.has("lastPage"))
+ res.setLastPageElement(parseString(json.get("lastPage").getAsString()));
+ if (json.has("_lastPage"))
+ parseElementProperties(getJObject(json, "_lastPage"), res.getLastPageElement());
+ if (json.has("pageCount"))
+ res.setPageCountElement(parseString(json.get("pageCount").getAsString()));
+ if (json.has("_pageCount"))
+ parseElementProperties(getJObject(json, "_pageCount"), res.getPageCountElement());
+ if (json.has("copyright"))
+ res.setCopyrightElement(parseMarkdown(json.get("copyright").getAsString()));
+ if (json.has("_copyright"))
+ parseElementProperties(getJObject(json, "_copyright"), res.getCopyrightElement());
+ }
+
+ protected Citation.CitationCitedArtifactPublicationFormPublishedInComponent parseCitationCitedArtifactPublicationFormPublishedInComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactPublicationFormPublishedInComponent res = new Citation.CitationCitedArtifactPublicationFormPublishedInComponent();
+ parseCitationCitedArtifactPublicationFormPublishedInComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationCitedArtifactPublicationFormPublishedInComponentProperties(JsonObject json, Citation.CitationCitedArtifactPublicationFormPublishedInComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
- if (json.has("country"))
- res.setCountryElement(parseString(json.get("country").getAsString()));
- if (json.has("_country"))
- parseElementProperties(getJObject(json, "_country"), res.getCountryElement());
- if (json.has("journalIssue"))
- res.setJournalIssue(parseCitationJournalJournalIssueComponent(getJObject(json, "journalIssue")));
if (json.has("title"))
res.setTitleElement(parseString(json.get("title").getAsString()));
if (json.has("_title"))
parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
+ if (json.has("publisher"))
+ res.setPublisher(parseReference(getJObject(json, "publisher")));
+ if (json.has("publisherLocation"))
+ res.setPublisherLocationElement(parseString(json.get("publisherLocation").getAsString()));
+ if (json.has("_publisherLocation"))
+ parseElementProperties(getJObject(json, "_publisherLocation"), res.getPublisherLocationElement());
}
- protected Citation.CitationJournalJournalIssueComponent parseCitationJournalJournalIssueComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationJournalJournalIssueComponent res = new Citation.CitationJournalJournalIssueComponent();
- parseCitationJournalJournalIssueComponentProperties(json, res);
+ protected Citation.CitationCitedArtifactPublicationFormPeriodicReleaseComponent parseCitationCitedArtifactPublicationFormPeriodicReleaseComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactPublicationFormPeriodicReleaseComponent res = new Citation.CitationCitedArtifactPublicationFormPeriodicReleaseComponent();
+ parseCitationCitedArtifactPublicationFormPeriodicReleaseComponentProperties(json, res);
return res;
}
- protected void parseCitationJournalJournalIssueComponentProperties(JsonObject json, Citation.CitationJournalJournalIssueComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationCitedArtifactPublicationFormPeriodicReleaseComponentProperties(JsonObject json, Citation.CitationCitedArtifactPublicationFormPeriodicReleaseComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("citedMedium"))
res.setCitedMedium(parseCodeableConcept(getJObject(json, "citedMedium")));
@@ -5988,17 +6379,17 @@ public class JsonParser extends JsonParserBase {
res.setIssueElement(parseString(json.get("issue").getAsString()));
if (json.has("_issue"))
parseElementProperties(getJObject(json, "_issue"), res.getIssueElement());
- if (json.has("publicationDate"))
- res.setPublicationDate(parseCitationJournalJournalIssuePublicationDateComponent(getJObject(json, "publicationDate")));
+ if (json.has("dateOfPublication"))
+ res.setDateOfPublication(parseCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent(getJObject(json, "dateOfPublication")));
}
- protected Citation.CitationJournalJournalIssuePublicationDateComponent parseCitationJournalJournalIssuePublicationDateComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationJournalJournalIssuePublicationDateComponent res = new Citation.CitationJournalJournalIssuePublicationDateComponent();
- parseCitationJournalJournalIssuePublicationDateComponentProperties(json, res);
+ protected Citation.CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent parseCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent res = new Citation.CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent();
+ parseCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponentProperties(json, res);
return res;
}
- protected void parseCitationJournalJournalIssuePublicationDateComponentProperties(JsonObject json, Citation.CitationJournalJournalIssuePublicationDateComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponentProperties(JsonObject json, Citation.CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("date"))
res.setDateElement(parseDate(json.get("date").getAsString()));
@@ -6026,109 +6417,13 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_text"), res.getTextElement());
}
- protected Citation.CitationPublicationInfoComponent parseCitationPublicationInfoComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationPublicationInfoComponent res = new Citation.CitationPublicationInfoComponent();
- parseCitationPublicationInfoComponentProperties(json, res);
+ protected Citation.CitationCitedArtifactWebLocationComponent parseCitationCitedArtifactWebLocationComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactWebLocationComponent res = new Citation.CitationCitedArtifactWebLocationComponent();
+ parseCitationCitedArtifactWebLocationComponentProperties(json, res);
return res;
}
- protected void parseCitationPublicationInfoComponentProperties(JsonObject json, Citation.CitationPublicationInfoComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("publishedIn"))
- res.setPublishedIn(parseCitationPublicationInfoPublishedInComponent(getJObject(json, "publishedIn")));
- if (json.has("entryDate"))
- res.setEntryDateElement(parseDateTime(json.get("entryDate").getAsString()));
- if (json.has("_entryDate"))
- parseElementProperties(getJObject(json, "_entryDate"), res.getEntryDateElement());
- if (json.has("revisionDate"))
- res.setRevisionDateElement(parseDateTime(json.get("revisionDate").getAsString()));
- if (json.has("_revisionDate"))
- parseElementProperties(getJObject(json, "_revisionDate"), res.getRevisionDateElement());
- if (json.has("pageCount"))
- res.setPageCountElement(parseString(json.get("pageCount").getAsString()));
- if (json.has("_pageCount"))
- parseElementProperties(getJObject(json, "_pageCount"), res.getPageCountElement());
- }
-
- protected Citation.CitationPublicationInfoPublishedInComponent parseCitationPublicationInfoPublishedInComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationPublicationInfoPublishedInComponent res = new Citation.CitationPublicationInfoPublishedInComponent();
- parseCitationPublicationInfoPublishedInComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationPublicationInfoPublishedInComponentProperties(JsonObject json, Citation.CitationPublicationInfoPublishedInComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("type"))
- res.setType(parseCodeableConcept(getJObject(json, "type")));
- if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
- for (int i = 0; i < array.size(); i++) {
- res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("name"))
- res.setNameElement(parseString(json.get("name").getAsString()));
- if (json.has("_name"))
- parseElementProperties(getJObject(json, "_name"), res.getNameElement());
- if (json.has("publisher"))
- res.setPublisher(parseReference(getJObject(json, "publisher")));
- if (json.has("publisherLocation"))
- res.setPublisherLocationElement(parseString(json.get("publisherLocation").getAsString()));
- if (json.has("_publisherLocation"))
- parseElementProperties(getJObject(json, "_publisherLocation"), res.getPublisherLocationElement());
- if (json.has("startDate"))
- res.setStartDateElement(parseDate(json.get("startDate").getAsString()));
- if (json.has("_startDate"))
- parseElementProperties(getJObject(json, "_startDate"), res.getStartDateElement());
- }
-
- protected Citation.CitationAlternativeTitleComponent parseCitationAlternativeTitleComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationAlternativeTitleComponent res = new Citation.CitationAlternativeTitleComponent();
- parseCitationAlternativeTitleComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationAlternativeTitleComponentProperties(JsonObject json, Citation.CitationAlternativeTitleComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("type"))
- res.setType(parseCodeableConcept(getJObject(json, "type")));
- if (json.has("language"))
- res.setLanguage(parseCodeableConcept(getJObject(json, "language")));
- if (json.has("title"))
- res.setTitleElement(parseMarkdown(json.get("title").getAsString()));
- if (json.has("_title"))
- parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
- }
-
- protected Citation.CitationPaginationComponent parseCitationPaginationComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationPaginationComponent res = new Citation.CitationPaginationComponent();
- parseCitationPaginationComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationPaginationComponentProperties(JsonObject json, Citation.CitationPaginationComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("pageString"))
- res.setPageStringElement(parseString(json.get("pageString").getAsString()));
- if (json.has("_pageString"))
- parseElementProperties(getJObject(json, "_pageString"), res.getPageStringElement());
- if (json.has("firstPage"))
- res.setFirstPageElement(parseString(json.get("firstPage").getAsString()));
- if (json.has("_firstPage"))
- parseElementProperties(getJObject(json, "_firstPage"), res.getFirstPageElement());
- if (json.has("lastPage"))
- res.setLastPageElement(parseString(json.get("lastPage").getAsString()));
- if (json.has("_lastPage"))
- parseElementProperties(getJObject(json, "_lastPage"), res.getLastPageElement());
- }
-
- protected Citation.CitationArticleUrlComponent parseCitationArticleUrlComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationArticleUrlComponent res = new Citation.CitationArticleUrlComponent();
- parseCitationArticleUrlComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationArticleUrlComponentProperties(JsonObject json, Citation.CitationArticleUrlComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationCitedArtifactWebLocationComponentProperties(JsonObject json, Citation.CitationCitedArtifactWebLocationComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
@@ -6138,61 +6433,83 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
}
- protected Citation.CitationAlternativeAbstractComponent parseCitationAlternativeAbstractComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationAlternativeAbstractComponent res = new Citation.CitationAlternativeAbstractComponent();
- parseCitationAlternativeAbstractComponentProperties(json, res);
+ protected Citation.CitationCitedArtifactClassificationComponent parseCitationCitedArtifactClassificationComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactClassificationComponent res = new Citation.CitationCitedArtifactClassificationComponent();
+ parseCitationCitedArtifactClassificationComponentProperties(json, res);
return res;
}
- protected void parseCitationAlternativeAbstractComponentProperties(JsonObject json, Citation.CitationAlternativeAbstractComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationCitedArtifactClassificationComponentProperties(JsonObject json, Citation.CitationCitedArtifactClassificationComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
- if (json.has("language"))
- res.setLanguage(parseCodeableConcept(getJObject(json, "language")));
- if (json.has("abstract"))
- res.setAbstractElement(parseMarkdown(json.get("abstract").getAsString()));
- if (json.has("_abstract"))
- parseElementProperties(getJObject(json, "_abstract"), res.getAbstractElement());
- if (json.has("abstractCopyright"))
- res.setAbstractCopyrightElement(parseMarkdown(json.get("abstractCopyright").getAsString()));
- if (json.has("_abstractCopyright"))
- parseElementProperties(getJObject(json, "_abstractCopyright"), res.getAbstractCopyrightElement());
+ if (json.has("classifier")) {
+ JsonArray array = getJArray(json, "classifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getClassifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("whoClassified"))
+ res.setWhoClassified(parseCitationCitedArtifactClassificationWhoClassifiedComponent(getJObject(json, "whoClassified")));
}
- protected Citation.CitationContributorshipComponent parseCitationContributorshipComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationContributorshipComponent res = new Citation.CitationContributorshipComponent();
- parseCitationContributorshipComponentProperties(json, res);
+ protected Citation.CitationCitedArtifactClassificationWhoClassifiedComponent parseCitationCitedArtifactClassificationWhoClassifiedComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactClassificationWhoClassifiedComponent res = new Citation.CitationCitedArtifactClassificationWhoClassifiedComponent();
+ parseCitationCitedArtifactClassificationWhoClassifiedComponentProperties(json, res);
return res;
}
- protected void parseCitationContributorshipComponentProperties(JsonObject json, Citation.CitationContributorshipComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationCitedArtifactClassificationWhoClassifiedComponentProperties(JsonObject json, Citation.CitationCitedArtifactClassificationWhoClassifiedComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("person"))
+ res.setPerson(parseReference(getJObject(json, "person")));
+ if (json.has("organization"))
+ res.setOrganization(parseReference(getJObject(json, "organization")));
+ if (json.has("publisher"))
+ res.setPublisher(parseReference(getJObject(json, "publisher")));
+ if (json.has("classifierCopyright"))
+ res.setClassifierCopyrightElement(parseString(json.get("classifierCopyright").getAsString()));
+ if (json.has("_classifierCopyright"))
+ parseElementProperties(getJObject(json, "_classifierCopyright"), res.getClassifierCopyrightElement());
+ if (json.has("freeToShare"))
+ res.setFreeToShareElement(parseBoolean(json.get("freeToShare").getAsBoolean()));
+ if (json.has("_freeToShare"))
+ parseElementProperties(getJObject(json, "_freeToShare"), res.getFreeToShareElement());
+ }
+
+ protected Citation.CitationCitedArtifactContributorshipComponent parseCitationCitedArtifactContributorshipComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactContributorshipComponent res = new Citation.CitationCitedArtifactContributorshipComponent();
+ parseCitationCitedArtifactContributorshipComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationCitedArtifactContributorshipComponentProperties(JsonObject json, Citation.CitationCitedArtifactContributorshipComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("complete"))
res.setCompleteElement(parseBoolean(json.get("complete").getAsBoolean()));
if (json.has("_complete"))
parseElementProperties(getJObject(json, "_complete"), res.getCompleteElement());
if (json.has("entry")) {
- JsonArray array = json.getAsJsonArray("entry");
+ JsonArray array = getJArray(json, "entry");
for (int i = 0; i < array.size(); i++) {
- res.getEntry().add(parseCitationContributorshipEntryComponent(array.get(i).getAsJsonObject()));
+ res.getEntry().add(parseCitationCitedArtifactContributorshipEntryComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("summary")) {
- JsonArray array = json.getAsJsonArray("summary");
+ JsonArray array = getJArray(json, "summary");
for (int i = 0; i < array.size(); i++) {
- res.getSummary().add(parseCitationContributorshipSummaryComponent(array.get(i).getAsJsonObject()));
+ res.getSummary().add(parseCitationCitedArtifactContributorshipSummaryComponent(array.get(i).getAsJsonObject()));
}
};
}
- protected Citation.CitationContributorshipEntryComponent parseCitationContributorshipEntryComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationContributorshipEntryComponent res = new Citation.CitationContributorshipEntryComponent();
- parseCitationContributorshipEntryComponentProperties(json, res);
+ protected Citation.CitationCitedArtifactContributorshipEntryComponent parseCitationCitedArtifactContributorshipEntryComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactContributorshipEntryComponent res = new Citation.CitationCitedArtifactContributorshipEntryComponent();
+ parseCitationCitedArtifactContributorshipEntryComponentProperties(json, res);
return res;
}
- protected void parseCitationContributorshipEntryComponentProperties(JsonObject json, Citation.CitationContributorshipEntryComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationCitedArtifactContributorshipEntryComponentProperties(JsonObject json, Citation.CitationCitedArtifactContributorshipEntryComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("name"))
res.setName(parseHumanName(getJObject(json, "name")));
@@ -6205,56 +6522,60 @@ public class JsonParser extends JsonParserBase {
if (json.has("_collectiveName"))
parseElementProperties(getJObject(json, "_collectiveName"), res.getCollectiveNameElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("affiliationInfo")) {
- JsonArray array = json.getAsJsonArray("affiliationInfo");
+ JsonArray array = getJArray(json, "affiliationInfo");
for (int i = 0; i < array.size(); i++) {
- res.getAffiliationInfo().add(parseCitationContributorshipEntryAffiliationInfoComponent(array.get(i).getAsJsonObject()));
+ res.getAffiliationInfo().add(parseCitationCitedArtifactContributorshipEntryAffiliationInfoComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("address")) {
- JsonArray array = json.getAsJsonArray("address");
+ JsonArray array = getJArray(json, "address");
for (int i = 0; i < array.size(); i++) {
res.getAddress().add(parseAddress(array.get(i).getAsJsonObject()));
}
};
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
};
- if (json.has("contribution")) {
- JsonArray array = json.getAsJsonArray("contribution");
+ if (json.has("contributionType")) {
+ JsonArray array = getJArray(json, "contributionType");
for (int i = 0; i < array.size(); i++) {
- res.getContribution().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ res.getContributionType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
- if (json.has("notAnAuthor"))
- res.setNotAnAuthorElement(parseBoolean(json.get("notAnAuthor").getAsBoolean()));
- if (json.has("_notAnAuthor"))
- parseElementProperties(getJObject(json, "_notAnAuthor"), res.getNotAnAuthorElement());
- if (json.has("correspondingAuthor"))
- res.setCorrespondingAuthorElement(parseBoolean(json.get("correspondingAuthor").getAsBoolean()));
- if (json.has("_correspondingAuthor"))
- parseElementProperties(getJObject(json, "_correspondingAuthor"), res.getCorrespondingAuthorElement());
+ if (json.has("role"))
+ res.setRole(parseCodeableConcept(getJObject(json, "role")));
+ if (json.has("contributionInstance")) {
+ JsonArray array = getJArray(json, "contributionInstance");
+ for (int i = 0; i < array.size(); i++) {
+ res.getContributionInstance().add(parseCitationCitedArtifactContributorshipEntryContributionInstanceComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("correspondingContact"))
+ res.setCorrespondingContactElement(parseBoolean(json.get("correspondingContact").getAsBoolean()));
+ if (json.has("_correspondingContact"))
+ parseElementProperties(getJObject(json, "_correspondingContact"), res.getCorrespondingContactElement());
if (json.has("listOrder"))
res.setListOrderElement(parsePositiveInt(json.get("listOrder").getAsString()));
if (json.has("_listOrder"))
parseElementProperties(getJObject(json, "_listOrder"), res.getListOrderElement());
}
- protected Citation.CitationContributorshipEntryAffiliationInfoComponent parseCitationContributorshipEntryAffiliationInfoComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationContributorshipEntryAffiliationInfoComponent res = new Citation.CitationContributorshipEntryAffiliationInfoComponent();
- parseCitationContributorshipEntryAffiliationInfoComponentProperties(json, res);
+ protected Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent parseCitationCitedArtifactContributorshipEntryAffiliationInfoComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent res = new Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent();
+ parseCitationCitedArtifactContributorshipEntryAffiliationInfoComponentProperties(json, res);
return res;
}
- protected void parseCitationContributorshipEntryAffiliationInfoComponentProperties(JsonObject json, Citation.CitationContributorshipEntryAffiliationInfoComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationCitedArtifactContributorshipEntryAffiliationInfoComponentProperties(JsonObject json, Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("affiliation"))
res.setAffiliationElement(parseString(json.get("affiliation").getAsString()));
@@ -6265,20 +6586,36 @@ public class JsonParser extends JsonParserBase {
if (json.has("_role"))
parseElementProperties(getJObject(json, "_role"), res.getRoleElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
}
- protected Citation.CitationContributorshipSummaryComponent parseCitationContributorshipSummaryComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationContributorshipSummaryComponent res = new Citation.CitationContributorshipSummaryComponent();
- parseCitationContributorshipSummaryComponentProperties(json, res);
+ protected Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent parseCitationCitedArtifactContributorshipEntryContributionInstanceComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent res = new Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent();
+ parseCitationCitedArtifactContributorshipEntryContributionInstanceComponentProperties(json, res);
return res;
}
- protected void parseCitationContributorshipSummaryComponentProperties(JsonObject json, Citation.CitationContributorshipSummaryComponent res) throws IOException, FHIRFormatError {
+ protected void parseCitationCitedArtifactContributorshipEntryContributionInstanceComponentProperties(JsonObject json, Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("time"))
+ res.setTimeElement(parseDateTime(json.get("time").getAsString()));
+ if (json.has("_time"))
+ parseElementProperties(getJObject(json, "_time"), res.getTimeElement());
+ }
+
+ protected Citation.CitationCitedArtifactContributorshipSummaryComponent parseCitationCitedArtifactContributorshipSummaryComponent(JsonObject json) throws IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactContributorshipSummaryComponent res = new Citation.CitationCitedArtifactContributorshipSummaryComponent();
+ parseCitationCitedArtifactContributorshipSummaryComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseCitationCitedArtifactContributorshipSummaryComponentProperties(JsonObject json, Citation.CitationCitedArtifactContributorshipSummaryComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
@@ -6292,278 +6629,6 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_value"), res.getValueElement());
}
- protected Citation.CitationAlternativeFormComponent parseCitationAlternativeFormComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationAlternativeFormComponent res = new Citation.CitationAlternativeFormComponent();
- parseCitationAlternativeFormComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationAlternativeFormComponentProperties(JsonObject json, Citation.CitationAlternativeFormComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("publishingModel"))
- res.setPublishingModel(parseCodeableConcept(getJObject(json, "publishingModel")));
- if (json.has("language"))
- res.setLanguage(parseCodeableConcept(getJObject(json, "language")));
- if (json.has("journalIssue"))
- res.setJournalIssue(parseCitationAlternativeFormJournalIssueComponent(getJObject(json, "journalIssue")));
- if (json.has("pagination"))
- res.setPagination(parseCitationAlternativeFormPaginationComponent(getJObject(json, "pagination")));
- if (json.has("publicationInfo"))
- res.setPublicationInfo(parseCitationAlternativeFormPublicationInfoComponent(getJObject(json, "publicationInfo")));
- }
-
- protected Citation.CitationAlternativeFormJournalIssueComponent parseCitationAlternativeFormJournalIssueComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationAlternativeFormJournalIssueComponent res = new Citation.CitationAlternativeFormJournalIssueComponent();
- parseCitationAlternativeFormJournalIssueComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationAlternativeFormJournalIssueComponentProperties(JsonObject json, Citation.CitationAlternativeFormJournalIssueComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("citedMedium"))
- res.setCitedMedium(parseCodeableConcept(getJObject(json, "citedMedium")));
- if (json.has("volume"))
- res.setVolumeElement(parseString(json.get("volume").getAsString()));
- if (json.has("_volume"))
- parseElementProperties(getJObject(json, "_volume"), res.getVolumeElement());
- if (json.has("issue"))
- res.setIssueElement(parseString(json.get("issue").getAsString()));
- if (json.has("_issue"))
- parseElementProperties(getJObject(json, "_issue"), res.getIssueElement());
- if (json.has("publicationDate"))
- res.setPublicationDate(parseCitationAlternativeFormJournalIssuePublicationDateComponent(getJObject(json, "publicationDate")));
- }
-
- protected Citation.CitationAlternativeFormJournalIssuePublicationDateComponent parseCitationAlternativeFormJournalIssuePublicationDateComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationAlternativeFormJournalIssuePublicationDateComponent res = new Citation.CitationAlternativeFormJournalIssuePublicationDateComponent();
- parseCitationAlternativeFormJournalIssuePublicationDateComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationAlternativeFormJournalIssuePublicationDateComponentProperties(JsonObject json, Citation.CitationAlternativeFormJournalIssuePublicationDateComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("date"))
- res.setDateElement(parseDate(json.get("date").getAsString()));
- if (json.has("_date"))
- parseElementProperties(getJObject(json, "_date"), res.getDateElement());
- if (json.has("year"))
- res.setYearElement(parseString(json.get("year").getAsString()));
- if (json.has("_year"))
- parseElementProperties(getJObject(json, "_year"), res.getYearElement());
- if (json.has("month"))
- res.setMonthElement(parseString(json.get("month").getAsString()));
- if (json.has("_month"))
- parseElementProperties(getJObject(json, "_month"), res.getMonthElement());
- if (json.has("day"))
- res.setDayElement(parseString(json.get("day").getAsString()));
- if (json.has("_day"))
- parseElementProperties(getJObject(json, "_day"), res.getDayElement());
- if (json.has("season"))
- res.setSeasonElement(parseString(json.get("season").getAsString()));
- if (json.has("_season"))
- parseElementProperties(getJObject(json, "_season"), res.getSeasonElement());
- if (json.has("text"))
- res.setTextElement(parseString(json.get("text").getAsString()));
- if (json.has("_text"))
- parseElementProperties(getJObject(json, "_text"), res.getTextElement());
- }
-
- protected Citation.CitationAlternativeFormPaginationComponent parseCitationAlternativeFormPaginationComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationAlternativeFormPaginationComponent res = new Citation.CitationAlternativeFormPaginationComponent();
- parseCitationAlternativeFormPaginationComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationAlternativeFormPaginationComponentProperties(JsonObject json, Citation.CitationAlternativeFormPaginationComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("pageString"))
- res.setPageStringElement(parseString(json.get("pageString").getAsString()));
- if (json.has("_pageString"))
- parseElementProperties(getJObject(json, "_pageString"), res.getPageStringElement());
- if (json.has("firstPage"))
- res.setFirstPageElement(parseString(json.get("firstPage").getAsString()));
- if (json.has("_firstPage"))
- parseElementProperties(getJObject(json, "_firstPage"), res.getFirstPageElement());
- if (json.has("lastPage"))
- res.setLastPageElement(parseString(json.get("lastPage").getAsString()));
- if (json.has("_lastPage"))
- parseElementProperties(getJObject(json, "_lastPage"), res.getLastPageElement());
- }
-
- protected Citation.CitationAlternativeFormPublicationInfoComponent parseCitationAlternativeFormPublicationInfoComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationAlternativeFormPublicationInfoComponent res = new Citation.CitationAlternativeFormPublicationInfoComponent();
- parseCitationAlternativeFormPublicationInfoComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationAlternativeFormPublicationInfoComponentProperties(JsonObject json, Citation.CitationAlternativeFormPublicationInfoComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("publishedIn"))
- res.setPublishedIn(parseCitationAlternativeFormPublicationInfoPublishedInComponent(getJObject(json, "publishedIn")));
- if (json.has("entryDate"))
- res.setEntryDateElement(parseDateTime(json.get("entryDate").getAsString()));
- if (json.has("_entryDate"))
- parseElementProperties(getJObject(json, "_entryDate"), res.getEntryDateElement());
- if (json.has("revisionDate"))
- res.setRevisionDateElement(parseDateTime(json.get("revisionDate").getAsString()));
- if (json.has("_revisionDate"))
- parseElementProperties(getJObject(json, "_revisionDate"), res.getRevisionDateElement());
- if (json.has("pageCount"))
- res.setPageCountElement(parseString(json.get("pageCount").getAsString()));
- if (json.has("_pageCount"))
- parseElementProperties(getJObject(json, "_pageCount"), res.getPageCountElement());
- }
-
- protected Citation.CitationAlternativeFormPublicationInfoPublishedInComponent parseCitationAlternativeFormPublicationInfoPublishedInComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationAlternativeFormPublicationInfoPublishedInComponent res = new Citation.CitationAlternativeFormPublicationInfoPublishedInComponent();
- parseCitationAlternativeFormPublicationInfoPublishedInComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationAlternativeFormPublicationInfoPublishedInComponentProperties(JsonObject json, Citation.CitationAlternativeFormPublicationInfoPublishedInComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("type"))
- res.setType(parseCodeableConcept(getJObject(json, "type")));
- if (json.has("name"))
- res.setNameElement(parseString(json.get("name").getAsString()));
- if (json.has("_name"))
- parseElementProperties(getJObject(json, "_name"), res.getNameElement());
- if (json.has("publisher"))
- res.setPublisher(parseReference(getJObject(json, "publisher")));
- if (json.has("publisherLocation"))
- res.setPublisherLocationElement(parseString(json.get("publisherLocation").getAsString()));
- if (json.has("_publisherLocation"))
- parseElementProperties(getJObject(json, "_publisherLocation"), res.getPublisherLocationElement());
- if (json.has("startDate"))
- res.setStartDateElement(parseDate(json.get("startDate").getAsString()));
- if (json.has("_startDate"))
- parseElementProperties(getJObject(json, "_startDate"), res.getStartDateElement());
- }
-
- protected Citation.CitationKeywordListComponent parseCitationKeywordListComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationKeywordListComponent res = new Citation.CitationKeywordListComponent();
- parseCitationKeywordListComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationKeywordListComponentProperties(JsonObject json, Citation.CitationKeywordListComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("owner"))
- res.setOwnerElement(parseString(json.get("owner").getAsString()));
- if (json.has("_owner"))
- parseElementProperties(getJObject(json, "_owner"), res.getOwnerElement());
- if (json.has("keyword")) {
- JsonArray array = json.getAsJsonArray("keyword");
- for (int i = 0; i < array.size(); i++) {
- res.getKeyword().add(parseCitationKeywordListKeywordComponent(array.get(i).getAsJsonObject()));
- }
- };
- }
-
- protected Citation.CitationKeywordListKeywordComponent parseCitationKeywordListKeywordComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationKeywordListKeywordComponent res = new Citation.CitationKeywordListKeywordComponent();
- parseCitationKeywordListKeywordComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationKeywordListKeywordComponentProperties(JsonObject json, Citation.CitationKeywordListKeywordComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("majorTopic"))
- res.setMajorTopicElement(parseBoolean(json.get("majorTopic").getAsBoolean()));
- if (json.has("_majorTopic"))
- parseElementProperties(getJObject(json, "_majorTopic"), res.getMajorTopicElement());
- if (json.has("value"))
- res.setValueElement(parseString(json.get("value").getAsString()));
- if (json.has("_value"))
- parseElementProperties(getJObject(json, "_value"), res.getValueElement());
- }
-
- protected Citation.CitationMedlinePubMedComponent parseCitationMedlinePubMedComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationMedlinePubMedComponent res = new Citation.CitationMedlinePubMedComponent();
- parseCitationMedlinePubMedComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationMedlinePubMedComponentProperties(JsonObject json, Citation.CitationMedlinePubMedComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("medlineState"))
- res.setMedlineState(parseCodeableConcept(getJObject(json, "medlineState")));
- if (json.has("owner"))
- res.setOwner(parseCodeableConcept(getJObject(json, "owner")));
- if (json.has("pmid"))
- res.setPmidElement(parsePositiveInt(json.get("pmid").getAsString()));
- if (json.has("_pmid"))
- parseElementProperties(getJObject(json, "_pmid"), res.getPmidElement());
- if (json.has("pmidVersion"))
- res.setPmidVersionElement(parsePositiveInt(json.get("pmidVersion").getAsString()));
- if (json.has("_pmidVersion"))
- parseElementProperties(getJObject(json, "_pmidVersion"), res.getPmidVersionElement());
- if (json.has("dateCreated"))
- res.setDateCreatedElement(parseDate(json.get("dateCreated").getAsString()));
- if (json.has("_dateCreated"))
- parseElementProperties(getJObject(json, "_dateCreated"), res.getDateCreatedElement());
- if (json.has("dateCompleted"))
- res.setDateCompletedElement(parseDate(json.get("dateCompleted").getAsString()));
- if (json.has("_dateCompleted"))
- parseElementProperties(getJObject(json, "_dateCompleted"), res.getDateCompletedElement());
- if (json.has("dateRevised"))
- res.setDateRevisedElement(parseDate(json.get("dateRevised").getAsString()));
- if (json.has("_dateRevised"))
- parseElementProperties(getJObject(json, "_dateRevised"), res.getDateRevisedElement());
- if (json.has("pubMedPubDate")) {
- JsonArray array = json.getAsJsonArray("pubMedPubDate");
- for (int i = 0; i < array.size(); i++) {
- res.getPubMedPubDate().add(parseCitationMedlinePubMedPubMedPubDateComponent(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("publicationState"))
- res.setPublicationState(parseCodeableConcept(getJObject(json, "publicationState")));
- if (json.has("relatedArticle")) {
- JsonArray array = json.getAsJsonArray("relatedArticle");
- for (int i = 0; i < array.size(); i++) {
- res.getRelatedArticle().add(parseCitationMedlinePubMedRelatedArticleComponent(array.get(i).getAsJsonObject()));
- }
- };
- }
-
- protected Citation.CitationMedlinePubMedPubMedPubDateComponent parseCitationMedlinePubMedPubMedPubDateComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationMedlinePubMedPubMedPubDateComponent res = new Citation.CitationMedlinePubMedPubMedPubDateComponent();
- parseCitationMedlinePubMedPubMedPubDateComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationMedlinePubMedPubMedPubDateComponentProperties(JsonObject json, Citation.CitationMedlinePubMedPubMedPubDateComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("publicationState"))
- res.setPublicationState(parseCodeableConcept(getJObject(json, "publicationState")));
- if (json.has("date"))
- res.setDateElement(parseDateTime(json.get("date").getAsString()));
- if (json.has("_date"))
- parseElementProperties(getJObject(json, "_date"), res.getDateElement());
- }
-
- protected Citation.CitationMedlinePubMedRelatedArticleComponent parseCitationMedlinePubMedRelatedArticleComponent(JsonObject json) throws IOException, FHIRFormatError {
- Citation.CitationMedlinePubMedRelatedArticleComponent res = new Citation.CitationMedlinePubMedRelatedArticleComponent();
- parseCitationMedlinePubMedRelatedArticleComponentProperties(json, res);
- return res;
- }
-
- protected void parseCitationMedlinePubMedRelatedArticleComponentProperties(JsonObject json, Citation.CitationMedlinePubMedRelatedArticleComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("citationReference"))
- res.setCitationReference(parseReference(getJObject(json, "citationReference")));
- if (json.has("citationMarkdown"))
- res.setCitationMarkdownElement(parseMarkdown(json.get("citationMarkdown").getAsString()));
- if (json.has("_citationMarkdown"))
- parseElementProperties(getJObject(json, "_citationMarkdown"), res.getCitationMarkdownElement());
- if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
- for (int i = 0; i < array.size(); i++) {
- res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
- }
- };
- }
-
protected Claim parseClaim(JsonObject json) throws IOException, FHIRFormatError {
Claim res = new Claim();
parseClaimProperties(json, res);
@@ -6573,7 +6638,7 @@ public class JsonParser extends JsonParserBase {
protected void parseClaimProperties(JsonObject json, Claim res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -6609,7 +6674,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("fundsReserve"))
res.setFundsReserve(parseCodeableConcept(getJObject(json, "fundsReserve")));
if (json.has("related")) {
- JsonArray array = json.getAsJsonArray("related");
+ JsonArray array = getJArray(json, "related");
for (int i = 0; i < array.size(); i++) {
res.getRelated().add(parseClaimRelatedClaimComponent(array.get(i).getAsJsonObject()));
}
@@ -6625,31 +6690,31 @@ public class JsonParser extends JsonParserBase {
if (json.has("facility"))
res.setFacility(parseReference(getJObject(json, "facility")));
if (json.has("careTeam")) {
- JsonArray array = json.getAsJsonArray("careTeam");
+ JsonArray array = getJArray(json, "careTeam");
for (int i = 0; i < array.size(); i++) {
res.getCareTeam().add(parseClaimCareTeamComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("supportingInfo")) {
- JsonArray array = json.getAsJsonArray("supportingInfo");
+ JsonArray array = getJArray(json, "supportingInfo");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInfo().add(parseClaimSupportingInformationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("diagnosis")) {
- JsonArray array = json.getAsJsonArray("diagnosis");
+ JsonArray array = getJArray(json, "diagnosis");
for (int i = 0; i < array.size(); i++) {
res.getDiagnosis().add(parseClaimDiagnosisComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("procedure")) {
- JsonArray array = json.getAsJsonArray("procedure");
+ JsonArray array = getJArray(json, "procedure");
for (int i = 0; i < array.size(); i++) {
res.getProcedure().add(parseClaimProcedureComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("insurance")) {
- JsonArray array = json.getAsJsonArray("insurance");
+ JsonArray array = getJArray(json, "insurance");
for (int i = 0; i < array.size(); i++) {
res.getInsurance().add(parseClaimInsuranceComponent(array.get(i).getAsJsonObject()));
}
@@ -6657,7 +6722,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("accident"))
res.setAccident(parseClaimAccidentComponent(getJObject(json, "accident")));
if (json.has("item")) {
- JsonArray array = json.getAsJsonArray("item");
+ JsonArray array = getJArray(json, "item");
for (int i = 0; i < array.size(); i++) {
res.getItem().add(parseClaimItemComponent(array.get(i).getAsJsonObject()));
}
@@ -6762,7 +6827,7 @@ public class JsonParser extends JsonParserBase {
if (diagnosis != null)
res.setDiagnosis(diagnosis);
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -6786,7 +6851,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_sequence"))
parseElementProperties(getJObject(json, "_sequence"), res.getSequenceElement());
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -6799,7 +6864,7 @@ public class JsonParser extends JsonParserBase {
if (procedure != null)
res.setProcedure(procedure);
if (json.has("udi")) {
- JsonArray array = json.getAsJsonArray("udi");
+ JsonArray array = getJArray(json, "udi");
for (int i = 0; i < array.size(); i++) {
res.getUdi().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -6831,7 +6896,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_businessArrangement"))
parseElementProperties(getJObject(json, "_businessArrangement"), res.getBusinessArrangementElement());
if (json.has("preAuthRef")) {
- JsonArray array = json.getAsJsonArray("preAuthRef");
+ JsonArray array = getJArray(json, "preAuthRef");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPreAuthRef().add(new StringType());
@@ -6841,7 +6906,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_preAuthRef")) {
- JsonArray array = json.getAsJsonArray("_preAuthRef");
+ JsonArray array = getJArray(json, "_preAuthRef");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPreAuthRef().size())
res.getPreAuthRef().add(parseString(null));
@@ -6885,7 +6950,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_sequence"))
parseElementProperties(getJObject(json, "_sequence"), res.getSequenceElement());
if (json.has("careTeamSequence")) {
- JsonArray array = json.getAsJsonArray("careTeamSequence");
+ JsonArray array = getJArray(json, "careTeamSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getCareTeamSequence().add(new PositiveIntType());
@@ -6895,7 +6960,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_careTeamSequence")) {
- JsonArray array = json.getAsJsonArray("_careTeamSequence");
+ JsonArray array = getJArray(json, "_careTeamSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getCareTeamSequence().size())
res.getCareTeamSequence().add(parsePositiveInt(null));
@@ -6904,7 +6969,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("diagnosisSequence")) {
- JsonArray array = json.getAsJsonArray("diagnosisSequence");
+ JsonArray array = getJArray(json, "diagnosisSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDiagnosisSequence().add(new PositiveIntType());
@@ -6914,7 +6979,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_diagnosisSequence")) {
- JsonArray array = json.getAsJsonArray("_diagnosisSequence");
+ JsonArray array = getJArray(json, "_diagnosisSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDiagnosisSequence().size())
res.getDiagnosisSequence().add(parsePositiveInt(null));
@@ -6923,7 +6988,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("procedureSequence")) {
- JsonArray array = json.getAsJsonArray("procedureSequence");
+ JsonArray array = getJArray(json, "procedureSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getProcedureSequence().add(new PositiveIntType());
@@ -6933,7 +6998,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_procedureSequence")) {
- JsonArray array = json.getAsJsonArray("_procedureSequence");
+ JsonArray array = getJArray(json, "_procedureSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getProcedureSequence().size())
res.getProcedureSequence().add(parsePositiveInt(null));
@@ -6942,7 +7007,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("informationSequence")) {
- JsonArray array = json.getAsJsonArray("informationSequence");
+ JsonArray array = getJArray(json, "informationSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInformationSequence().add(new PositiveIntType());
@@ -6952,7 +7017,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_informationSequence")) {
- JsonArray array = json.getAsJsonArray("_informationSequence");
+ JsonArray array = getJArray(json, "_informationSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInformationSequence().size())
res.getInformationSequence().add(parsePositiveInt(null));
@@ -6967,13 +7032,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("programCode")) {
- JsonArray array = json.getAsJsonArray("programCode");
+ JsonArray array = getJArray(json, "programCode");
for (int i = 0; i < array.size(); i++) {
res.getProgramCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -6995,7 +7060,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("net"))
res.setNet(parseMoney(getJObject(json, "net")));
if (json.has("udi")) {
- JsonArray array = json.getAsJsonArray("udi");
+ JsonArray array = getJArray(json, "udi");
for (int i = 0; i < array.size(); i++) {
res.getUdi().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -7003,19 +7068,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("bodySite"))
res.setBodySite(parseCodeableConcept(getJObject(json, "bodySite")));
if (json.has("subSite")) {
- JsonArray array = json.getAsJsonArray("subSite");
+ JsonArray array = getJArray(json, "subSite");
for (int i = 0; i < array.size(); i++) {
res.getSubSite().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("encounter")) {
- JsonArray array = json.getAsJsonArray("encounter");
+ JsonArray array = getJArray(json, "encounter");
for (int i = 0; i < array.size(); i++) {
res.getEncounter().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("detail")) {
- JsonArray array = json.getAsJsonArray("detail");
+ JsonArray array = getJArray(json, "detail");
for (int i = 0; i < array.size(); i++) {
res.getDetail().add(parseClaimDetailComponent(array.get(i).getAsJsonObject()));
}
@@ -7041,13 +7106,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("programCode")) {
- JsonArray array = json.getAsJsonArray("programCode");
+ JsonArray array = getJArray(json, "programCode");
for (int i = 0; i < array.size(); i++) {
res.getProgramCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -7063,13 +7128,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("net"))
res.setNet(parseMoney(getJObject(json, "net")));
if (json.has("udi")) {
- JsonArray array = json.getAsJsonArray("udi");
+ JsonArray array = getJArray(json, "udi");
for (int i = 0; i < array.size(); i++) {
res.getUdi().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("subDetail")) {
- JsonArray array = json.getAsJsonArray("subDetail");
+ JsonArray array = getJArray(json, "subDetail");
for (int i = 0; i < array.size(); i++) {
res.getSubDetail().add(parseClaimSubDetailComponent(array.get(i).getAsJsonObject()));
}
@@ -7095,13 +7160,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("programCode")) {
- JsonArray array = json.getAsJsonArray("programCode");
+ JsonArray array = getJArray(json, "programCode");
for (int i = 0; i < array.size(); i++) {
res.getProgramCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -7117,7 +7182,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("net"))
res.setNet(parseMoney(getJObject(json, "net")));
if (json.has("udi")) {
- JsonArray array = json.getAsJsonArray("udi");
+ JsonArray array = getJArray(json, "udi");
for (int i = 0; i < array.size(); i++) {
res.getUdi().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -7133,7 +7198,7 @@ public class JsonParser extends JsonParserBase {
protected void parseClaimResponseProperties(JsonObject json, ClaimResponse res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -7179,25 +7244,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("payeeType"))
res.setPayeeType(parseCodeableConcept(getJObject(json, "payeeType")));
if (json.has("item")) {
- JsonArray array = json.getAsJsonArray("item");
+ JsonArray array = getJArray(json, "item");
for (int i = 0; i < array.size(); i++) {
res.getItem().add(parseClaimResponseItemComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("addItem")) {
- JsonArray array = json.getAsJsonArray("addItem");
+ JsonArray array = getJArray(json, "addItem");
for (int i = 0; i < array.size(); i++) {
res.getAddItem().add(parseClaimResponseAddedItemComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseClaimResponseAdjudicationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("total")) {
- JsonArray array = json.getAsJsonArray("total");
+ JsonArray array = getJArray(json, "total");
for (int i = 0; i < array.size(); i++) {
res.getTotal().add(parseClaimResponseTotalComponent(array.get(i).getAsJsonObject()));
}
@@ -7211,25 +7276,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("form"))
res.setForm(parseAttachment(getJObject(json, "form")));
if (json.has("processNote")) {
- JsonArray array = json.getAsJsonArray("processNote");
+ JsonArray array = getJArray(json, "processNote");
for (int i = 0; i < array.size(); i++) {
res.getProcessNote().add(parseClaimResponseNoteComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("communicationRequest")) {
- JsonArray array = json.getAsJsonArray("communicationRequest");
+ JsonArray array = getJArray(json, "communicationRequest");
for (int i = 0; i < array.size(); i++) {
res.getCommunicationRequest().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("insurance")) {
- JsonArray array = json.getAsJsonArray("insurance");
+ JsonArray array = getJArray(json, "insurance");
for (int i = 0; i < array.size(); i++) {
res.getInsurance().add(parseClaimResponseInsuranceComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("error")) {
- JsonArray array = json.getAsJsonArray("error");
+ JsonArray array = getJArray(json, "error");
for (int i = 0; i < array.size(); i++) {
res.getError().add(parseClaimResponseErrorComponent(array.get(i).getAsJsonObject()));
}
@@ -7249,7 +7314,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_itemSequence"))
parseElementProperties(getJObject(json, "_itemSequence"), res.getItemSequenceElement());
if (json.has("noteNumber")) {
- JsonArray array = json.getAsJsonArray("noteNumber");
+ JsonArray array = getJArray(json, "noteNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNoteNumber().add(new PositiveIntType());
@@ -7259,7 +7324,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_noteNumber")) {
- JsonArray array = json.getAsJsonArray("_noteNumber");
+ JsonArray array = getJArray(json, "_noteNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNoteNumber().size())
res.getNoteNumber().add(parsePositiveInt(null));
@@ -7268,13 +7333,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseClaimResponseAdjudicationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("detail")) {
- JsonArray array = json.getAsJsonArray("detail");
+ JsonArray array = getJArray(json, "detail");
for (int i = 0; i < array.size(); i++) {
res.getDetail().add(parseClaimResponseItemDetailComponent(array.get(i).getAsJsonObject()));
}
@@ -7314,7 +7379,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_detailSequence"))
parseElementProperties(getJObject(json, "_detailSequence"), res.getDetailSequenceElement());
if (json.has("noteNumber")) {
- JsonArray array = json.getAsJsonArray("noteNumber");
+ JsonArray array = getJArray(json, "noteNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNoteNumber().add(new PositiveIntType());
@@ -7324,7 +7389,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_noteNumber")) {
- JsonArray array = json.getAsJsonArray("_noteNumber");
+ JsonArray array = getJArray(json, "_noteNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNoteNumber().size())
res.getNoteNumber().add(parsePositiveInt(null));
@@ -7333,13 +7398,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseClaimResponseAdjudicationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("subDetail")) {
- JsonArray array = json.getAsJsonArray("subDetail");
+ JsonArray array = getJArray(json, "subDetail");
for (int i = 0; i < array.size(); i++) {
res.getSubDetail().add(parseClaimResponseSubDetailComponent(array.get(i).getAsJsonObject()));
}
@@ -7359,7 +7424,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_subDetailSequence"))
parseElementProperties(getJObject(json, "_subDetailSequence"), res.getSubDetailSequenceElement());
if (json.has("noteNumber")) {
- JsonArray array = json.getAsJsonArray("noteNumber");
+ JsonArray array = getJArray(json, "noteNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNoteNumber().add(new PositiveIntType());
@@ -7369,7 +7434,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_noteNumber")) {
- JsonArray array = json.getAsJsonArray("_noteNumber");
+ JsonArray array = getJArray(json, "_noteNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNoteNumber().size())
res.getNoteNumber().add(parsePositiveInt(null));
@@ -7378,7 +7443,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseClaimResponseAdjudicationComponent(array.get(i).getAsJsonObject()));
}
@@ -7394,7 +7459,7 @@ public class JsonParser extends JsonParserBase {
protected void parseClaimResponseAddedItemComponentProperties(JsonObject json, ClaimResponse.AddedItemComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("itemSequence")) {
- JsonArray array = json.getAsJsonArray("itemSequence");
+ JsonArray array = getJArray(json, "itemSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getItemSequence().add(new PositiveIntType());
@@ -7404,7 +7469,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_itemSequence")) {
- JsonArray array = json.getAsJsonArray("_itemSequence");
+ JsonArray array = getJArray(json, "_itemSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getItemSequence().size())
res.getItemSequence().add(parsePositiveInt(null));
@@ -7413,7 +7478,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("detailSequence")) {
- JsonArray array = json.getAsJsonArray("detailSequence");
+ JsonArray array = getJArray(json, "detailSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDetailSequence().add(new PositiveIntType());
@@ -7423,7 +7488,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_detailSequence")) {
- JsonArray array = json.getAsJsonArray("_detailSequence");
+ JsonArray array = getJArray(json, "_detailSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDetailSequence().size())
res.getDetailSequence().add(parsePositiveInt(null));
@@ -7432,7 +7497,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("subdetailSequence")) {
- JsonArray array = json.getAsJsonArray("subdetailSequence");
+ JsonArray array = getJArray(json, "subdetailSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSubdetailSequence().add(new PositiveIntType());
@@ -7442,7 +7507,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_subdetailSequence")) {
- JsonArray array = json.getAsJsonArray("_subdetailSequence");
+ JsonArray array = getJArray(json, "_subdetailSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSubdetailSequence().size())
res.getSubdetailSequence().add(parsePositiveInt(null));
@@ -7451,7 +7516,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("provider")) {
- JsonArray array = json.getAsJsonArray("provider");
+ JsonArray array = getJArray(json, "provider");
for (int i = 0; i < array.size(); i++) {
res.getProvider().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -7459,13 +7524,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("programCode")) {
- JsonArray array = json.getAsJsonArray("programCode");
+ JsonArray array = getJArray(json, "programCode");
for (int i = 0; i < array.size(); i++) {
res.getProgramCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -7489,13 +7554,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("bodySite"))
res.setBodySite(parseCodeableConcept(getJObject(json, "bodySite")));
if (json.has("subSite")) {
- JsonArray array = json.getAsJsonArray("subSite");
+ JsonArray array = getJArray(json, "subSite");
for (int i = 0; i < array.size(); i++) {
res.getSubSite().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("noteNumber")) {
- JsonArray array = json.getAsJsonArray("noteNumber");
+ JsonArray array = getJArray(json, "noteNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNoteNumber().add(new PositiveIntType());
@@ -7505,7 +7570,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_noteNumber")) {
- JsonArray array = json.getAsJsonArray("_noteNumber");
+ JsonArray array = getJArray(json, "_noteNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNoteNumber().size())
res.getNoteNumber().add(parsePositiveInt(null));
@@ -7514,13 +7579,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseClaimResponseAdjudicationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("detail")) {
- JsonArray array = json.getAsJsonArray("detail");
+ JsonArray array = getJArray(json, "detail");
for (int i = 0; i < array.size(); i++) {
res.getDetail().add(parseClaimResponseAddedItemDetailComponent(array.get(i).getAsJsonObject()));
}
@@ -7538,7 +7603,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -7554,7 +7619,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("net"))
res.setNet(parseMoney(getJObject(json, "net")));
if (json.has("noteNumber")) {
- JsonArray array = json.getAsJsonArray("noteNumber");
+ JsonArray array = getJArray(json, "noteNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNoteNumber().add(new PositiveIntType());
@@ -7564,7 +7629,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_noteNumber")) {
- JsonArray array = json.getAsJsonArray("_noteNumber");
+ JsonArray array = getJArray(json, "_noteNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNoteNumber().size())
res.getNoteNumber().add(parsePositiveInt(null));
@@ -7573,13 +7638,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseClaimResponseAdjudicationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("subDetail")) {
- JsonArray array = json.getAsJsonArray("subDetail");
+ JsonArray array = getJArray(json, "subDetail");
for (int i = 0; i < array.size(); i++) {
res.getSubDetail().add(parseClaimResponseAddedItemSubDetailComponent(array.get(i).getAsJsonObject()));
}
@@ -7597,7 +7662,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -7613,7 +7678,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("net"))
res.setNet(parseMoney(getJObject(json, "net")));
if (json.has("noteNumber")) {
- JsonArray array = json.getAsJsonArray("noteNumber");
+ JsonArray array = getJArray(json, "noteNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNoteNumber().add(new PositiveIntType());
@@ -7623,7 +7688,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_noteNumber")) {
- JsonArray array = json.getAsJsonArray("_noteNumber");
+ JsonArray array = getJArray(json, "_noteNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNoteNumber().size())
res.getNoteNumber().add(parsePositiveInt(null));
@@ -7632,7 +7697,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseClaimResponseAdjudicationComponent(array.get(i).getAsJsonObject()));
}
@@ -7760,7 +7825,7 @@ public class JsonParser extends JsonParserBase {
protected void parseClinicalImpressionProperties(JsonObject json, ClinicalImpression res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -7791,13 +7856,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("previous"))
res.setPrevious(parseReference(getJObject(json, "previous")));
if (json.has("problem")) {
- JsonArray array = json.getAsJsonArray("problem");
+ JsonArray array = getJArray(json, "problem");
for (int i = 0; i < array.size(); i++) {
res.getProblem().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("protocol")) {
- JsonArray array = json.getAsJsonArray("protocol");
+ JsonArray array = getJArray(json, "protocol");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getProtocol().add(new UriType());
@@ -7807,7 +7872,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_protocol")) {
- JsonArray array = json.getAsJsonArray("_protocol");
+ JsonArray array = getJArray(json, "_protocol");
for (int i = 0; i < array.size(); i++) {
if (i == res.getProtocol().size())
res.getProtocol().add(parseUri(null));
@@ -7820,31 +7885,31 @@ public class JsonParser extends JsonParserBase {
if (json.has("_summary"))
parseElementProperties(getJObject(json, "_summary"), res.getSummaryElement());
if (json.has("finding")) {
- JsonArray array = json.getAsJsonArray("finding");
+ JsonArray array = getJArray(json, "finding");
for (int i = 0; i < array.size(); i++) {
res.getFinding().add(parseClinicalImpressionFindingComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("prognosisCodeableConcept")) {
- JsonArray array = json.getAsJsonArray("prognosisCodeableConcept");
+ JsonArray array = getJArray(json, "prognosisCodeableConcept");
for (int i = 0; i < array.size(); i++) {
res.getPrognosisCodeableConcept().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("prognosisReference")) {
- JsonArray array = json.getAsJsonArray("prognosisReference");
+ JsonArray array = getJArray(json, "prognosisReference");
for (int i = 0; i < array.size(); i++) {
res.getPrognosisReference().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("supportingInfo")) {
- JsonArray array = json.getAsJsonArray("supportingInfo");
+ JsonArray array = getJArray(json, "supportingInfo");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInfo().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -7876,7 +7941,7 @@ public class JsonParser extends JsonParserBase {
protected void parseClinicalUseIssueProperties(JsonObject json, ClinicalUseIssue res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -7888,7 +7953,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("category"))
res.setCategory(parseCodeableConcept(getJObject(json, "category")));
if (json.has("subject")) {
- JsonArray array = json.getAsJsonArray("subject");
+ JsonArray array = getJArray(json, "subject");
for (int i = 0; i < array.size(); i++) {
res.getSubject().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -7906,7 +7971,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("interaction"))
res.setInteraction(parseClinicalUseIssueInteractionComponent(getJObject(json, "interaction")));
if (json.has("population")) {
- JsonArray array = json.getAsJsonArray("population");
+ JsonArray array = getJArray(json, "population");
for (int i = 0; i < array.size(); i++) {
res.getPopulation().add(parsePopulation(array.get(i).getAsJsonObject()));
}
@@ -7924,23 +7989,23 @@ public class JsonParser extends JsonParserBase {
protected void parseClinicalUseIssueContraindicationComponentProperties(JsonObject json, ClinicalUseIssue.ClinicalUseIssueContraindicationComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("diseaseSymptomProcedure"))
- res.setDiseaseSymptomProcedure(parseCodeableConcept(getJObject(json, "diseaseSymptomProcedure")));
+ res.setDiseaseSymptomProcedure(parseCodeableReference(getJObject(json, "diseaseSymptomProcedure")));
if (json.has("diseaseStatus"))
- res.setDiseaseStatus(parseCodeableConcept(getJObject(json, "diseaseStatus")));
+ res.setDiseaseStatus(parseCodeableReference(getJObject(json, "diseaseStatus")));
if (json.has("comorbidity")) {
- JsonArray array = json.getAsJsonArray("comorbidity");
+ JsonArray array = getJArray(json, "comorbidity");
for (int i = 0; i < array.size(); i++) {
- res.getComorbidity().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ res.getComorbidity().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("indication")) {
- JsonArray array = json.getAsJsonArray("indication");
+ JsonArray array = getJArray(json, "indication");
for (int i = 0; i < array.size(); i++) {
res.getIndication().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("otherTherapy")) {
- JsonArray array = json.getAsJsonArray("otherTherapy");
+ JsonArray array = getJArray(json, "otherTherapy");
for (int i = 0; i < array.size(); i++) {
res.getOtherTherapy().add(parseClinicalUseIssueContraindicationOtherTherapyComponent(array.get(i).getAsJsonObject()));
}
@@ -7955,11 +8020,10 @@ public class JsonParser extends JsonParserBase {
protected void parseClinicalUseIssueContraindicationOtherTherapyComponentProperties(JsonObject json, ClinicalUseIssue.ClinicalUseIssueContraindicationOtherTherapyComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- if (json.has("therapyRelationshipType"))
- res.setTherapyRelationshipType(parseCodeableConcept(getJObject(json, "therapyRelationshipType")));
- DataType medication = parseType("medication", json);
- if (medication != null)
- res.setMedication(medication);
+ if (json.has("relationshipType"))
+ res.setRelationshipType(parseCodeableConcept(getJObject(json, "relationshipType")));
+ if (json.has("therapy"))
+ res.setTherapy(parseCodeableReference(getJObject(json, "therapy")));
}
protected ClinicalUseIssue.ClinicalUseIssueIndicationComponent parseClinicalUseIssueIndicationComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -7971,27 +8035,27 @@ public class JsonParser extends JsonParserBase {
protected void parseClinicalUseIssueIndicationComponentProperties(JsonObject json, ClinicalUseIssue.ClinicalUseIssueIndicationComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("diseaseSymptomProcedure"))
- res.setDiseaseSymptomProcedure(parseCodeableConcept(getJObject(json, "diseaseSymptomProcedure")));
+ res.setDiseaseSymptomProcedure(parseCodeableReference(getJObject(json, "diseaseSymptomProcedure")));
if (json.has("diseaseStatus"))
- res.setDiseaseStatus(parseCodeableConcept(getJObject(json, "diseaseStatus")));
+ res.setDiseaseStatus(parseCodeableReference(getJObject(json, "diseaseStatus")));
if (json.has("comorbidity")) {
- JsonArray array = json.getAsJsonArray("comorbidity");
+ JsonArray array = getJArray(json, "comorbidity");
for (int i = 0; i < array.size(); i++) {
- res.getComorbidity().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ res.getComorbidity().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("intendedEffect"))
- res.setIntendedEffect(parseCodeableConcept(getJObject(json, "intendedEffect")));
+ res.setIntendedEffect(parseCodeableReference(getJObject(json, "intendedEffect")));
if (json.has("duration"))
res.setDuration(parseQuantity(getJObject(json, "duration")));
if (json.has("undesirableEffect")) {
- JsonArray array = json.getAsJsonArray("undesirableEffect");
+ JsonArray array = getJArray(json, "undesirableEffect");
for (int i = 0; i < array.size(); i++) {
res.getUndesirableEffect().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("otherTherapy")) {
- JsonArray array = json.getAsJsonArray("otherTherapy");
+ JsonArray array = getJArray(json, "otherTherapy");
for (int i = 0; i < array.size(); i++) {
res.getOtherTherapy().add(parseClinicalUseIssueContraindicationOtherTherapyComponent(array.get(i).getAsJsonObject()));
}
@@ -8007,7 +8071,7 @@ public class JsonParser extends JsonParserBase {
protected void parseClinicalUseIssueInteractionComponentProperties(JsonObject json, ClinicalUseIssue.ClinicalUseIssueInteractionComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("interactant")) {
- JsonArray array = json.getAsJsonArray("interactant");
+ JsonArray array = getJArray(json, "interactant");
for (int i = 0; i < array.size(); i++) {
res.getInteractant().add(parseClinicalUseIssueInteractionInteractantComponent(array.get(i).getAsJsonObject()));
}
@@ -8015,7 +8079,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("effect"))
- res.setEffect(parseCodeableConcept(getJObject(json, "effect")));
+ res.setEffect(parseCodeableReference(getJObject(json, "effect")));
if (json.has("incidence"))
res.setIncidence(parseCodeableConcept(getJObject(json, "incidence")));
if (json.has("management"))
@@ -8044,7 +8108,7 @@ public class JsonParser extends JsonParserBase {
protected void parseClinicalUseIssueUndesirableEffectComponentProperties(JsonObject json, ClinicalUseIssue.ClinicalUseIssueUndesirableEffectComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("symptomConditionEffect"))
- res.setSymptomConditionEffect(parseCodeableConcept(getJObject(json, "symptomConditionEffect")));
+ res.setSymptomConditionEffect(parseCodeableReference(getJObject(json, "symptomConditionEffect")));
if (json.has("classification"))
res.setClassification(parseCodeableConcept(getJObject(json, "classification")));
if (json.has("frequencyOfOccurrence"))
@@ -8064,7 +8128,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -8098,7 +8162,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -8108,13 +8172,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -8160,19 +8224,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_count"))
parseElementProperties(getJObject(json, "_count"), res.getCountElement());
if (json.has("filter")) {
- JsonArray array = json.getAsJsonArray("filter");
+ JsonArray array = getJArray(json, "filter");
for (int i = 0; i < array.size(); i++) {
res.getFilter().add(parseCodeSystemFilterComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("property")) {
- JsonArray array = json.getAsJsonArray("property");
+ JsonArray array = getJArray(json, "property");
for (int i = 0; i < array.size(); i++) {
res.getProperty().add(parseCodeSystemPropertyComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("concept")) {
- JsonArray array = json.getAsJsonArray("concept");
+ JsonArray array = getJArray(json, "concept");
for (int i = 0; i < array.size(); i++) {
res.getConcept().add(parseCodeSystemConceptDefinitionComponent(array.get(i).getAsJsonObject()));
}
@@ -8196,7 +8260,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("operator")) {
- JsonArray array = json.getAsJsonArray("operator");
+ JsonArray array = getJArray(json, "operator");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getOperator().add(new Enumeration(new Enumerations.FilterOperatorEnumFactory(), Enumerations.FilterOperator.NULL));
@@ -8206,7 +8270,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_operator")) {
- JsonArray array = json.getAsJsonArray("_operator");
+ JsonArray array = getJArray(json, "_operator");
for (int i = 0; i < array.size(); i++) {
if (i == res.getOperator().size())
res.getOperator().add(parseEnumeration(null, Enumerations.FilterOperator.NULL, new Enumerations.FilterOperatorEnumFactory()));
@@ -8267,19 +8331,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_definition"))
parseElementProperties(getJObject(json, "_definition"), res.getDefinitionElement());
if (json.has("designation")) {
- JsonArray array = json.getAsJsonArray("designation");
+ JsonArray array = getJArray(json, "designation");
for (int i = 0; i < array.size(); i++) {
res.getDesignation().add(parseCodeSystemConceptDefinitionDesignationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("property")) {
- JsonArray array = json.getAsJsonArray("property");
+ JsonArray array = getJArray(json, "property");
for (int i = 0; i < array.size(); i++) {
res.getProperty().add(parseCodeSystemConceptPropertyComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("concept")) {
- JsonArray array = json.getAsJsonArray("concept");
+ JsonArray array = getJArray(json, "concept");
for (int i = 0; i < array.size(); i++) {
res.getConcept().add(parseCodeSystemConceptDefinitionComponent(array.get(i).getAsJsonObject()));
}
@@ -8332,13 +8396,13 @@ public class JsonParser extends JsonParserBase {
protected void parseCommunicationProperties(JsonObject json, Communication res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -8348,7 +8412,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -8357,7 +8421,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -8367,7 +8431,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -8376,19 +8440,19 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
res.getPartOf().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("inResponseTo")) {
- JsonArray array = json.getAsJsonArray("inResponseTo");
+ JsonArray array = getJArray(json, "inResponseTo");
for (int i = 0; i < array.size(); i++) {
res.getInResponseTo().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -8400,7 +8464,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("statusReason"))
res.setStatusReason(parseCodeableConcept(getJObject(json, "statusReason")));
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -8410,7 +8474,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_priority"))
parseElementProperties(getJObject(json, "_priority"), res.getPriorityElement());
if (json.has("medium")) {
- JsonArray array = json.getAsJsonArray("medium");
+ JsonArray array = getJArray(json, "medium");
for (int i = 0; i < array.size(); i++) {
res.getMedium().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -8420,7 +8484,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("topic"))
res.setTopic(parseCodeableConcept(getJObject(json, "topic")));
if (json.has("about")) {
- JsonArray array = json.getAsJsonArray("about");
+ JsonArray array = getJArray(json, "about");
for (int i = 0; i < array.size(); i++) {
res.getAbout().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -8436,7 +8500,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_received"))
parseElementProperties(getJObject(json, "_received"), res.getReceivedElement());
if (json.has("recipient")) {
- JsonArray array = json.getAsJsonArray("recipient");
+ JsonArray array = getJArray(json, "recipient");
for (int i = 0; i < array.size(); i++) {
res.getRecipient().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -8444,19 +8508,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("sender"))
res.setSender(parseReference(getJObject(json, "sender")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("payload")) {
- JsonArray array = json.getAsJsonArray("payload");
+ JsonArray array = getJArray(json, "payload");
for (int i = 0; i < array.size(); i++) {
res.getPayload().add(parseCommunicationPayloadComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -8485,19 +8549,19 @@ public class JsonParser extends JsonParserBase {
protected void parseCommunicationRequestProperties(JsonObject json, CommunicationRequest res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("replaces")) {
- JsonArray array = json.getAsJsonArray("replaces");
+ JsonArray array = getJArray(json, "replaces");
for (int i = 0; i < array.size(); i++) {
res.getReplaces().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -8510,8 +8574,12 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("statusReason"))
res.setStatusReason(parseCodeableConcept(getJObject(json, "statusReason")));
+ if (json.has("intent"))
+ res.setIntentElement(parseEnumeration(json.get("intent").getAsString(), Enumerations.RequestIntent.NULL, new Enumerations.RequestIntentEnumFactory()));
+ if (json.has("_intent"))
+ parseElementProperties(getJObject(json, "_intent"), res.getIntentElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -8525,7 +8593,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_doNotPerform"))
parseElementProperties(getJObject(json, "_doNotPerform"), res.getDoNotPerformElement());
if (json.has("medium")) {
- JsonArray array = json.getAsJsonArray("medium");
+ JsonArray array = getJArray(json, "medium");
for (int i = 0; i < array.size(); i++) {
res.getMedium().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -8533,7 +8601,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("subject"))
res.setSubject(parseReference(getJObject(json, "subject")));
if (json.has("about")) {
- JsonArray array = json.getAsJsonArray("about");
+ JsonArray array = getJArray(json, "about");
for (int i = 0; i < array.size(); i++) {
res.getAbout().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -8541,7 +8609,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("encounter"))
res.setEncounter(parseReference(getJObject(json, "encounter")));
if (json.has("payload")) {
- JsonArray array = json.getAsJsonArray("payload");
+ JsonArray array = getJArray(json, "payload");
for (int i = 0; i < array.size(); i++) {
res.getPayload().add(parseCommunicationRequestPayloadComponent(array.get(i).getAsJsonObject()));
}
@@ -8556,25 +8624,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("requester"))
res.setRequester(parseReference(getJObject(json, "requester")));
if (json.has("recipient")) {
- JsonArray array = json.getAsJsonArray("recipient");
+ JsonArray array = getJArray(json, "recipient");
for (int i = 0; i < array.size(); i++) {
res.getRecipient().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("informationProvider")) {
- JsonArray array = json.getAsJsonArray("informationProvider");
+ JsonArray array = getJArray(json, "informationProvider");
for (int i = 0; i < array.size(); i++) {
res.getInformationProvider().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -8631,7 +8699,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -8641,7 +8709,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
@@ -8659,7 +8727,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_search"))
parseElementProperties(getJObject(json, "_search"), res.getSearchElement());
if (json.has("resource")) {
- JsonArray array = json.getAsJsonArray("resource");
+ JsonArray array = getJArray(json, "resource");
for (int i = 0; i < array.size(); i++) {
res.getResource().add(parseCompartmentDefinitionResourceComponent(array.get(i).getAsJsonObject()));
}
@@ -8679,7 +8747,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_code"))
parseElementProperties(getJObject(json, "_code"), res.getCodeElement());
if (json.has("param")) {
- JsonArray array = json.getAsJsonArray("param");
+ JsonArray array = getJArray(json, "param");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getParam().add(new StringType());
@@ -8689,7 +8757,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_param")) {
- JsonArray array = json.getAsJsonArray("_param");
+ JsonArray array = getJArray(json, "_param");
for (int i = 0; i < array.size(); i++) {
if (i == res.getParam().size())
res.getParam().add(parseString(null));
@@ -8720,7 +8788,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -8734,7 +8802,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_date"))
parseElementProperties(getJObject(json, "_date"), res.getDateElement());
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -8748,7 +8816,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_confidentiality"))
parseElementProperties(getJObject(json, "_confidentiality"), res.getConfidentialityElement());
if (json.has("attester")) {
- JsonArray array = json.getAsJsonArray("attester");
+ JsonArray array = getJArray(json, "attester");
for (int i = 0; i < array.size(); i++) {
res.getAttester().add(parseCompositionAttesterComponent(array.get(i).getAsJsonObject()));
}
@@ -8756,19 +8824,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("custodian"))
res.setCustodian(parseReference(getJObject(json, "custodian")));
if (json.has("relatesTo")) {
- JsonArray array = json.getAsJsonArray("relatesTo");
+ JsonArray array = getJArray(json, "relatesTo");
for (int i = 0; i < array.size(); i++) {
res.getRelatesTo().add(parseCompositionRelatesToComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("event")) {
- JsonArray array = json.getAsJsonArray("event");
+ JsonArray array = getJArray(json, "event");
for (int i = 0; i < array.size(); i++) {
res.getEvent().add(parseCompositionEventComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("section")) {
- JsonArray array = json.getAsJsonArray("section");
+ JsonArray array = getJArray(json, "section");
for (int i = 0; i < array.size(); i++) {
res.getSection().add(parseCompositionSectionComponent(array.get(i).getAsJsonObject()));
}
@@ -8821,7 +8889,7 @@ public class JsonParser extends JsonParserBase {
protected void parseCompositionEventComponentProperties(JsonObject json, Composition.CompositionEventComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -8829,7 +8897,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("period"))
res.setPeriod(parsePeriod(getJObject(json, "period")));
if (json.has("detail")) {
- JsonArray array = json.getAsJsonArray("detail");
+ JsonArray array = getJArray(json, "detail");
for (int i = 0; i < array.size(); i++) {
res.getDetail().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -8851,7 +8919,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -8867,7 +8935,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("orderedBy"))
res.setOrderedBy(parseCodeableConcept(getJObject(json, "orderedBy")));
if (json.has("entry")) {
- JsonArray array = json.getAsJsonArray("entry");
+ JsonArray array = getJArray(json, "entry");
for (int i = 0; i < array.size(); i++) {
res.getEntry().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -8875,7 +8943,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("emptyReason"))
res.setEmptyReason(parseCodeableConcept(getJObject(json, "emptyReason")));
if (json.has("section")) {
- JsonArray array = json.getAsJsonArray("section");
+ JsonArray array = getJArray(json, "section");
for (int i = 0; i < array.size(); i++) {
res.getSection().add(parseCompositionSectionComponent(array.get(i).getAsJsonObject()));
}
@@ -8894,8 +8962,12 @@ public class JsonParser extends JsonParserBase {
res.setUrlElement(parseUri(json.get("url").getAsString()));
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
- if (json.has("identifier"))
- res.addIdentifier(parseIdentifier(getJObject(json, "identifier")));
+ if (json.has("identifier")) {
+ JsonArray array = getJArray(json, "identifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("version"))
res.setVersionElement(parseString(json.get("version").getAsString()));
if (json.has("_version"))
@@ -8925,7 +8997,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -8935,13 +9007,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -8961,7 +9033,7 @@ public class JsonParser extends JsonParserBase {
if (target != null)
res.setTarget(target);
if (json.has("group")) {
- JsonArray array = json.getAsJsonArray("group");
+ JsonArray array = getJArray(json, "group");
for (int i = 0; i < array.size(); i++) {
res.getGroup().add(parseConceptMapGroupComponent(array.get(i).getAsJsonObject()));
}
@@ -8977,23 +9049,15 @@ public class JsonParser extends JsonParserBase {
protected void parseConceptMapGroupComponentProperties(JsonObject json, ConceptMap.ConceptMapGroupComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("source"))
- res.setSourceElement(parseUri(json.get("source").getAsString()));
+ res.setSourceElement(parseCanonical(json.get("source").getAsString()));
if (json.has("_source"))
parseElementProperties(getJObject(json, "_source"), res.getSourceElement());
- if (json.has("sourceVersion"))
- res.setSourceVersionElement(parseString(json.get("sourceVersion").getAsString()));
- if (json.has("_sourceVersion"))
- parseElementProperties(getJObject(json, "_sourceVersion"), res.getSourceVersionElement());
if (json.has("target"))
- res.setTargetElement(parseUri(json.get("target").getAsString()));
+ res.setTargetElement(parseCanonical(json.get("target").getAsString()));
if (json.has("_target"))
parseElementProperties(getJObject(json, "_target"), res.getTargetElement());
- if (json.has("targetVersion"))
- res.setTargetVersionElement(parseString(json.get("targetVersion").getAsString()));
- if (json.has("_targetVersion"))
- parseElementProperties(getJObject(json, "_targetVersion"), res.getTargetVersionElement());
if (json.has("element")) {
- JsonArray array = json.getAsJsonArray("element");
+ JsonArray array = getJArray(json, "element");
for (int i = 0; i < array.size(); i++) {
res.getElement().add(parseConceptMapSourceElementComponent(array.get(i).getAsJsonObject()));
}
@@ -9023,7 +9087,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_noMap"))
parseElementProperties(getJObject(json, "_noMap"), res.getNoMapElement());
if (json.has("target")) {
- JsonArray array = json.getAsJsonArray("target");
+ JsonArray array = getJArray(json, "target");
for (int i = 0; i < array.size(); i++) {
res.getTarget().add(parseConceptMapTargetElementComponent(array.get(i).getAsJsonObject()));
}
@@ -9055,13 +9119,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_comment"))
parseElementProperties(getJObject(json, "_comment"), res.getCommentElement());
if (json.has("dependsOn")) {
- JsonArray array = json.getAsJsonArray("dependsOn");
+ JsonArray array = getJArray(json, "dependsOn");
for (int i = 0; i < array.size(); i++) {
res.getDependsOn().add(parseConceptMapOtherElementComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("product")) {
- JsonArray array = json.getAsJsonArray("product");
+ JsonArray array = getJArray(json, "product");
for (int i = 0; i < array.size(); i++) {
res.getProduct().add(parseConceptMapOtherElementComponent(array.get(i).getAsJsonObject()));
}
@@ -9129,7 +9193,7 @@ public class JsonParser extends JsonParserBase {
protected void parseConditionProperties(JsonObject json, Condition res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -9139,7 +9203,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("verificationStatus"))
res.setVerificationStatus(parseCodeableConcept(getJObject(json, "verificationStatus")));
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -9149,7 +9213,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
if (json.has("bodySite")) {
- JsonArray array = json.getAsJsonArray("bodySite");
+ JsonArray array = getJArray(json, "bodySite");
for (int i = 0; i < array.size(); i++) {
res.getBodySite().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -9173,19 +9237,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("asserter"))
res.setAsserter(parseReference(getJObject(json, "asserter")));
if (json.has("stage")) {
- JsonArray array = json.getAsJsonArray("stage");
+ JsonArray array = getJArray(json, "stage");
for (int i = 0; i < array.size(); i++) {
res.getStage().add(parseConditionStageComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("evidence")) {
- JsonArray array = json.getAsJsonArray("evidence");
+ JsonArray array = getJArray(json, "evidence");
for (int i = 0; i < array.size(); i++) {
res.getEvidence().add(parseConditionEvidenceComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -9203,7 +9267,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("summary"))
res.setSummary(parseCodeableConcept(getJObject(json, "summary")));
if (json.has("assessment")) {
- JsonArray array = json.getAsJsonArray("assessment");
+ JsonArray array = getJArray(json, "assessment");
for (int i = 0; i < array.size(); i++) {
res.getAssessment().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -9221,13 +9285,13 @@ public class JsonParser extends JsonParserBase {
protected void parseConditionEvidenceComponentProperties(JsonObject json, Condition.ConditionEvidenceComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("detail")) {
- JsonArray array = json.getAsJsonArray("detail");
+ JsonArray array = getJArray(json, "detail");
for (int i = 0; i < array.size(); i++) {
res.getDetail().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -9247,7 +9311,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -9285,7 +9349,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -9295,13 +9359,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -9327,7 +9391,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_hasStage"))
parseElementProperties(getJObject(json, "_hasStage"), res.getHasStageElement());
if (json.has("definition")) {
- JsonArray array = json.getAsJsonArray("definition");
+ JsonArray array = getJArray(json, "definition");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDefinition().add(new UriType());
@@ -9337,7 +9401,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_definition")) {
- JsonArray array = json.getAsJsonArray("_definition");
+ JsonArray array = getJArray(json, "_definition");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDefinition().size())
res.getDefinition().add(parseUri(null));
@@ -9346,37 +9410,37 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("observation")) {
- JsonArray array = json.getAsJsonArray("observation");
+ JsonArray array = getJArray(json, "observation");
for (int i = 0; i < array.size(); i++) {
res.getObservation().add(parseConditionDefinitionObservationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("medication")) {
- JsonArray array = json.getAsJsonArray("medication");
+ JsonArray array = getJArray(json, "medication");
for (int i = 0; i < array.size(); i++) {
res.getMedication().add(parseConditionDefinitionMedicationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("precondition")) {
- JsonArray array = json.getAsJsonArray("precondition");
+ JsonArray array = getJArray(json, "precondition");
for (int i = 0; i < array.size(); i++) {
res.getPrecondition().add(parseConditionDefinitionPreconditionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("team")) {
- JsonArray array = json.getAsJsonArray("team");
+ JsonArray array = getJArray(json, "team");
for (int i = 0; i < array.size(); i++) {
res.getTeam().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("questionnaire")) {
- JsonArray array = json.getAsJsonArray("questionnaire");
+ JsonArray array = getJArray(json, "questionnaire");
for (int i = 0; i < array.size(); i++) {
res.getQuestionnaire().add(parseConditionDefinitionQuestionnaireComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("plan")) {
- JsonArray array = json.getAsJsonArray("plan");
+ JsonArray array = getJArray(json, "plan");
for (int i = 0; i < array.size(); i++) {
res.getPlan().add(parseConditionDefinitionPlanComponent(array.get(i).getAsJsonObject()));
}
@@ -9469,7 +9533,7 @@ public class JsonParser extends JsonParserBase {
protected void parseConsentProperties(JsonObject json, Consent res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -9481,7 +9545,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("scope"))
res.setScope(parseCodeableConcept(getJObject(json, "scope")));
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -9493,37 +9557,37 @@ public class JsonParser extends JsonParserBase {
if (json.has("_dateTime"))
parseElementProperties(getJObject(json, "_dateTime"), res.getDateTimeElement());
if (json.has("performer")) {
- JsonArray array = json.getAsJsonArray("performer");
+ JsonArray array = getJArray(json, "performer");
for (int i = 0; i < array.size(); i++) {
res.getPerformer().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("manager")) {
- JsonArray array = json.getAsJsonArray("manager");
+ JsonArray array = getJArray(json, "manager");
for (int i = 0; i < array.size(); i++) {
res.getManager().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("controller")) {
- JsonArray array = json.getAsJsonArray("controller");
+ JsonArray array = getJArray(json, "controller");
for (int i = 0; i < array.size(); i++) {
res.getController().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("sourceAttachment")) {
- JsonArray array = json.getAsJsonArray("sourceAttachment");
+ JsonArray array = getJArray(json, "sourceAttachment");
for (int i = 0; i < array.size(); i++) {
res.getSourceAttachment().add(parseAttachment(array.get(i).getAsJsonObject()));
}
};
if (json.has("sourceReference")) {
- JsonArray array = json.getAsJsonArray("sourceReference");
+ JsonArray array = getJArray(json, "sourceReference");
for (int i = 0; i < array.size(); i++) {
res.getSourceReference().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("policy")) {
- JsonArray array = json.getAsJsonArray("policy");
+ JsonArray array = getJArray(json, "policy");
for (int i = 0; i < array.size(); i++) {
res.getPolicy().add(parseConsentPolicyComponent(array.get(i).getAsJsonObject()));
}
@@ -9531,7 +9595,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("policyRule"))
res.setPolicyRule(parseCodeableConcept(getJObject(json, "policyRule")));
if (json.has("verification")) {
- JsonArray array = json.getAsJsonArray("verification");
+ JsonArray array = getJArray(json, "verification");
for (int i = 0; i < array.size(); i++) {
res.getVerification().add(parseConsentVerificationComponent(array.get(i).getAsJsonObject()));
}
@@ -9577,7 +9641,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("verifiedWith"))
res.setVerifiedWith(parseReference(getJObject(json, "verifiedWith")));
if (json.has("verificationDate")) {
- JsonArray array = json.getAsJsonArray("verificationDate");
+ JsonArray array = getJArray(json, "verificationDate");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getVerificationDate().add(new DateTimeType());
@@ -9587,7 +9651,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_verificationDate")) {
- JsonArray array = json.getAsJsonArray("_verificationDate");
+ JsonArray array = getJArray(json, "_verificationDate");
for (int i = 0; i < array.size(); i++) {
if (i == res.getVerificationDate().size())
res.getVerificationDate().add(parseDateTime(null));
@@ -9612,37 +9676,37 @@ public class JsonParser extends JsonParserBase {
if (json.has("period"))
res.setPeriod(parsePeriod(getJObject(json, "period")));
if (json.has("actor")) {
- JsonArray array = json.getAsJsonArray("actor");
+ JsonArray array = getJArray(json, "actor");
for (int i = 0; i < array.size(); i++) {
res.getActor().add(parseConsentProvisionActorComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("action")) {
- JsonArray array = json.getAsJsonArray("action");
+ JsonArray array = getJArray(json, "action");
for (int i = 0; i < array.size(); i++) {
res.getAction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("securityLabel")) {
- JsonArray array = json.getAsJsonArray("securityLabel");
+ JsonArray array = getJArray(json, "securityLabel");
for (int i = 0; i < array.size(); i++) {
res.getSecurityLabel().add(parseCoding(array.get(i).getAsJsonObject()));
}
};
if (json.has("purpose")) {
- JsonArray array = json.getAsJsonArray("purpose");
+ JsonArray array = getJArray(json, "purpose");
for (int i = 0; i < array.size(); i++) {
res.getPurpose().add(parseCoding(array.get(i).getAsJsonObject()));
}
};
if (json.has("class")) {
- JsonArray array = json.getAsJsonArray("class");
+ JsonArray array = getJArray(json, "class");
for (int i = 0; i < array.size(); i++) {
res.getClass_().add(parseCoding(array.get(i).getAsJsonObject()));
}
};
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -9650,13 +9714,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("dataPeriod"))
res.setDataPeriod(parsePeriod(getJObject(json, "dataPeriod")));
if (json.has("data")) {
- JsonArray array = json.getAsJsonArray("data");
+ JsonArray array = getJArray(json, "data");
for (int i = 0; i < array.size(); i++) {
res.getData().add(parseConsentProvisionDataComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("provision")) {
- JsonArray array = json.getAsJsonArray("provision");
+ JsonArray array = getJArray(json, "provision");
for (int i = 0; i < array.size(); i++) {
res.getProvision().add(parseConsentProvisionComponent(array.get(i).getAsJsonObject()));
}
@@ -9702,7 +9766,7 @@ public class JsonParser extends JsonParserBase {
protected void parseContractProperties(JsonObject json, Contract res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -9738,25 +9802,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("expirationType"))
res.setExpirationType(parseCodeableConcept(getJObject(json, "expirationType")));
if (json.has("subject")) {
- JsonArray array = json.getAsJsonArray("subject");
+ JsonArray array = getJArray(json, "subject");
for (int i = 0; i < array.size(); i++) {
res.getSubject().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("authority")) {
- JsonArray array = json.getAsJsonArray("authority");
+ JsonArray array = getJArray(json, "authority");
for (int i = 0; i < array.size(); i++) {
res.getAuthority().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("domain")) {
- JsonArray array = json.getAsJsonArray("domain");
+ JsonArray array = getJArray(json, "domain");
for (int i = 0; i < array.size(); i++) {
res.getDomain().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("site")) {
- JsonArray array = json.getAsJsonArray("site");
+ JsonArray array = getJArray(json, "site");
for (int i = 0; i < array.size(); i++) {
res.getSite().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -9774,7 +9838,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_subtitle"))
parseElementProperties(getJObject(json, "_subtitle"), res.getSubtitleElement());
if (json.has("alias")) {
- JsonArray array = json.getAsJsonArray("alias");
+ JsonArray array = getJArray(json, "alias");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getAlias().add(new StringType());
@@ -9784,7 +9848,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_alias")) {
- JsonArray array = json.getAsJsonArray("_alias");
+ JsonArray array = getJArray(json, "_alias");
for (int i = 0; i < array.size(); i++) {
if (i == res.getAlias().size())
res.getAlias().add(parseString(null));
@@ -9802,7 +9866,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("subType")) {
- JsonArray array = json.getAsJsonArray("subType");
+ JsonArray array = getJArray(json, "subType");
for (int i = 0; i < array.size(); i++) {
res.getSubType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -9810,43 +9874,43 @@ public class JsonParser extends JsonParserBase {
if (json.has("contentDefinition"))
res.setContentDefinition(parseContractContentDefinitionComponent(getJObject(json, "contentDefinition")));
if (json.has("term")) {
- JsonArray array = json.getAsJsonArray("term");
+ JsonArray array = getJArray(json, "term");
for (int i = 0; i < array.size(); i++) {
res.getTerm().add(parseContractTermComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("supportingInfo")) {
- JsonArray array = json.getAsJsonArray("supportingInfo");
+ JsonArray array = getJArray(json, "supportingInfo");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInfo().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("relevantHistory")) {
- JsonArray array = json.getAsJsonArray("relevantHistory");
+ JsonArray array = getJArray(json, "relevantHistory");
for (int i = 0; i < array.size(); i++) {
res.getRelevantHistory().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("signer")) {
- JsonArray array = json.getAsJsonArray("signer");
+ JsonArray array = getJArray(json, "signer");
for (int i = 0; i < array.size(); i++) {
res.getSigner().add(parseContractSignatoryComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("friendly")) {
- JsonArray array = json.getAsJsonArray("friendly");
+ JsonArray array = getJArray(json, "friendly");
for (int i = 0; i < array.size(); i++) {
res.getFriendly().add(parseContractFriendlyLanguageComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("legal")) {
- JsonArray array = json.getAsJsonArray("legal");
+ JsonArray array = getJArray(json, "legal");
for (int i = 0; i < array.size(); i++) {
res.getLegal().add(parseContractLegalLanguageComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("rule")) {
- JsonArray array = json.getAsJsonArray("rule");
+ JsonArray array = getJArray(json, "rule");
for (int i = 0; i < array.size(); i++) {
res.getRule().add(parseContractComputableLanguageComponent(array.get(i).getAsJsonObject()));
}
@@ -9912,7 +9976,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_text"))
parseElementProperties(getJObject(json, "_text"), res.getTextElement());
if (json.has("securityLabel")) {
- JsonArray array = json.getAsJsonArray("securityLabel");
+ JsonArray array = getJArray(json, "securityLabel");
for (int i = 0; i < array.size(); i++) {
res.getSecurityLabel().add(parseContractSecurityLabelComponent(array.get(i).getAsJsonObject()));
}
@@ -9920,19 +9984,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("offer"))
res.setOffer(parseContractOfferComponent(getJObject(json, "offer")));
if (json.has("asset")) {
- JsonArray array = json.getAsJsonArray("asset");
+ JsonArray array = getJArray(json, "asset");
for (int i = 0; i < array.size(); i++) {
res.getAsset().add(parseContractAssetComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("action")) {
- JsonArray array = json.getAsJsonArray("action");
+ JsonArray array = getJArray(json, "action");
for (int i = 0; i < array.size(); i++) {
res.getAction().add(parseContractActionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("group")) {
- JsonArray array = json.getAsJsonArray("group");
+ JsonArray array = getJArray(json, "group");
for (int i = 0; i < array.size(); i++) {
res.getGroup().add(parseContractTermComponent(array.get(i).getAsJsonObject()));
}
@@ -9948,7 +10012,7 @@ public class JsonParser extends JsonParserBase {
protected void parseContractSecurityLabelComponentProperties(JsonObject json, Contract.SecurityLabelComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("number")) {
- JsonArray array = json.getAsJsonArray("number");
+ JsonArray array = getJArray(json, "number");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNumber().add(new UnsignedIntType());
@@ -9958,7 +10022,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_number")) {
- JsonArray array = json.getAsJsonArray("_number");
+ JsonArray array = getJArray(json, "_number");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNumber().size())
res.getNumber().add(parseUnsignedInt(null));
@@ -9969,13 +10033,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("classification"))
res.setClassification(parseCoding(getJObject(json, "classification")));
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCoding(array.get(i).getAsJsonObject()));
}
};
if (json.has("control")) {
- JsonArray array = json.getAsJsonArray("control");
+ JsonArray array = getJArray(json, "control");
for (int i = 0; i < array.size(); i++) {
res.getControl().add(parseCoding(array.get(i).getAsJsonObject()));
}
@@ -9991,13 +10055,13 @@ public class JsonParser extends JsonParserBase {
protected void parseContractOfferComponentProperties(JsonObject json, Contract.ContractOfferComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("party")) {
- JsonArray array = json.getAsJsonArray("party");
+ JsonArray array = getJArray(json, "party");
for (int i = 0; i < array.size(); i++) {
res.getParty().add(parseContractPartyComponent(array.get(i).getAsJsonObject()));
}
@@ -10009,13 +10073,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("decision"))
res.setDecision(parseCodeableConcept(getJObject(json, "decision")));
if (json.has("decisionMode")) {
- JsonArray array = json.getAsJsonArray("decisionMode");
+ JsonArray array = getJArray(json, "decisionMode");
for (int i = 0; i < array.size(); i++) {
res.getDecisionMode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("answer")) {
- JsonArray array = json.getAsJsonArray("answer");
+ JsonArray array = getJArray(json, "answer");
for (int i = 0; i < array.size(); i++) {
res.getAnswer().add(parseContractAnswerComponent(array.get(i).getAsJsonObject()));
}
@@ -10025,7 +10089,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_text"))
parseElementProperties(getJObject(json, "_text"), res.getTextElement());
if (json.has("linkId")) {
- JsonArray array = json.getAsJsonArray("linkId");
+ JsonArray array = getJArray(json, "linkId");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getLinkId().add(new StringType());
@@ -10035,7 +10099,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_linkId")) {
- JsonArray array = json.getAsJsonArray("_linkId");
+ JsonArray array = getJArray(json, "_linkId");
for (int i = 0; i < array.size(); i++) {
if (i == res.getLinkId().size())
res.getLinkId().add(parseString(null));
@@ -10044,7 +10108,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("securityLabelNumber")) {
- JsonArray array = json.getAsJsonArray("securityLabelNumber");
+ JsonArray array = getJArray(json, "securityLabelNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSecurityLabelNumber().add(new UnsignedIntType());
@@ -10054,7 +10118,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_securityLabelNumber")) {
- JsonArray array = json.getAsJsonArray("_securityLabelNumber");
+ JsonArray array = getJArray(json, "_securityLabelNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSecurityLabelNumber().size())
res.getSecurityLabelNumber().add(parseUnsignedInt(null));
@@ -10073,7 +10137,7 @@ public class JsonParser extends JsonParserBase {
protected void parseContractPartyComponentProperties(JsonObject json, Contract.ContractPartyComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("reference")) {
- JsonArray array = json.getAsJsonArray("reference");
+ JsonArray array = getJArray(json, "reference");
for (int i = 0; i < array.size(); i++) {
res.getReference().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -10106,19 +10170,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("scope"))
res.setScope(parseCodeableConcept(getJObject(json, "scope")));
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("typeReference")) {
- JsonArray array = json.getAsJsonArray("typeReference");
+ JsonArray array = getJArray(json, "typeReference");
for (int i = 0; i < array.size(); i++) {
res.getTypeReference().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("subtype")) {
- JsonArray array = json.getAsJsonArray("subtype");
+ JsonArray array = getJArray(json, "subtype");
for (int i = 0; i < array.size(); i++) {
res.getSubtype().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -10126,7 +10190,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("relationship"))
res.setRelationship(parseCoding(getJObject(json, "relationship")));
if (json.has("context")) {
- JsonArray array = json.getAsJsonArray("context");
+ JsonArray array = getJArray(json, "context");
for (int i = 0; i < array.size(); i++) {
res.getContext().add(parseContractAssetContextComponent(array.get(i).getAsJsonObject()));
}
@@ -10136,19 +10200,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_condition"))
parseElementProperties(getJObject(json, "_condition"), res.getConditionElement());
if (json.has("periodType")) {
- JsonArray array = json.getAsJsonArray("periodType");
+ JsonArray array = getJArray(json, "periodType");
for (int i = 0; i < array.size(); i++) {
res.getPeriodType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("period")) {
- JsonArray array = json.getAsJsonArray("period");
+ JsonArray array = getJArray(json, "period");
for (int i = 0; i < array.size(); i++) {
res.getPeriod().add(parsePeriod(array.get(i).getAsJsonObject()));
}
};
if (json.has("usePeriod")) {
- JsonArray array = json.getAsJsonArray("usePeriod");
+ JsonArray array = getJArray(json, "usePeriod");
for (int i = 0; i < array.size(); i++) {
res.getUsePeriod().add(parsePeriod(array.get(i).getAsJsonObject()));
}
@@ -10158,7 +10222,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_text"))
parseElementProperties(getJObject(json, "_text"), res.getTextElement());
if (json.has("linkId")) {
- JsonArray array = json.getAsJsonArray("linkId");
+ JsonArray array = getJArray(json, "linkId");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getLinkId().add(new StringType());
@@ -10168,7 +10232,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_linkId")) {
- JsonArray array = json.getAsJsonArray("_linkId");
+ JsonArray array = getJArray(json, "_linkId");
for (int i = 0; i < array.size(); i++) {
if (i == res.getLinkId().size())
res.getLinkId().add(parseString(null));
@@ -10177,13 +10241,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("answer")) {
- JsonArray array = json.getAsJsonArray("answer");
+ JsonArray array = getJArray(json, "answer");
for (int i = 0; i < array.size(); i++) {
res.getAnswer().add(parseContractAnswerComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("securityLabelNumber")) {
- JsonArray array = json.getAsJsonArray("securityLabelNumber");
+ JsonArray array = getJArray(json, "securityLabelNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSecurityLabelNumber().add(new UnsignedIntType());
@@ -10193,7 +10257,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_securityLabelNumber")) {
- JsonArray array = json.getAsJsonArray("_securityLabelNumber");
+ JsonArray array = getJArray(json, "_securityLabelNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSecurityLabelNumber().size())
res.getSecurityLabelNumber().add(parseUnsignedInt(null));
@@ -10202,7 +10266,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("valuedItem")) {
- JsonArray array = json.getAsJsonArray("valuedItem");
+ JsonArray array = getJArray(json, "valuedItem");
for (int i = 0; i < array.size(); i++) {
res.getValuedItem().add(parseContractValuedItemComponent(array.get(i).getAsJsonObject()));
}
@@ -10220,7 +10284,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("reference"))
res.setReference(parseReference(getJObject(json, "reference")));
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -10275,7 +10339,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("recipient"))
res.setRecipient(parseReference(getJObject(json, "recipient")));
if (json.has("linkId")) {
- JsonArray array = json.getAsJsonArray("linkId");
+ JsonArray array = getJArray(json, "linkId");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getLinkId().add(new StringType());
@@ -10285,7 +10349,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_linkId")) {
- JsonArray array = json.getAsJsonArray("_linkId");
+ JsonArray array = getJArray(json, "_linkId");
for (int i = 0; i < array.size(); i++) {
if (i == res.getLinkId().size())
res.getLinkId().add(parseString(null));
@@ -10294,7 +10358,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("securityLabelNumber")) {
- JsonArray array = json.getAsJsonArray("securityLabelNumber");
+ JsonArray array = getJArray(json, "securityLabelNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSecurityLabelNumber().add(new UnsignedIntType());
@@ -10304,7 +10368,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_securityLabelNumber")) {
- JsonArray array = json.getAsJsonArray("_securityLabelNumber");
+ JsonArray array = getJArray(json, "_securityLabelNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSecurityLabelNumber().size())
res.getSecurityLabelNumber().add(parseUnsignedInt(null));
@@ -10329,7 +10393,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("subject")) {
- JsonArray array = json.getAsJsonArray("subject");
+ JsonArray array = getJArray(json, "subject");
for (int i = 0; i < array.size(); i++) {
res.getSubject().add(parseContractActionSubjectComponent(array.get(i).getAsJsonObject()));
}
@@ -10337,7 +10401,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("intent"))
res.setIntent(parseCodeableConcept(getJObject(json, "intent")));
if (json.has("linkId")) {
- JsonArray array = json.getAsJsonArray("linkId");
+ JsonArray array = getJArray(json, "linkId");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getLinkId().add(new StringType());
@@ -10347,7 +10411,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_linkId")) {
- JsonArray array = json.getAsJsonArray("_linkId");
+ JsonArray array = getJArray(json, "_linkId");
for (int i = 0; i < array.size(); i++) {
if (i == res.getLinkId().size())
res.getLinkId().add(parseString(null));
@@ -10360,7 +10424,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("context"))
res.setContext(parseReference(getJObject(json, "context")));
if (json.has("contextLinkId")) {
- JsonArray array = json.getAsJsonArray("contextLinkId");
+ JsonArray array = getJArray(json, "contextLinkId");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getContextLinkId().add(new StringType());
@@ -10370,7 +10434,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_contextLinkId")) {
- JsonArray array = json.getAsJsonArray("_contextLinkId");
+ JsonArray array = getJArray(json, "_contextLinkId");
for (int i = 0; i < array.size(); i++) {
if (i == res.getContextLinkId().size())
res.getContextLinkId().add(parseString(null));
@@ -10382,13 +10446,13 @@ public class JsonParser extends JsonParserBase {
if (occurrence != null)
res.setOccurrence(occurrence);
if (json.has("requester")) {
- JsonArray array = json.getAsJsonArray("requester");
+ JsonArray array = getJArray(json, "requester");
for (int i = 0; i < array.size(); i++) {
res.getRequester().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("requesterLinkId")) {
- JsonArray array = json.getAsJsonArray("requesterLinkId");
+ JsonArray array = getJArray(json, "requesterLinkId");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getRequesterLinkId().add(new StringType());
@@ -10398,7 +10462,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_requesterLinkId")) {
- JsonArray array = json.getAsJsonArray("_requesterLinkId");
+ JsonArray array = getJArray(json, "_requesterLinkId");
for (int i = 0; i < array.size(); i++) {
if (i == res.getRequesterLinkId().size())
res.getRequesterLinkId().add(parseString(null));
@@ -10407,7 +10471,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("performerType")) {
- JsonArray array = json.getAsJsonArray("performerType");
+ JsonArray array = getJArray(json, "performerType");
for (int i = 0; i < array.size(); i++) {
res.getPerformerType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -10417,7 +10481,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("performer"))
res.setPerformer(parseReference(getJObject(json, "performer")));
if (json.has("performerLinkId")) {
- JsonArray array = json.getAsJsonArray("performerLinkId");
+ JsonArray array = getJArray(json, "performerLinkId");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPerformerLinkId().add(new StringType());
@@ -10427,7 +10491,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_performerLinkId")) {
- JsonArray array = json.getAsJsonArray("_performerLinkId");
+ JsonArray array = getJArray(json, "_performerLinkId");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPerformerLinkId().size())
res.getPerformerLinkId().add(parseString(null));
@@ -10436,13 +10500,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("reasonLinkId")) {
- JsonArray array = json.getAsJsonArray("reasonLinkId");
+ JsonArray array = getJArray(json, "reasonLinkId");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getReasonLinkId().add(new StringType());
@@ -10452,7 +10516,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_reasonLinkId")) {
- JsonArray array = json.getAsJsonArray("_reasonLinkId");
+ JsonArray array = getJArray(json, "_reasonLinkId");
for (int i = 0; i < array.size(); i++) {
if (i == res.getReasonLinkId().size())
res.getReasonLinkId().add(parseString(null));
@@ -10461,13 +10525,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("securityLabelNumber")) {
- JsonArray array = json.getAsJsonArray("securityLabelNumber");
+ JsonArray array = getJArray(json, "securityLabelNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSecurityLabelNumber().add(new UnsignedIntType());
@@ -10477,7 +10541,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_securityLabelNumber")) {
- JsonArray array = json.getAsJsonArray("_securityLabelNumber");
+ JsonArray array = getJArray(json, "_securityLabelNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSecurityLabelNumber().size())
res.getSecurityLabelNumber().add(parseUnsignedInt(null));
@@ -10496,7 +10560,7 @@ public class JsonParser extends JsonParserBase {
protected void parseContractActionSubjectComponentProperties(JsonObject json, Contract.ActionSubjectComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("reference")) {
- JsonArray array = json.getAsJsonArray("reference");
+ JsonArray array = getJArray(json, "reference");
for (int i = 0; i < array.size(); i++) {
res.getReference().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -10518,7 +10582,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("party"))
res.setParty(parseReference(getJObject(json, "party")));
if (json.has("signature")) {
- JsonArray array = json.getAsJsonArray("signature");
+ JsonArray array = getJArray(json, "signature");
for (int i = 0; i < array.size(); i++) {
res.getSignature().add(parseSignature(array.get(i).getAsJsonObject()));
}
@@ -10573,7 +10637,7 @@ public class JsonParser extends JsonParserBase {
protected void parseCoverageProperties(JsonObject json, Coverage res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -10601,13 +10665,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("period"))
res.setPeriod(parsePeriod(getJObject(json, "period")));
if (json.has("payor")) {
- JsonArray array = json.getAsJsonArray("payor");
+ JsonArray array = getJArray(json, "payor");
for (int i = 0; i < array.size(); i++) {
res.getPayor().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("class")) {
- JsonArray array = json.getAsJsonArray("class");
+ JsonArray array = getJArray(json, "class");
for (int i = 0; i < array.size(); i++) {
res.getClass_().add(parseCoverageClassComponent(array.get(i).getAsJsonObject()));
}
@@ -10621,7 +10685,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_network"))
parseElementProperties(getJObject(json, "_network"), res.getNetworkElement());
if (json.has("costToBeneficiary")) {
- JsonArray array = json.getAsJsonArray("costToBeneficiary");
+ JsonArray array = getJArray(json, "costToBeneficiary");
for (int i = 0; i < array.size(); i++) {
res.getCostToBeneficiary().add(parseCoverageCostToBeneficiaryComponent(array.get(i).getAsJsonObject()));
}
@@ -10631,7 +10695,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_subrogation"))
parseElementProperties(getJObject(json, "_subrogation"), res.getSubrogationElement());
if (json.has("contract")) {
- JsonArray array = json.getAsJsonArray("contract");
+ JsonArray array = getJArray(json, "contract");
for (int i = 0; i < array.size(); i++) {
res.getContract().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -10672,7 +10736,7 @@ public class JsonParser extends JsonParserBase {
if (value != null)
res.setValue(value);
if (json.has("exception")) {
- JsonArray array = json.getAsJsonArray("exception");
+ JsonArray array = getJArray(json, "exception");
for (int i = 0; i < array.size(); i++) {
res.getException().add(parseCoverageExemptionComponent(array.get(i).getAsJsonObject()));
}
@@ -10702,7 +10766,7 @@ public class JsonParser extends JsonParserBase {
protected void parseCoverageEligibilityRequestProperties(JsonObject json, CoverageEligibilityRequest res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -10714,7 +10778,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("priority"))
res.setPriority(parseCodeableConcept(getJObject(json, "priority")));
if (json.has("purpose")) {
- JsonArray array = json.getAsJsonArray("purpose");
+ JsonArray array = getJArray(json, "purpose");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPurpose().add(new Enumeration(new CoverageEligibilityRequest.EligibilityRequestPurposeEnumFactory(), CoverageEligibilityRequest.EligibilityRequestPurpose.NULL));
@@ -10724,7 +10788,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_purpose")) {
- JsonArray array = json.getAsJsonArray("_purpose");
+ JsonArray array = getJArray(json, "_purpose");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPurpose().size())
res.getPurpose().add(parseEnumeration(null, CoverageEligibilityRequest.EligibilityRequestPurpose.NULL, new CoverageEligibilityRequest.EligibilityRequestPurposeEnumFactory()));
@@ -10750,19 +10814,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("facility"))
res.setFacility(parseReference(getJObject(json, "facility")));
if (json.has("supportingInfo")) {
- JsonArray array = json.getAsJsonArray("supportingInfo");
+ JsonArray array = getJArray(json, "supportingInfo");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInfo().add(parseCoverageEligibilityRequestSupportingInformationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("insurance")) {
- JsonArray array = json.getAsJsonArray("insurance");
+ JsonArray array = getJArray(json, "insurance");
for (int i = 0; i < array.size(); i++) {
res.getInsurance().add(parseCoverageEligibilityRequestInsuranceComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("item")) {
- JsonArray array = json.getAsJsonArray("item");
+ JsonArray array = getJArray(json, "item");
for (int i = 0; i < array.size(); i++) {
res.getItem().add(parseCoverageEligibilityRequestDetailsComponent(array.get(i).getAsJsonObject()));
}
@@ -10818,7 +10882,7 @@ public class JsonParser extends JsonParserBase {
protected void parseCoverageEligibilityRequestDetailsComponentProperties(JsonObject json, CoverageEligibilityRequest.DetailsComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("supportingInfoSequence")) {
- JsonArray array = json.getAsJsonArray("supportingInfoSequence");
+ JsonArray array = getJArray(json, "supportingInfoSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSupportingInfoSequence().add(new PositiveIntType());
@@ -10828,7 +10892,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_supportingInfoSequence")) {
- JsonArray array = json.getAsJsonArray("_supportingInfoSequence");
+ JsonArray array = getJArray(json, "_supportingInfoSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSupportingInfoSequence().size())
res.getSupportingInfoSequence().add(parsePositiveInt(null));
@@ -10841,7 +10905,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -10855,13 +10919,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("facility"))
res.setFacility(parseReference(getJObject(json, "facility")));
if (json.has("diagnosis")) {
- JsonArray array = json.getAsJsonArray("diagnosis");
+ JsonArray array = getJArray(json, "diagnosis");
for (int i = 0; i < array.size(); i++) {
res.getDiagnosis().add(parseCoverageEligibilityRequestDiagnosisComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("detail")) {
- JsonArray array = json.getAsJsonArray("detail");
+ JsonArray array = getJArray(json, "detail");
for (int i = 0; i < array.size(); i++) {
res.getDetail().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -10890,7 +10954,7 @@ public class JsonParser extends JsonParserBase {
protected void parseCoverageEligibilityResponseProperties(JsonObject json, CoverageEligibilityResponse res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -10900,7 +10964,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("purpose")) {
- JsonArray array = json.getAsJsonArray("purpose");
+ JsonArray array = getJArray(json, "purpose");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPurpose().add(new Enumeration(new CoverageEligibilityResponse.EligibilityResponsePurposeEnumFactory(), CoverageEligibilityResponse.EligibilityResponsePurpose.NULL));
@@ -10910,7 +10974,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_purpose")) {
- JsonArray array = json.getAsJsonArray("_purpose");
+ JsonArray array = getJArray(json, "_purpose");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPurpose().size())
res.getPurpose().add(parseEnumeration(null, CoverageEligibilityResponse.EligibilityResponsePurpose.NULL, new CoverageEligibilityResponse.EligibilityResponsePurposeEnumFactory()));
@@ -10932,7 +10996,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("request"))
res.setRequest(parseReference(getJObject(json, "request")));
if (json.has("outcome"))
- res.setOutcomeElement(parseEnumeration(json.get("outcome").getAsString(), Enumerations.ClaimProcessingCodes.NULL, new Enumerations.ClaimProcessingCodesEnumFactory()));
+ res.setOutcomeElement(parseEnumeration(json.get("outcome").getAsString(), CoverageEligibilityResponse.EligibilityOutcome.NULL, new CoverageEligibilityResponse.EligibilityOutcomeEnumFactory()));
if (json.has("_outcome"))
parseElementProperties(getJObject(json, "_outcome"), res.getOutcomeElement());
if (json.has("disposition"))
@@ -10942,7 +11006,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("insurer"))
res.setInsurer(parseReference(getJObject(json, "insurer")));
if (json.has("insurance")) {
- JsonArray array = json.getAsJsonArray("insurance");
+ JsonArray array = getJArray(json, "insurance");
for (int i = 0; i < array.size(); i++) {
res.getInsurance().add(parseCoverageEligibilityResponseInsuranceComponent(array.get(i).getAsJsonObject()));
}
@@ -10954,7 +11018,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("form"))
res.setForm(parseCodeableConcept(getJObject(json, "form")));
if (json.has("error")) {
- JsonArray array = json.getAsJsonArray("error");
+ JsonArray array = getJArray(json, "error");
for (int i = 0; i < array.size(); i++) {
res.getError().add(parseCoverageEligibilityResponseErrorsComponent(array.get(i).getAsJsonObject()));
}
@@ -10978,7 +11042,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("benefitPeriod"))
res.setBenefitPeriod(parsePeriod(getJObject(json, "benefitPeriod")));
if (json.has("item")) {
- JsonArray array = json.getAsJsonArray("item");
+ JsonArray array = getJArray(json, "item");
for (int i = 0; i < array.size(); i++) {
res.getItem().add(parseCoverageEligibilityResponseItemsComponent(array.get(i).getAsJsonObject()));
}
@@ -10998,7 +11062,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -11024,7 +11088,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("term"))
res.setTerm(parseCodeableConcept(getJObject(json, "term")));
if (json.has("benefit")) {
- JsonArray array = json.getAsJsonArray("benefit");
+ JsonArray array = getJArray(json, "benefit");
for (int i = 0; i < array.size(); i++) {
res.getBenefit().add(parseCoverageEligibilityResponseBenefitComponent(array.get(i).getAsJsonObject()));
}
@@ -11034,7 +11098,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_authorizationRequired"))
parseElementProperties(getJObject(json, "_authorizationRequired"), res.getAuthorizationRequiredElement());
if (json.has("authorizationSupporting")) {
- JsonArray array = json.getAsJsonArray("authorizationSupporting");
+ JsonArray array = getJArray(json, "authorizationSupporting");
for (int i = 0; i < array.size(); i++) {
res.getAuthorizationSupporting().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -11084,7 +11148,7 @@ public class JsonParser extends JsonParserBase {
protected void parseDetectedIssueProperties(JsonObject json, DetectedIssue res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -11107,13 +11171,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("author"))
res.setAuthor(parseReference(getJObject(json, "author")));
if (json.has("implicated")) {
- JsonArray array = json.getAsJsonArray("implicated");
+ JsonArray array = getJArray(json, "implicated");
for (int i = 0; i < array.size(); i++) {
res.getImplicated().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("evidence")) {
- JsonArray array = json.getAsJsonArray("evidence");
+ JsonArray array = getJArray(json, "evidence");
for (int i = 0; i < array.size(); i++) {
res.getEvidence().add(parseDetectedIssueEvidenceComponent(array.get(i).getAsJsonObject()));
}
@@ -11127,7 +11191,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_reference"))
parseElementProperties(getJObject(json, "_reference"), res.getReferenceElement());
if (json.has("mitigation")) {
- JsonArray array = json.getAsJsonArray("mitigation");
+ JsonArray array = getJArray(json, "mitigation");
for (int i = 0; i < array.size(); i++) {
res.getMitigation().add(parseDetectedIssueMitigationComponent(array.get(i).getAsJsonObject()));
}
@@ -11143,13 +11207,13 @@ public class JsonParser extends JsonParserBase {
protected void parseDetectedIssueEvidenceComponentProperties(JsonObject json, DetectedIssue.DetectedIssueEvidenceComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("detail")) {
- JsonArray array = json.getAsJsonArray("detail");
+ JsonArray array = getJArray(json, "detail");
for (int i = 0; i < array.size(); i++) {
res.getDetail().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -11183,7 +11247,7 @@ public class JsonParser extends JsonParserBase {
protected void parseDeviceProperties(JsonObject json, Device res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -11195,7 +11259,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("definition"))
res.setDefinition(parseReference(getJObject(json, "definition")));
if (json.has("udiCarrier")) {
- JsonArray array = json.getAsJsonArray("udiCarrier");
+ JsonArray array = getJArray(json, "udiCarrier");
for (int i = 0; i < array.size(); i++) {
res.getUdiCarrier().add(parseDeviceUdiCarrierComponent(array.get(i).getAsJsonObject()));
}
@@ -11205,7 +11269,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("statusReason")) {
- JsonArray array = json.getAsJsonArray("statusReason");
+ JsonArray array = getJArray(json, "statusReason");
for (int i = 0; i < array.size(); i++) {
res.getStatusReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -11235,7 +11299,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_serialNumber"))
parseElementProperties(getJObject(json, "_serialNumber"), res.getSerialNumberElement());
if (json.has("deviceName")) {
- JsonArray array = json.getAsJsonArray("deviceName");
+ JsonArray array = getJArray(json, "deviceName");
for (int i = 0; i < array.size(); i++) {
res.getDeviceName().add(parseDeviceDeviceNameComponent(array.get(i).getAsJsonObject()));
}
@@ -11249,25 +11313,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("_partNumber"))
parseElementProperties(getJObject(json, "_partNumber"), res.getPartNumberElement());
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("specialization")) {
- JsonArray array = json.getAsJsonArray("specialization");
+ JsonArray array = getJArray(json, "specialization");
for (int i = 0; i < array.size(); i++) {
res.getSpecialization().add(parseDeviceSpecializationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("version")) {
- JsonArray array = json.getAsJsonArray("version");
+ JsonArray array = getJArray(json, "version");
for (int i = 0; i < array.size(); i++) {
res.getVersion().add(parseDeviceVersionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("property")) {
- JsonArray array = json.getAsJsonArray("property");
+ JsonArray array = getJArray(json, "property");
for (int i = 0; i < array.size(); i++) {
res.getProperty().add(parseDevicePropertyComponent(array.get(i).getAsJsonObject()));
}
@@ -11281,7 +11345,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("owner"))
res.setOwner(parseReference(getJObject(json, "owner")));
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
@@ -11293,13 +11357,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("safety")) {
- JsonArray array = json.getAsJsonArray("safety");
+ JsonArray array = getJArray(json, "safety");
for (int i = 0; i < array.size(); i++) {
res.getSafety().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -11404,18 +11468,9 @@ public class JsonParser extends JsonParserBase {
parseBackboneElementProperties(json, res);
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
- if (json.has("valueQuantity")) {
- JsonArray array = json.getAsJsonArray("valueQuantity");
- for (int i = 0; i < array.size(); i++) {
- res.getValueQuantity().add(parseQuantity(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("valueCode")) {
- JsonArray array = json.getAsJsonArray("valueCode");
- for (int i = 0; i < array.size(); i++) {
- res.getValueCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
- }
- };
+ DataType value = parseType("value", json);
+ if (value != null)
+ res.setValue(value);
}
protected Device.DeviceOperationalStatusComponent parseDeviceOperationalStatusComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -11429,7 +11484,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("value"))
res.setValue(parseCodeableConcept(getJObject(json, "value")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -11447,7 +11502,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("value"))
res.setValue(parseCodeableConcept(getJObject(json, "value")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -11463,13 +11518,13 @@ public class JsonParser extends JsonParserBase {
protected void parseDeviceDefinitionProperties(JsonObject json, DeviceDefinition res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("udiDeviceIdentifier")) {
- JsonArray array = json.getAsJsonArray("udiDeviceIdentifier");
+ JsonArray array = getJArray(json, "udiDeviceIdentifier");
for (int i = 0; i < array.size(); i++) {
res.getUdiDeviceIdentifier().add(parseDeviceDefinitionUdiDeviceIdentifierComponent(array.get(i).getAsJsonObject()));
}
@@ -11478,7 +11533,7 @@ public class JsonParser extends JsonParserBase {
if (manufacturer != null)
res.setManufacturer(manufacturer);
if (json.has("deviceName")) {
- JsonArray array = json.getAsJsonArray("deviceName");
+ JsonArray array = getJArray(json, "deviceName");
for (int i = 0; i < array.size(); i++) {
res.getDeviceName().add(parseDeviceDefinitionDeviceNameComponent(array.get(i).getAsJsonObject()));
}
@@ -11487,41 +11542,44 @@ public class JsonParser extends JsonParserBase {
res.setModelNumberElement(parseString(json.get("modelNumber").getAsString()));
if (json.has("_modelNumber"))
parseElementProperties(getJObject(json, "_modelNumber"), res.getModelNumberElement());
- if (json.has("type"))
- res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("type")) {
+ JsonArray array = getJArray(json, "type");
+ for (int i = 0; i < array.size(); i++) {
+ res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("specialization")) {
- JsonArray array = json.getAsJsonArray("specialization");
+ JsonArray array = getJArray(json, "specialization");
for (int i = 0; i < array.size(); i++) {
res.getSpecialization().add(parseDeviceDefinitionSpecializationComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("version")) {
- JsonArray array = json.getAsJsonArray("version");
+ if (json.has("hasPart")) {
+ JsonArray array = getJArray(json, "hasPart");
for (int i = 0; i < array.size(); i++) {
- if (array.get(i).isJsonNull()) {
- res.getVersion().add(new StringType());
- } else {;
- res.getVersion().add(parseString(array.get(i).getAsString()));
- }
+ res.getHasPart().add(parseDeviceDefinitionHasPartComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("_version")) {
- JsonArray array = json.getAsJsonArray("_version");
+ if (json.has("packaging")) {
+ JsonArray array = getJArray(json, "packaging");
for (int i = 0; i < array.size(); i++) {
- if (i == res.getVersion().size())
- res.getVersion().add(parseString(null));
- if (array.get(i) instanceof JsonObject)
- parseElementProperties(array.get(i).getAsJsonObject(), res.getVersion().get(i));
+ res.getPackaging().add(parseDeviceDefinitionPackagingComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("version")) {
+ JsonArray array = getJArray(json, "version");
+ for (int i = 0; i < array.size(); i++) {
+ res.getVersion().add(parseDeviceDefinitionVersionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("safety")) {
- JsonArray array = json.getAsJsonArray("safety");
+ JsonArray array = getJArray(json, "safety");
for (int i = 0; i < array.size(); i++) {
res.getSafety().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("shelfLifeStorage")) {
- JsonArray array = json.getAsJsonArray("shelfLifeStorage");
+ JsonArray array = getJArray(json, "shelfLifeStorage");
for (int i = 0; i < array.size(); i++) {
res.getShelfLifeStorage().add(parseProductShelfLife(array.get(i).getAsJsonObject()));
}
@@ -11529,19 +11587,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("physicalCharacteristics"))
res.setPhysicalCharacteristics(parseProdCharacteristic(getJObject(json, "physicalCharacteristics")));
if (json.has("languageCode")) {
- JsonArray array = json.getAsJsonArray("languageCode");
+ JsonArray array = getJArray(json, "languageCode");
for (int i = 0; i < array.size(); i++) {
res.getLanguageCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("capability")) {
- JsonArray array = json.getAsJsonArray("capability");
+ JsonArray array = getJArray(json, "capability");
for (int i = 0; i < array.size(); i++) {
res.getCapability().add(parseDeviceDefinitionCapabilityComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("property")) {
- JsonArray array = json.getAsJsonArray("property");
+ JsonArray array = getJArray(json, "property");
for (int i = 0; i < array.size(); i++) {
res.getProperty().add(parseDeviceDefinitionPropertyComponent(array.get(i).getAsJsonObject()));
}
@@ -11549,7 +11607,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("owner"))
res.setOwner(parseReference(getJObject(json, "owner")));
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
@@ -11559,17 +11617,15 @@ public class JsonParser extends JsonParserBase {
if (json.has("_onlineInformation"))
parseElementProperties(getJObject(json, "_onlineInformation"), res.getOnlineInformationElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
- if (json.has("quantity"))
- res.setQuantity(parseQuantity(getJObject(json, "quantity")));
if (json.has("parentDevice"))
res.setParentDevice(parseReference(getJObject(json, "parentDevice")));
if (json.has("material")) {
- JsonArray array = json.getAsJsonArray("material");
+ JsonArray array = getJArray(json, "material");
for (int i = 0; i < array.size(); i++) {
res.getMaterial().add(parseDeviceDefinitionMaterialComponent(array.get(i).getAsJsonObject()));
}
@@ -11634,6 +11690,118 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_version"), res.getVersionElement());
}
+ protected DeviceDefinition.DeviceDefinitionHasPartComponent parseDeviceDefinitionHasPartComponent(JsonObject json) throws IOException, FHIRFormatError {
+ DeviceDefinition.DeviceDefinitionHasPartComponent res = new DeviceDefinition.DeviceDefinitionHasPartComponent();
+ parseDeviceDefinitionHasPartComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseDeviceDefinitionHasPartComponentProperties(JsonObject json, DeviceDefinition.DeviceDefinitionHasPartComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("reference"))
+ res.setReference(parseReference(getJObject(json, "reference")));
+ if (json.has("count"))
+ res.setCountElement(parseInteger(json.get("count").getAsLong()));
+ if (json.has("_count"))
+ parseElementProperties(getJObject(json, "_count"), res.getCountElement());
+ }
+
+ protected DeviceDefinition.DeviceDefinitionPackagingComponent parseDeviceDefinitionPackagingComponent(JsonObject json) throws IOException, FHIRFormatError {
+ DeviceDefinition.DeviceDefinitionPackagingComponent res = new DeviceDefinition.DeviceDefinitionPackagingComponent();
+ parseDeviceDefinitionPackagingComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseDeviceDefinitionPackagingComponentProperties(JsonObject json, DeviceDefinition.DeviceDefinitionPackagingComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("identifier"))
+ res.setIdentifier(parseIdentifier(getJObject(json, "identifier")));
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("count"))
+ res.setCountElement(parseInteger(json.get("count").getAsLong()));
+ if (json.has("_count"))
+ parseElementProperties(getJObject(json, "_count"), res.getCountElement());
+ if (json.has("distributor")) {
+ JsonArray array = getJArray(json, "distributor");
+ for (int i = 0; i < array.size(); i++) {
+ res.getDistributor().add(parseDeviceDefinitionPackagingDistributorComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("udiDeviceIdentifier")) {
+ JsonArray array = getJArray(json, "udiDeviceIdentifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getUdiDeviceIdentifier().add(parseDeviceDefinitionPackagingUdiDeviceIdentifierComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("packaging")) {
+ JsonArray array = getJArray(json, "packaging");
+ for (int i = 0; i < array.size(); i++) {
+ res.getPackaging().add(parseDeviceDefinitionPackagingComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ }
+
+ protected DeviceDefinition.DeviceDefinitionPackagingDistributorComponent parseDeviceDefinitionPackagingDistributorComponent(JsonObject json) throws IOException, FHIRFormatError {
+ DeviceDefinition.DeviceDefinitionPackagingDistributorComponent res = new DeviceDefinition.DeviceDefinitionPackagingDistributorComponent();
+ parseDeviceDefinitionPackagingDistributorComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseDeviceDefinitionPackagingDistributorComponentProperties(JsonObject json, DeviceDefinition.DeviceDefinitionPackagingDistributorComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("name"))
+ res.setNameElement(parseString(json.get("name").getAsString()));
+ if (json.has("_name"))
+ parseElementProperties(getJObject(json, "_name"), res.getNameElement());
+ if (json.has("organizationReference")) {
+ JsonArray array = getJArray(json, "organizationReference");
+ for (int i = 0; i < array.size(); i++) {
+ res.getOrganizationReference().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
+ }
+
+ protected DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent parseDeviceDefinitionPackagingUdiDeviceIdentifierComponent(JsonObject json) throws IOException, FHIRFormatError {
+ DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent res = new DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent();
+ parseDeviceDefinitionPackagingUdiDeviceIdentifierComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseDeviceDefinitionPackagingUdiDeviceIdentifierComponentProperties(JsonObject json, DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("deviceIdentifier"))
+ res.setDeviceIdentifierElement(parseString(json.get("deviceIdentifier").getAsString()));
+ if (json.has("_deviceIdentifier"))
+ parseElementProperties(getJObject(json, "_deviceIdentifier"), res.getDeviceIdentifierElement());
+ if (json.has("issuer"))
+ res.setIssuerElement(parseUri(json.get("issuer").getAsString()));
+ if (json.has("_issuer"))
+ parseElementProperties(getJObject(json, "_issuer"), res.getIssuerElement());
+ if (json.has("jurisdiction"))
+ res.setJurisdictionElement(parseUri(json.get("jurisdiction").getAsString()));
+ if (json.has("_jurisdiction"))
+ parseElementProperties(getJObject(json, "_jurisdiction"), res.getJurisdictionElement());
+ }
+
+ protected DeviceDefinition.DeviceDefinitionVersionComponent parseDeviceDefinitionVersionComponent(JsonObject json) throws IOException, FHIRFormatError {
+ DeviceDefinition.DeviceDefinitionVersionComponent res = new DeviceDefinition.DeviceDefinitionVersionComponent();
+ parseDeviceDefinitionVersionComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseDeviceDefinitionVersionComponentProperties(JsonObject json, DeviceDefinition.DeviceDefinitionVersionComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("component"))
+ res.setComponent(parseIdentifier(getJObject(json, "component")));
+ if (json.has("value"))
+ res.setValueElement(parseString(json.get("value").getAsString()));
+ if (json.has("_value"))
+ parseElementProperties(getJObject(json, "_value"), res.getValueElement());
+ }
+
protected DeviceDefinition.DeviceDefinitionCapabilityComponent parseDeviceDefinitionCapabilityComponent(JsonObject json) throws IOException, FHIRFormatError {
DeviceDefinition.DeviceDefinitionCapabilityComponent res = new DeviceDefinition.DeviceDefinitionCapabilityComponent();
parseDeviceDefinitionCapabilityComponentProperties(json, res);
@@ -11645,7 +11813,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("description")) {
- JsonArray array = json.getAsJsonArray("description");
+ JsonArray array = getJArray(json, "description");
for (int i = 0; i < array.size(); i++) {
res.getDescription().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -11663,13 +11831,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("valueQuantity")) {
- JsonArray array = json.getAsJsonArray("valueQuantity");
+ JsonArray array = getJArray(json, "valueQuantity");
for (int i = 0; i < array.size(); i++) {
res.getValueQuantity().add(parseQuantity(array.get(i).getAsJsonObject()));
}
};
if (json.has("valueCode")) {
- JsonArray array = json.getAsJsonArray("valueCode");
+ JsonArray array = getJArray(json, "valueCode");
for (int i = 0; i < array.size(); i++) {
res.getValueCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -11705,7 +11873,7 @@ public class JsonParser extends JsonParserBase {
protected void parseDeviceMetricProperties(JsonObject json, DeviceMetric res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -11733,7 +11901,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("measurementPeriod"))
res.setMeasurementPeriod(parseTiming(getJObject(json, "measurementPeriod")));
if (json.has("calibration")) {
- JsonArray array = json.getAsJsonArray("calibration");
+ JsonArray array = getJArray(json, "calibration");
for (int i = 0; i < array.size(); i++) {
res.getCalibration().add(parseDeviceMetricCalibrationComponent(array.get(i).getAsJsonObject()));
}
@@ -11771,13 +11939,13 @@ public class JsonParser extends JsonParserBase {
protected void parseDeviceRequestProperties(JsonObject json, DeviceRequest res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -11787,7 +11955,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -11796,7 +11964,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -11806,7 +11974,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -11815,13 +11983,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("priorRequest")) {
- JsonArray array = json.getAsJsonArray("priorRequest");
+ JsonArray array = getJArray(json, "priorRequest");
for (int i = 0; i < array.size(); i++) {
res.getPriorRequest().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -11840,10 +12008,18 @@ public class JsonParser extends JsonParserBase {
res.setPriorityElement(parseEnumeration(json.get("priority").getAsString(), Enumerations.RequestPriority.NULL, new Enumerations.RequestPriorityEnumFactory()));
if (json.has("_priority"))
parseElementProperties(getJObject(json, "_priority"), res.getPriorityElement());
+ if (json.has("doNotPerform"))
+ res.setDoNotPerformElement(parseBoolean(json.get("doNotPerform").getAsBoolean()));
+ if (json.has("_doNotPerform"))
+ parseElementProperties(getJObject(json, "_doNotPerform"), res.getDoNotPerformElement());
if (json.has("code"))
res.setCode(parseCodeableReference(getJObject(json, "code")));
+ if (json.has("quantity"))
+ res.setQuantityElement(parseInteger(json.get("quantity").getAsLong()));
+ if (json.has("_quantity"))
+ parseElementProperties(getJObject(json, "_quantity"), res.getQuantityElement());
if (json.has("parameter")) {
- JsonArray array = json.getAsJsonArray("parameter");
+ JsonArray array = getJArray(json, "parameter");
for (int i = 0; i < array.size(); i++) {
res.getParameter().add(parseDeviceRequestParameterComponent(array.get(i).getAsJsonObject()));
}
@@ -11866,31 +12042,31 @@ public class JsonParser extends JsonParserBase {
if (json.has("performer"))
res.setPerformer(parseReference(getJObject(json, "performer")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("insurance")) {
- JsonArray array = json.getAsJsonArray("insurance");
+ JsonArray array = getJArray(json, "insurance");
for (int i = 0; i < array.size(); i++) {
res.getInsurance().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("supportingInfo")) {
- JsonArray array = json.getAsJsonArray("supportingInfo");
+ JsonArray array = getJArray(json, "supportingInfo");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInfo().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("relevantHistory")) {
- JsonArray array = json.getAsJsonArray("relevantHistory");
+ JsonArray array = getJArray(json, "relevantHistory");
for (int i = 0; i < array.size(); i++) {
res.getRelevantHistory().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -11912,32 +12088,32 @@ public class JsonParser extends JsonParserBase {
res.setValue(value);
}
- protected DeviceUseStatement parseDeviceUseStatement(JsonObject json) throws IOException, FHIRFormatError {
- DeviceUseStatement res = new DeviceUseStatement();
- parseDeviceUseStatementProperties(json, res);
+ protected DeviceUsage parseDeviceUsage(JsonObject json) throws IOException, FHIRFormatError {
+ DeviceUsage res = new DeviceUsage();
+ parseDeviceUsageProperties(json, res);
return res;
}
- protected void parseDeviceUseStatementProperties(JsonObject json, DeviceUseStatement res) throws IOException, FHIRFormatError {
+ protected void parseDeviceUsageProperties(JsonObject json, DeviceUsage res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("status"))
- res.setStatusElement(parseEnumeration(json.get("status").getAsString(), DeviceUseStatement.DeviceUseStatementStatus.NULL, new DeviceUseStatement.DeviceUseStatementStatusEnumFactory()));
+ res.setStatusElement(parseEnumeration(json.get("status").getAsString(), DeviceUsage.DeviceUsageStatus.NULL, new DeviceUsage.DeviceUsageStatusEnumFactory()));
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -11945,7 +12121,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("subject"))
res.setSubject(parseReference(getJObject(json, "subject")));
if (json.has("derivedFrom")) {
- JsonArray array = json.getAsJsonArray("derivedFrom");
+ JsonArray array = getJArray(json, "derivedFrom");
for (int i = 0; i < array.size(); i++) {
res.getDerivedFrom().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -11962,7 +12138,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("usageStatus"))
res.setUsageStatus(parseCodeableConcept(getJObject(json, "usageStatus")));
if (json.has("usageReason")) {
- JsonArray array = json.getAsJsonArray("usageReason");
+ JsonArray array = getJArray(json, "usageReason");
for (int i = 0; i < array.size(); i++) {
res.getUsageReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -11972,7 +12148,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("device"))
res.setDevice(parseCodeableReference(getJObject(json, "device")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
@@ -11980,7 +12156,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("bodySite"))
res.setBodySite(parseCodeableReference(getJObject(json, "bodySite")));
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -11996,13 +12172,13 @@ public class JsonParser extends JsonParserBase {
protected void parseDiagnosticReportProperties(JsonObject json, DiagnosticReport res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -12012,7 +12188,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -12031,53 +12207,55 @@ public class JsonParser extends JsonParserBase {
if (json.has("_issued"))
parseElementProperties(getJObject(json, "_issued"), res.getIssuedElement());
if (json.has("performer")) {
- JsonArray array = json.getAsJsonArray("performer");
+ JsonArray array = getJArray(json, "performer");
for (int i = 0; i < array.size(); i++) {
res.getPerformer().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("resultsInterpreter")) {
- JsonArray array = json.getAsJsonArray("resultsInterpreter");
+ JsonArray array = getJArray(json, "resultsInterpreter");
for (int i = 0; i < array.size(); i++) {
res.getResultsInterpreter().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("specimen")) {
- JsonArray array = json.getAsJsonArray("specimen");
+ JsonArray array = getJArray(json, "specimen");
for (int i = 0; i < array.size(); i++) {
res.getSpecimen().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("result")) {
- JsonArray array = json.getAsJsonArray("result");
+ JsonArray array = getJArray(json, "result");
for (int i = 0; i < array.size(); i++) {
res.getResult().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("imagingStudy")) {
- JsonArray array = json.getAsJsonArray("imagingStudy");
+ JsonArray array = getJArray(json, "imagingStudy");
for (int i = 0; i < array.size(); i++) {
res.getImagingStudy().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("media")) {
- JsonArray array = json.getAsJsonArray("media");
+ JsonArray array = getJArray(json, "media");
for (int i = 0; i < array.size(); i++) {
res.getMedia().add(parseDiagnosticReportMediaComponent(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("composition"))
+ res.setComposition(parseReference(getJObject(json, "composition")));
if (json.has("conclusion"))
res.setConclusionElement(parseString(json.get("conclusion").getAsString()));
if (json.has("_conclusion"))
parseElementProperties(getJObject(json, "_conclusion"), res.getConclusionElement());
if (json.has("conclusionCode")) {
- JsonArray array = json.getAsJsonArray("conclusionCode");
+ JsonArray array = getJArray(json, "conclusionCode");
for (int i = 0; i < array.size(); i++) {
res.getConclusionCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("presentedForm")) {
- JsonArray array = json.getAsJsonArray("presentedForm");
+ JsonArray array = getJArray(json, "presentedForm");
for (int i = 0; i < array.size(); i++) {
res.getPresentedForm().add(parseAttachment(array.get(i).getAsJsonObject()));
}
@@ -12111,7 +12289,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("masterIdentifier"))
res.setMasterIdentifier(parseIdentifier(getJObject(json, "masterIdentifier")));
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -12129,13 +12307,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_created"))
parseElementProperties(getJObject(json, "_created"), res.getCreatedElement());
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("recipient")) {
- JsonArray array = json.getAsJsonArray("recipient");
+ JsonArray array = getJArray(json, "recipient");
for (int i = 0; i < array.size(); i++) {
res.getRecipient().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -12149,13 +12327,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("content")) {
- JsonArray array = json.getAsJsonArray("content");
+ JsonArray array = getJArray(json, "content");
for (int i = 0; i < array.size(); i++) {
res.getContent().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("related")) {
- JsonArray array = json.getAsJsonArray("related");
+ JsonArray array = getJArray(json, "related");
for (int i = 0; i < array.size(); i++) {
res.getRelated().add(parseDocumentManifestRelatedComponent(array.get(i).getAsJsonObject()));
}
@@ -12185,13 +12363,13 @@ public class JsonParser extends JsonParserBase {
protected void parseDocumentReferenceProperties(JsonObject json, DocumentReference res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -12207,7 +12385,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -12215,13 +12393,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("subject"))
res.setSubject(parseReference(getJObject(json, "subject")));
if (json.has("encounter")) {
- JsonArray array = json.getAsJsonArray("encounter");
+ JsonArray array = getJArray(json, "encounter");
for (int i = 0; i < array.size(); i++) {
res.getEncounter().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("event")) {
- JsonArray array = json.getAsJsonArray("event");
+ JsonArray array = getJArray(json, "event");
for (int i = 0; i < array.size(); i++) {
res.getEvent().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -12237,13 +12415,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_date"))
parseElementProperties(getJObject(json, "_date"), res.getDateElement());
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("attester")) {
- JsonArray array = json.getAsJsonArray("attester");
+ JsonArray array = getJArray(json, "attester");
for (int i = 0; i < array.size(); i++) {
res.getAttester().add(parseDocumentReferenceAttesterComponent(array.get(i).getAsJsonObject()));
}
@@ -12251,7 +12429,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("custodian"))
res.setCustodian(parseReference(getJObject(json, "custodian")));
if (json.has("relatesTo")) {
- JsonArray array = json.getAsJsonArray("relatesTo");
+ JsonArray array = getJArray(json, "relatesTo");
for (int i = 0; i < array.size(); i++) {
res.getRelatesTo().add(parseDocumentReferenceRelatesToComponent(array.get(i).getAsJsonObject()));
}
@@ -12261,13 +12439,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("securityLabel")) {
- JsonArray array = json.getAsJsonArray("securityLabel");
+ JsonArray array = getJArray(json, "securityLabel");
for (int i = 0; i < array.size(); i++) {
res.getSecurityLabel().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("content")) {
- JsonArray array = json.getAsJsonArray("content");
+ JsonArray array = getJArray(json, "content");
for (int i = 0; i < array.size(); i++) {
res.getContent().add(parseDocumentReferenceContentComponent(array.get(i).getAsJsonObject()));
}
@@ -12275,7 +12453,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("sourcePatientInfo"))
res.setSourcePatientInfo(parseReference(getJObject(json, "sourcePatientInfo")));
if (json.has("related")) {
- JsonArray array = json.getAsJsonArray("related");
+ JsonArray array = getJArray(json, "related");
for (int i = 0; i < array.size(); i++) {
res.getRelated().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -12343,7 +12521,7 @@ public class JsonParser extends JsonParserBase {
protected void parseEncounterProperties(JsonObject json, Encounter res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -12353,7 +12531,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("statusHistory")) {
- JsonArray array = json.getAsJsonArray("statusHistory");
+ JsonArray array = getJArray(json, "statusHistory");
for (int i = 0; i < array.size(); i++) {
res.getStatusHistory().add(parseEncounterStatusHistoryComponent(array.get(i).getAsJsonObject()));
}
@@ -12361,13 +12539,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("class"))
res.setClass_(parseCoding(getJObject(json, "class")));
if (json.has("classHistory")) {
- JsonArray array = json.getAsJsonArray("classHistory");
+ JsonArray array = getJArray(json, "classHistory");
for (int i = 0; i < array.size(); i++) {
res.getClassHistory().add(parseEncounterClassHistoryComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -12381,25 +12559,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("subjectStatus"))
res.setSubjectStatus(parseCodeableConcept(getJObject(json, "subjectStatus")));
if (json.has("episodeOfCare")) {
- JsonArray array = json.getAsJsonArray("episodeOfCare");
+ JsonArray array = getJArray(json, "episodeOfCare");
for (int i = 0; i < array.size(); i++) {
res.getEpisodeOfCare().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("participant")) {
- JsonArray array = json.getAsJsonArray("participant");
+ JsonArray array = getJArray(json, "participant");
for (int i = 0; i < array.size(); i++) {
res.getParticipant().add(parseEncounterParticipantComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("appointment")) {
- JsonArray array = json.getAsJsonArray("appointment");
+ JsonArray array = getJArray(json, "appointment");
for (int i = 0; i < array.size(); i++) {
res.getAppointment().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -12409,19 +12587,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("length"))
res.setLength(parseDuration(getJObject(json, "length")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("diagnosis")) {
- JsonArray array = json.getAsJsonArray("diagnosis");
+ JsonArray array = getJArray(json, "diagnosis");
for (int i = 0; i < array.size(); i++) {
res.getDiagnosis().add(parseEncounterDiagnosisComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("account")) {
- JsonArray array = json.getAsJsonArray("account");
+ JsonArray array = getJArray(json, "account");
for (int i = 0; i < array.size(); i++) {
res.getAccount().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -12429,7 +12607,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("hospitalization"))
res.setHospitalization(parseEncounterHospitalizationComponent(getJObject(json, "hospitalization")));
if (json.has("location")) {
- JsonArray array = json.getAsJsonArray("location");
+ JsonArray array = getJArray(json, "location");
for (int i = 0; i < array.size(); i++) {
res.getLocation().add(parseEncounterLocationComponent(array.get(i).getAsJsonObject()));
}
@@ -12479,7 +12657,7 @@ public class JsonParser extends JsonParserBase {
protected void parseEncounterParticipantComponentProperties(JsonObject json, Encounter.EncounterParticipantComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -12525,19 +12703,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("reAdmission"))
res.setReAdmission(parseCodeableConcept(getJObject(json, "reAdmission")));
if (json.has("dietPreference")) {
- JsonArray array = json.getAsJsonArray("dietPreference");
+ JsonArray array = getJArray(json, "dietPreference");
for (int i = 0; i < array.size(); i++) {
res.getDietPreference().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("specialCourtesy")) {
- JsonArray array = json.getAsJsonArray("specialCourtesy");
+ JsonArray array = getJArray(json, "specialCourtesy");
for (int i = 0; i < array.size(); i++) {
res.getSpecialCourtesy().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("specialArrangement")) {
- JsonArray array = json.getAsJsonArray("specialArrangement");
+ JsonArray array = getJArray(json, "specialArrangement");
for (int i = 0; i < array.size(); i++) {
res.getSpecialArrangement().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -12577,7 +12755,7 @@ public class JsonParser extends JsonParserBase {
protected void parseEndpointProperties(JsonObject json, Endpoint res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -12595,7 +12773,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("managingOrganization"))
res.setManagingOrganization(parseReference(getJObject(json, "managingOrganization")));
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
@@ -12603,13 +12781,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("period"))
res.setPeriod(parsePeriod(getJObject(json, "period")));
if (json.has("payloadType")) {
- JsonArray array = json.getAsJsonArray("payloadType");
+ JsonArray array = getJArray(json, "payloadType");
for (int i = 0; i < array.size(); i++) {
res.getPayloadType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("payloadMimeType")) {
- JsonArray array = json.getAsJsonArray("payloadMimeType");
+ JsonArray array = getJArray(json, "payloadMimeType");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPayloadMimeType().add(new CodeType());
@@ -12619,7 +12797,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_payloadMimeType")) {
- JsonArray array = json.getAsJsonArray("_payloadMimeType");
+ JsonArray array = getJArray(json, "_payloadMimeType");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPayloadMimeType().size())
res.getPayloadMimeType().add(parseCode(null));
@@ -12632,7 +12810,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_address"))
parseElementProperties(getJObject(json, "_address"), res.getAddressElement());
if (json.has("header")) {
- JsonArray array = json.getAsJsonArray("header");
+ JsonArray array = getJArray(json, "header");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getHeader().add(new StringType());
@@ -12642,7 +12820,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_header")) {
- JsonArray array = json.getAsJsonArray("_header");
+ JsonArray array = getJArray(json, "_header");
for (int i = 0; i < array.size(); i++) {
if (i == res.getHeader().size())
res.getHeader().add(parseString(null));
@@ -12661,7 +12839,7 @@ public class JsonParser extends JsonParserBase {
protected void parseEnrollmentRequestProperties(JsonObject json, EnrollmentRequest res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -12693,7 +12871,7 @@ public class JsonParser extends JsonParserBase {
protected void parseEnrollmentResponseProperties(JsonObject json, EnrollmentResponse res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -12705,7 +12883,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("request"))
res.setRequest(parseReference(getJObject(json, "request")));
if (json.has("outcome"))
- res.setOutcomeElement(parseEnumeration(json.get("outcome").getAsString(), Enumerations.ClaimProcessingCodes.NULL, new Enumerations.ClaimProcessingCodesEnumFactory()));
+ res.setOutcomeElement(parseEnumeration(json.get("outcome").getAsString(), EnrollmentResponse.EnrollmentOutcome.NULL, new EnrollmentResponse.EnrollmentOutcomeEnumFactory()));
if (json.has("_outcome"))
parseElementProperties(getJObject(json, "_outcome"), res.getOutcomeElement());
if (json.has("disposition"))
@@ -12731,7 +12909,7 @@ public class JsonParser extends JsonParserBase {
protected void parseEpisodeOfCareProperties(JsonObject json, EpisodeOfCare res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -12741,19 +12919,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("statusHistory")) {
- JsonArray array = json.getAsJsonArray("statusHistory");
+ JsonArray array = getJArray(json, "statusHistory");
for (int i = 0; i < array.size(); i++) {
res.getStatusHistory().add(parseEpisodeOfCareStatusHistoryComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("diagnosis")) {
- JsonArray array = json.getAsJsonArray("diagnosis");
+ JsonArray array = getJArray(json, "diagnosis");
for (int i = 0; i < array.size(); i++) {
res.getDiagnosis().add(parseEpisodeOfCareDiagnosisComponent(array.get(i).getAsJsonObject()));
}
@@ -12765,7 +12943,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("period"))
res.setPeriod(parsePeriod(getJObject(json, "period")));
if (json.has("referralRequest")) {
- JsonArray array = json.getAsJsonArray("referralRequest");
+ JsonArray array = getJArray(json, "referralRequest");
for (int i = 0; i < array.size(); i++) {
res.getReferralRequest().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -12773,13 +12951,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("careManager"))
res.setCareManager(parseReference(getJObject(json, "careManager")));
if (json.has("team")) {
- JsonArray array = json.getAsJsonArray("team");
+ JsonArray array = getJArray(json, "team");
for (int i = 0; i < array.size(); i++) {
res.getTeam().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("account")) {
- JsonArray array = json.getAsJsonArray("account");
+ JsonArray array = getJArray(json, "account");
for (int i = 0; i < array.size(); i++) {
res.getAccount().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -12833,7 +13011,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -12874,7 +13052,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -12884,13 +13062,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -12918,43 +13096,43 @@ public class JsonParser extends JsonParserBase {
if (json.has("effectivePeriod"))
res.setEffectivePeriod(parsePeriod(getJObject(json, "effectivePeriod")));
if (json.has("topic")) {
- JsonArray array = json.getAsJsonArray("topic");
+ JsonArray array = getJArray(json, "topic");
for (int i = 0; i < array.size(); i++) {
res.getTopic().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("editor")) {
- JsonArray array = json.getAsJsonArray("editor");
+ JsonArray array = getJArray(json, "editor");
for (int i = 0; i < array.size(); i++) {
res.getEditor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("reviewer")) {
- JsonArray array = json.getAsJsonArray("reviewer");
+ JsonArray array = getJArray(json, "reviewer");
for (int i = 0; i < array.size(); i++) {
res.getReviewer().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("endorser")) {
- JsonArray array = json.getAsJsonArray("endorser");
+ JsonArray array = getJArray(json, "endorser");
for (int i = 0; i < array.size(); i++) {
res.getEndorser().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedArtifact")) {
- JsonArray array = json.getAsJsonArray("relatedArtifact");
+ JsonArray array = getJArray(json, "relatedArtifact");
for (int i = 0; i < array.size(); i++) {
res.getRelatedArtifact().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
}
};
if (json.has("trigger")) {
- JsonArray array = json.getAsJsonArray("trigger");
+ JsonArray array = getJArray(json, "trigger");
for (int i = 0; i < array.size(); i++) {
res.getTrigger().add(parseTriggerDefinition(array.get(i).getAsJsonObject()));
}
@@ -12974,7 +13152,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -12987,6 +13165,9 @@ public class JsonParser extends JsonParserBase {
res.setTitleElement(parseString(json.get("title").getAsString()));
if (json.has("_title"))
parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
+ DataType citeAs = parseType("citeAs", json);
+ if (citeAs != null)
+ res.setCiteAs(citeAs);
if (json.has("status"))
res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
if (json.has("_status"))
@@ -12996,7 +13177,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_date"))
parseElementProperties(getJObject(json, "_date"), res.getDateElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
@@ -13014,37 +13195,37 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("editor")) {
- JsonArray array = json.getAsJsonArray("editor");
+ JsonArray array = getJArray(json, "editor");
for (int i = 0; i < array.size(); i++) {
res.getEditor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("reviewer")) {
- JsonArray array = json.getAsJsonArray("reviewer");
+ JsonArray array = getJArray(json, "reviewer");
for (int i = 0; i < array.size(); i++) {
res.getReviewer().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("endorser")) {
- JsonArray array = json.getAsJsonArray("endorser");
+ JsonArray array = getJArray(json, "endorser");
for (int i = 0; i < array.size(); i++) {
res.getEndorser().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedArtifact")) {
- JsonArray array = json.getAsJsonArray("relatedArtifact");
+ JsonArray array = getJArray(json, "relatedArtifact");
for (int i = 0; i < array.size(); i++) {
res.getRelatedArtifact().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
}
@@ -13058,13 +13239,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_assertion"))
parseElementProperties(getJObject(json, "_assertion"), res.getAssertionElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("variableDefinition")) {
- JsonArray array = json.getAsJsonArray("variableDefinition");
+ JsonArray array = getJArray(json, "variableDefinition");
for (int i = 0; i < array.size(); i++) {
res.getVariableDefinition().add(parseEvidenceVariableDefinitionComponent(array.get(i).getAsJsonObject()));
}
@@ -13074,19 +13255,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("studyType"))
res.setStudyType(parseCodeableConcept(getJObject(json, "studyType")));
if (json.has("statistic")) {
- JsonArray array = json.getAsJsonArray("statistic");
+ JsonArray array = getJArray(json, "statistic");
for (int i = 0; i < array.size(); i++) {
res.getStatistic().add(parseStatistic(array.get(i).getAsJsonObject()));
}
};
if (json.has("distribution")) {
- JsonArray array = json.getAsJsonArray("distribution");
+ JsonArray array = getJArray(json, "distribution");
for (int i = 0; i < array.size(); i++) {
res.getDistribution().add(parseOrderedDistribution(array.get(i).getAsJsonObject()));
}
};
if (json.has("certainty")) {
- JsonArray array = json.getAsJsonArray("certainty");
+ JsonArray array = getJArray(json, "certainty");
for (int i = 0; i < array.size(); i++) {
res.getCertainty().add(parseEvidenceCertaintyComponent(array.get(i).getAsJsonObject()));
}
@@ -13106,7 +13287,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -13134,53 +13315,23 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
- if (json.has("rating")) {
- JsonArray array = json.getAsJsonArray("rating");
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("rating"))
+ res.setRating(parseCodeableConcept(getJObject(json, "rating")));
+ if (json.has("rater"))
+ res.setRaterElement(parseString(json.get("rater").getAsString()));
+ if (json.has("_rater"))
+ parseElementProperties(getJObject(json, "_rater"), res.getRaterElement());
+ if (json.has("subcomponent")) {
+ JsonArray array = getJArray(json, "subcomponent");
for (int i = 0; i < array.size(); i++) {
- res.getRating().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("certaintySubcomponent")) {
- JsonArray array = json.getAsJsonArray("certaintySubcomponent");
- for (int i = 0; i < array.size(); i++) {
- res.getCertaintySubcomponent().add(parseEvidenceCertaintyCertaintySubcomponentComponent(array.get(i).getAsJsonObject()));
- }
- };
- }
-
- protected Evidence.EvidenceCertaintyCertaintySubcomponentComponent parseEvidenceCertaintyCertaintySubcomponentComponent(JsonObject json) throws IOException, FHIRFormatError {
- Evidence.EvidenceCertaintyCertaintySubcomponentComponent res = new Evidence.EvidenceCertaintyCertaintySubcomponentComponent();
- parseEvidenceCertaintyCertaintySubcomponentComponentProperties(json, res);
- return res;
- }
-
- protected void parseEvidenceCertaintyCertaintySubcomponentComponentProperties(JsonObject json, Evidence.EvidenceCertaintyCertaintySubcomponentComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("description"))
- res.setDescriptionElement(parseString(json.get("description").getAsString()));
- if (json.has("_description"))
- parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
- if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
- for (int i = 0; i < array.size(); i++) {
- res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
- for (int i = 0; i < array.size(); i++) {
- res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("rating")) {
- JsonArray array = json.getAsJsonArray("rating");
- for (int i = 0; i < array.size(); i++) {
- res.getRating().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ res.getSubcomponent().add(parseEvidenceCertaintyComponent(array.get(i).getAsJsonObject()));
}
};
}
@@ -13202,35 +13353,36 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedIdentifier")) {
- JsonArray array = json.getAsJsonArray("relatedIdentifier");
+ JsonArray array = getJArray(json, "relatedIdentifier");
for (int i = 0; i < array.size(); i++) {
res.getRelatedIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
- if (json.has("citeAs"))
- res.setCiteAs(parseReference(getJObject(json, "citeAs")));
+ DataType citeAs = parseType("citeAs", json);
+ if (citeAs != null)
+ res.setCiteAs(citeAs);
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedArtifact")) {
- JsonArray array = json.getAsJsonArray("relatedArtifact");
+ JsonArray array = getJArray(json, "relatedArtifact");
for (int i = 0; i < array.size(); i++) {
res.getRelatedArtifact().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
}
@@ -13242,43 +13394,43 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("editor")) {
- JsonArray array = json.getAsJsonArray("editor");
+ JsonArray array = getJArray(json, "editor");
for (int i = 0; i < array.size(); i++) {
res.getEditor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("reviewer")) {
- JsonArray array = json.getAsJsonArray("reviewer");
+ JsonArray array = getJArray(json, "reviewer");
for (int i = 0; i < array.size(); i++) {
res.getReviewer().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("endorser")) {
- JsonArray array = json.getAsJsonArray("endorser");
+ JsonArray array = getJArray(json, "endorser");
for (int i = 0; i < array.size(); i++) {
res.getEndorser().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatesTo")) {
- JsonArray array = json.getAsJsonArray("relatesTo");
+ JsonArray array = getJArray(json, "relatesTo");
for (int i = 0; i < array.size(); i++) {
res.getRelatesTo().add(parseEvidenceReportRelatesToComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("section")) {
- JsonArray array = json.getAsJsonArray("section");
+ JsonArray array = getJArray(json, "section");
for (int i = 0; i < array.size(); i++) {
res.getSection().add(parseEvidenceReportSectionComponent(array.get(i).getAsJsonObject()));
}
@@ -13294,13 +13446,13 @@ public class JsonParser extends JsonParserBase {
protected void parseEvidenceReportSubjectComponentProperties(JsonObject json, EvidenceReport.EvidenceReportSubjectComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("characteristic")) {
- JsonArray array = json.getAsJsonArray("characteristic");
+ JsonArray array = getJArray(json, "characteristic");
for (int i = 0; i < array.size(); i++) {
res.getCharacteristic().add(parseEvidenceReportSubjectCharacteristicComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -13362,7 +13514,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("focusReference"))
res.setFocusReference(parseReference(getJObject(json, "focusReference")));
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -13376,21 +13528,27 @@ public class JsonParser extends JsonParserBase {
if (json.has("orderedBy"))
res.setOrderedBy(parseCodeableConcept(getJObject(json, "orderedBy")));
if (json.has("entryClassifier")) {
- JsonArray array = json.getAsJsonArray("entryClassifier");
+ JsonArray array = getJArray(json, "entryClassifier");
for (int i = 0; i < array.size(); i++) {
res.getEntryClassifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("entryReference")) {
- JsonArray array = json.getAsJsonArray("entryReference");
+ JsonArray array = getJArray(json, "entryReference");
for (int i = 0; i < array.size(); i++) {
res.getEntryReference().add(parseReference(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("entryQuantity")) {
+ JsonArray array = getJArray(json, "entryQuantity");
+ for (int i = 0; i < array.size(); i++) {
+ res.getEntryQuantity().add(parseQuantity(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("emptyReason"))
res.setEmptyReason(parseCodeableConcept(getJObject(json, "emptyReason")));
if (json.has("section")) {
- JsonArray array = json.getAsJsonArray("section");
+ JsonArray array = getJArray(json, "section");
for (int i = 0; i < array.size(); i++) {
res.getSection().add(parseEvidenceReportSectionComponent(array.get(i).getAsJsonObject()));
}
@@ -13410,7 +13568,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -13448,13 +13606,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
@@ -13464,37 +13622,37 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("editor")) {
- JsonArray array = json.getAsJsonArray("editor");
+ JsonArray array = getJArray(json, "editor");
for (int i = 0; i < array.size(); i++) {
res.getEditor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("reviewer")) {
- JsonArray array = json.getAsJsonArray("reviewer");
+ JsonArray array = getJArray(json, "reviewer");
for (int i = 0; i < array.size(); i++) {
res.getReviewer().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("endorser")) {
- JsonArray array = json.getAsJsonArray("endorser");
+ JsonArray array = getJArray(json, "endorser");
for (int i = 0; i < array.size(); i++) {
res.getEndorser().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedArtifact")) {
- JsonArray array = json.getAsJsonArray("relatedArtifact");
+ JsonArray array = getJArray(json, "relatedArtifact");
for (int i = 0; i < array.size(); i++) {
res.getRelatedArtifact().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
}
@@ -13508,7 +13666,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_characteristicCombination"))
parseElementProperties(getJObject(json, "_characteristicCombination"), res.getCharacteristicCombinationElement());
if (json.has("characteristic")) {
- JsonArray array = json.getAsJsonArray("characteristic");
+ JsonArray array = getJArray(json, "characteristic");
for (int i = 0; i < array.size(); i++) {
res.getCharacteristic().add(parseEvidenceVariableCharacteristicComponent(array.get(i).getAsJsonObject()));
}
@@ -13518,7 +13676,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_handling"))
parseElementProperties(getJObject(json, "_handling"), res.getHandlingElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseEvidenceVariableCategoryComponent(array.get(i).getAsJsonObject()));
}
@@ -13573,7 +13731,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("range"))
res.setRange(parseRange(getJObject(json, "range")));
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -13610,7 +13768,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -13640,19 +13798,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -13666,25 +13824,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("_copyright"))
parseElementProperties(getJObject(json, "_copyright"), res.getCopyrightElement());
if (json.has("actor")) {
- JsonArray array = json.getAsJsonArray("actor");
+ JsonArray array = getJArray(json, "actor");
for (int i = 0; i < array.size(); i++) {
res.getActor().add(parseExampleScenarioActorComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("instance")) {
- JsonArray array = json.getAsJsonArray("instance");
+ JsonArray array = getJArray(json, "instance");
for (int i = 0; i < array.size(); i++) {
res.getInstance().add(parseExampleScenarioInstanceComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("process")) {
- JsonArray array = json.getAsJsonArray("process");
+ JsonArray array = getJArray(json, "process");
for (int i = 0; i < array.size(); i++) {
res.getProcess().add(parseExampleScenarioProcessComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("workflow")) {
- JsonArray array = json.getAsJsonArray("workflow");
+ JsonArray array = getJArray(json, "workflow");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getWorkflow().add(new CanonicalType());
@@ -13694,7 +13852,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_workflow")) {
- JsonArray array = json.getAsJsonArray("_workflow");
+ JsonArray array = getJArray(json, "_workflow");
for (int i = 0; i < array.size(); i++) {
if (i == res.getWorkflow().size())
res.getWorkflow().add(parseCanonical(null));
@@ -13755,13 +13913,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("version")) {
- JsonArray array = json.getAsJsonArray("version");
+ JsonArray array = getJArray(json, "version");
for (int i = 0; i < array.size(); i++) {
res.getVersion().add(parseExampleScenarioInstanceVersionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("containedInstance")) {
- JsonArray array = json.getAsJsonArray("containedInstance");
+ JsonArray array = getJArray(json, "containedInstance");
for (int i = 0; i < array.size(); i++) {
res.getContainedInstance().add(parseExampleScenarioInstanceContainedInstanceComponent(array.get(i).getAsJsonObject()));
}
@@ -13829,7 +13987,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_postConditions"))
parseElementProperties(getJObject(json, "_postConditions"), res.getPostConditionsElement());
if (json.has("step")) {
- JsonArray array = json.getAsJsonArray("step");
+ JsonArray array = getJArray(json, "step");
for (int i = 0; i < array.size(); i++) {
res.getStep().add(parseExampleScenarioProcessStepComponent(array.get(i).getAsJsonObject()));
}
@@ -13845,7 +14003,7 @@ public class JsonParser extends JsonParserBase {
protected void parseExampleScenarioProcessStepComponentProperties(JsonObject json, ExampleScenario.ExampleScenarioProcessStepComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("process")) {
- JsonArray array = json.getAsJsonArray("process");
+ JsonArray array = getJArray(json, "process");
for (int i = 0; i < array.size(); i++) {
res.getProcess().add(parseExampleScenarioProcessComponent(array.get(i).getAsJsonObject()));
}
@@ -13857,7 +14015,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("operation"))
res.setOperation(parseExampleScenarioProcessStepOperationComponent(getJObject(json, "operation")));
if (json.has("alternative")) {
- JsonArray array = json.getAsJsonArray("alternative");
+ JsonArray array = getJArray(json, "alternative");
for (int i = 0; i < array.size(); i++) {
res.getAlternative().add(parseExampleScenarioProcessStepAlternativeComponent(array.get(i).getAsJsonObject()));
}
@@ -13927,7 +14085,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("step")) {
- JsonArray array = json.getAsJsonArray("step");
+ JsonArray array = getJArray(json, "step");
for (int i = 0; i < array.size(); i++) {
res.getStep().add(parseExampleScenarioProcessStepComponent(array.get(i).getAsJsonObject()));
}
@@ -13943,7 +14101,7 @@ public class JsonParser extends JsonParserBase {
protected void parseExplanationOfBenefitProperties(JsonObject json, ExplanationOfBenefit res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -13981,7 +14139,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("fundsReserve"))
res.setFundsReserve(parseCodeableConcept(getJObject(json, "fundsReserve")));
if (json.has("related")) {
- JsonArray array = json.getAsJsonArray("related");
+ JsonArray array = getJArray(json, "related");
for (int i = 0; i < array.size(); i++) {
res.getRelated().add(parseExplanationOfBenefitRelatedClaimComponent(array.get(i).getAsJsonObject()));
}
@@ -14009,7 +14167,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_disposition"))
parseElementProperties(getJObject(json, "_disposition"), res.getDispositionElement());
if (json.has("preAuthRef")) {
- JsonArray array = json.getAsJsonArray("preAuthRef");
+ JsonArray array = getJArray(json, "preAuthRef");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPreAuthRef().add(new StringType());
@@ -14019,7 +14177,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_preAuthRef")) {
- JsonArray array = json.getAsJsonArray("_preAuthRef");
+ JsonArray array = getJArray(json, "_preAuthRef");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPreAuthRef().size())
res.getPreAuthRef().add(parseString(null));
@@ -14028,31 +14186,31 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("preAuthRefPeriod")) {
- JsonArray array = json.getAsJsonArray("preAuthRefPeriod");
+ JsonArray array = getJArray(json, "preAuthRefPeriod");
for (int i = 0; i < array.size(); i++) {
res.getPreAuthRefPeriod().add(parsePeriod(array.get(i).getAsJsonObject()));
}
};
if (json.has("careTeam")) {
- JsonArray array = json.getAsJsonArray("careTeam");
+ JsonArray array = getJArray(json, "careTeam");
for (int i = 0; i < array.size(); i++) {
res.getCareTeam().add(parseExplanationOfBenefitCareTeamComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("supportingInfo")) {
- JsonArray array = json.getAsJsonArray("supportingInfo");
+ JsonArray array = getJArray(json, "supportingInfo");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInfo().add(parseExplanationOfBenefitSupportingInformationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("diagnosis")) {
- JsonArray array = json.getAsJsonArray("diagnosis");
+ JsonArray array = getJArray(json, "diagnosis");
for (int i = 0; i < array.size(); i++) {
res.getDiagnosis().add(parseExplanationOfBenefitDiagnosisComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("procedure")) {
- JsonArray array = json.getAsJsonArray("procedure");
+ JsonArray array = getJArray(json, "procedure");
for (int i = 0; i < array.size(); i++) {
res.getProcedure().add(parseExplanationOfBenefitProcedureComponent(array.get(i).getAsJsonObject()));
}
@@ -14062,7 +14220,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_precedence"))
parseElementProperties(getJObject(json, "_precedence"), res.getPrecedenceElement());
if (json.has("insurance")) {
- JsonArray array = json.getAsJsonArray("insurance");
+ JsonArray array = getJArray(json, "insurance");
for (int i = 0; i < array.size(); i++) {
res.getInsurance().add(parseExplanationOfBenefitInsuranceComponent(array.get(i).getAsJsonObject()));
}
@@ -14070,25 +14228,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("accident"))
res.setAccident(parseExplanationOfBenefitAccidentComponent(getJObject(json, "accident")));
if (json.has("item")) {
- JsonArray array = json.getAsJsonArray("item");
+ JsonArray array = getJArray(json, "item");
for (int i = 0; i < array.size(); i++) {
res.getItem().add(parseExplanationOfBenefitItemComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("addItem")) {
- JsonArray array = json.getAsJsonArray("addItem");
+ JsonArray array = getJArray(json, "addItem");
for (int i = 0; i < array.size(); i++) {
res.getAddItem().add(parseExplanationOfBenefitAddedItemComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseExplanationOfBenefitAdjudicationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("total")) {
- JsonArray array = json.getAsJsonArray("total");
+ JsonArray array = getJArray(json, "total");
for (int i = 0; i < array.size(); i++) {
res.getTotal().add(parseExplanationOfBenefitTotalComponent(array.get(i).getAsJsonObject()));
}
@@ -14100,7 +14258,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("form"))
res.setForm(parseAttachment(getJObject(json, "form")));
if (json.has("processNote")) {
- JsonArray array = json.getAsJsonArray("processNote");
+ JsonArray array = getJArray(json, "processNote");
for (int i = 0; i < array.size(); i++) {
res.getProcessNote().add(parseExplanationOfBenefitNoteComponent(array.get(i).getAsJsonObject()));
}
@@ -14108,7 +14266,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("benefitPeriod"))
res.setBenefitPeriod(parsePeriod(getJObject(json, "benefitPeriod")));
if (json.has("benefitBalance")) {
- JsonArray array = json.getAsJsonArray("benefitBalance");
+ JsonArray array = getJArray(json, "benefitBalance");
for (int i = 0; i < array.size(); i++) {
res.getBenefitBalance().add(parseExplanationOfBenefitBenefitBalanceComponent(array.get(i).getAsJsonObject()));
}
@@ -14211,7 +14369,7 @@ public class JsonParser extends JsonParserBase {
if (diagnosis != null)
res.setDiagnosis(diagnosis);
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -14235,7 +14393,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_sequence"))
parseElementProperties(getJObject(json, "_sequence"), res.getSequenceElement());
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -14248,7 +14406,7 @@ public class JsonParser extends JsonParserBase {
if (procedure != null)
res.setProcedure(procedure);
if (json.has("udi")) {
- JsonArray array = json.getAsJsonArray("udi");
+ JsonArray array = getJArray(json, "udi");
for (int i = 0; i < array.size(); i++) {
res.getUdi().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -14270,7 +14428,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("coverage"))
res.setCoverage(parseReference(getJObject(json, "coverage")));
if (json.has("preAuthRef")) {
- JsonArray array = json.getAsJsonArray("preAuthRef");
+ JsonArray array = getJArray(json, "preAuthRef");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPreAuthRef().add(new StringType());
@@ -14280,7 +14438,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_preAuthRef")) {
- JsonArray array = json.getAsJsonArray("_preAuthRef");
+ JsonArray array = getJArray(json, "_preAuthRef");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPreAuthRef().size())
res.getPreAuthRef().add(parseString(null));
@@ -14322,7 +14480,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_sequence"))
parseElementProperties(getJObject(json, "_sequence"), res.getSequenceElement());
if (json.has("careTeamSequence")) {
- JsonArray array = json.getAsJsonArray("careTeamSequence");
+ JsonArray array = getJArray(json, "careTeamSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getCareTeamSequence().add(new PositiveIntType());
@@ -14332,7 +14490,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_careTeamSequence")) {
- JsonArray array = json.getAsJsonArray("_careTeamSequence");
+ JsonArray array = getJArray(json, "_careTeamSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getCareTeamSequence().size())
res.getCareTeamSequence().add(parsePositiveInt(null));
@@ -14341,7 +14499,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("diagnosisSequence")) {
- JsonArray array = json.getAsJsonArray("diagnosisSequence");
+ JsonArray array = getJArray(json, "diagnosisSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDiagnosisSequence().add(new PositiveIntType());
@@ -14351,7 +14509,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_diagnosisSequence")) {
- JsonArray array = json.getAsJsonArray("_diagnosisSequence");
+ JsonArray array = getJArray(json, "_diagnosisSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDiagnosisSequence().size())
res.getDiagnosisSequence().add(parsePositiveInt(null));
@@ -14360,7 +14518,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("procedureSequence")) {
- JsonArray array = json.getAsJsonArray("procedureSequence");
+ JsonArray array = getJArray(json, "procedureSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getProcedureSequence().add(new PositiveIntType());
@@ -14370,7 +14528,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_procedureSequence")) {
- JsonArray array = json.getAsJsonArray("_procedureSequence");
+ JsonArray array = getJArray(json, "_procedureSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getProcedureSequence().size())
res.getProcedureSequence().add(parsePositiveInt(null));
@@ -14379,7 +14537,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("informationSequence")) {
- JsonArray array = json.getAsJsonArray("informationSequence");
+ JsonArray array = getJArray(json, "informationSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInformationSequence().add(new PositiveIntType());
@@ -14389,7 +14547,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_informationSequence")) {
- JsonArray array = json.getAsJsonArray("_informationSequence");
+ JsonArray array = getJArray(json, "_informationSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInformationSequence().size())
res.getInformationSequence().add(parsePositiveInt(null));
@@ -14404,13 +14562,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("programCode")) {
- JsonArray array = json.getAsJsonArray("programCode");
+ JsonArray array = getJArray(json, "programCode");
for (int i = 0; i < array.size(); i++) {
res.getProgramCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -14432,7 +14590,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("net"))
res.setNet(parseMoney(getJObject(json, "net")));
if (json.has("udi")) {
- JsonArray array = json.getAsJsonArray("udi");
+ JsonArray array = getJArray(json, "udi");
for (int i = 0; i < array.size(); i++) {
res.getUdi().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -14440,19 +14598,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("bodySite"))
res.setBodySite(parseCodeableConcept(getJObject(json, "bodySite")));
if (json.has("subSite")) {
- JsonArray array = json.getAsJsonArray("subSite");
+ JsonArray array = getJArray(json, "subSite");
for (int i = 0; i < array.size(); i++) {
res.getSubSite().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("encounter")) {
- JsonArray array = json.getAsJsonArray("encounter");
+ JsonArray array = getJArray(json, "encounter");
for (int i = 0; i < array.size(); i++) {
res.getEncounter().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("noteNumber")) {
- JsonArray array = json.getAsJsonArray("noteNumber");
+ JsonArray array = getJArray(json, "noteNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNoteNumber().add(new PositiveIntType());
@@ -14462,7 +14620,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_noteNumber")) {
- JsonArray array = json.getAsJsonArray("_noteNumber");
+ JsonArray array = getJArray(json, "_noteNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNoteNumber().size())
res.getNoteNumber().add(parsePositiveInt(null));
@@ -14471,13 +14629,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseExplanationOfBenefitAdjudicationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("detail")) {
- JsonArray array = json.getAsJsonArray("detail");
+ JsonArray array = getJArray(json, "detail");
for (int i = 0; i < array.size(); i++) {
res.getDetail().add(parseExplanationOfBenefitDetailComponent(array.get(i).getAsJsonObject()));
}
@@ -14523,13 +14681,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("programCode")) {
- JsonArray array = json.getAsJsonArray("programCode");
+ JsonArray array = getJArray(json, "programCode");
for (int i = 0; i < array.size(); i++) {
res.getProgramCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -14545,13 +14703,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("net"))
res.setNet(parseMoney(getJObject(json, "net")));
if (json.has("udi")) {
- JsonArray array = json.getAsJsonArray("udi");
+ JsonArray array = getJArray(json, "udi");
for (int i = 0; i < array.size(); i++) {
res.getUdi().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("noteNumber")) {
- JsonArray array = json.getAsJsonArray("noteNumber");
+ JsonArray array = getJArray(json, "noteNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNoteNumber().add(new PositiveIntType());
@@ -14561,7 +14719,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_noteNumber")) {
- JsonArray array = json.getAsJsonArray("_noteNumber");
+ JsonArray array = getJArray(json, "_noteNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNoteNumber().size())
res.getNoteNumber().add(parsePositiveInt(null));
@@ -14570,13 +14728,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseExplanationOfBenefitAdjudicationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("subDetail")) {
- JsonArray array = json.getAsJsonArray("subDetail");
+ JsonArray array = getJArray(json, "subDetail");
for (int i = 0; i < array.size(); i++) {
res.getSubDetail().add(parseExplanationOfBenefitSubDetailComponent(array.get(i).getAsJsonObject()));
}
@@ -14602,13 +14760,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("programCode")) {
- JsonArray array = json.getAsJsonArray("programCode");
+ JsonArray array = getJArray(json, "programCode");
for (int i = 0; i < array.size(); i++) {
res.getProgramCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -14624,13 +14782,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("net"))
res.setNet(parseMoney(getJObject(json, "net")));
if (json.has("udi")) {
- JsonArray array = json.getAsJsonArray("udi");
+ JsonArray array = getJArray(json, "udi");
for (int i = 0; i < array.size(); i++) {
res.getUdi().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("noteNumber")) {
- JsonArray array = json.getAsJsonArray("noteNumber");
+ JsonArray array = getJArray(json, "noteNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNoteNumber().add(new PositiveIntType());
@@ -14640,7 +14798,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_noteNumber")) {
- JsonArray array = json.getAsJsonArray("_noteNumber");
+ JsonArray array = getJArray(json, "_noteNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNoteNumber().size())
res.getNoteNumber().add(parsePositiveInt(null));
@@ -14649,7 +14807,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseExplanationOfBenefitAdjudicationComponent(array.get(i).getAsJsonObject()));
}
@@ -14665,7 +14823,7 @@ public class JsonParser extends JsonParserBase {
protected void parseExplanationOfBenefitAddedItemComponentProperties(JsonObject json, ExplanationOfBenefit.AddedItemComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("itemSequence")) {
- JsonArray array = json.getAsJsonArray("itemSequence");
+ JsonArray array = getJArray(json, "itemSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getItemSequence().add(new PositiveIntType());
@@ -14675,7 +14833,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_itemSequence")) {
- JsonArray array = json.getAsJsonArray("_itemSequence");
+ JsonArray array = getJArray(json, "_itemSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getItemSequence().size())
res.getItemSequence().add(parsePositiveInt(null));
@@ -14684,7 +14842,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("detailSequence")) {
- JsonArray array = json.getAsJsonArray("detailSequence");
+ JsonArray array = getJArray(json, "detailSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDetailSequence().add(new PositiveIntType());
@@ -14694,7 +14852,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_detailSequence")) {
- JsonArray array = json.getAsJsonArray("_detailSequence");
+ JsonArray array = getJArray(json, "_detailSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDetailSequence().size())
res.getDetailSequence().add(parsePositiveInt(null));
@@ -14703,7 +14861,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("subDetailSequence")) {
- JsonArray array = json.getAsJsonArray("subDetailSequence");
+ JsonArray array = getJArray(json, "subDetailSequence");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSubDetailSequence().add(new PositiveIntType());
@@ -14713,7 +14871,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_subDetailSequence")) {
- JsonArray array = json.getAsJsonArray("_subDetailSequence");
+ JsonArray array = getJArray(json, "_subDetailSequence");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSubDetailSequence().size())
res.getSubDetailSequence().add(parsePositiveInt(null));
@@ -14722,7 +14880,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("provider")) {
- JsonArray array = json.getAsJsonArray("provider");
+ JsonArray array = getJArray(json, "provider");
for (int i = 0; i < array.size(); i++) {
res.getProvider().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -14730,13 +14888,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("programCode")) {
- JsonArray array = json.getAsJsonArray("programCode");
+ JsonArray array = getJArray(json, "programCode");
for (int i = 0; i < array.size(); i++) {
res.getProgramCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -14760,13 +14918,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("bodySite"))
res.setBodySite(parseCodeableConcept(getJObject(json, "bodySite")));
if (json.has("subSite")) {
- JsonArray array = json.getAsJsonArray("subSite");
+ JsonArray array = getJArray(json, "subSite");
for (int i = 0; i < array.size(); i++) {
res.getSubSite().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("noteNumber")) {
- JsonArray array = json.getAsJsonArray("noteNumber");
+ JsonArray array = getJArray(json, "noteNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNoteNumber().add(new PositiveIntType());
@@ -14776,7 +14934,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_noteNumber")) {
- JsonArray array = json.getAsJsonArray("_noteNumber");
+ JsonArray array = getJArray(json, "_noteNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNoteNumber().size())
res.getNoteNumber().add(parsePositiveInt(null));
@@ -14785,13 +14943,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseExplanationOfBenefitAdjudicationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("detail")) {
- JsonArray array = json.getAsJsonArray("detail");
+ JsonArray array = getJArray(json, "detail");
for (int i = 0; i < array.size(); i++) {
res.getDetail().add(parseExplanationOfBenefitAddedItemDetailComponent(array.get(i).getAsJsonObject()));
}
@@ -14809,7 +14967,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -14825,7 +14983,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("net"))
res.setNet(parseMoney(getJObject(json, "net")));
if (json.has("noteNumber")) {
- JsonArray array = json.getAsJsonArray("noteNumber");
+ JsonArray array = getJArray(json, "noteNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNoteNumber().add(new PositiveIntType());
@@ -14835,7 +14993,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_noteNumber")) {
- JsonArray array = json.getAsJsonArray("_noteNumber");
+ JsonArray array = getJArray(json, "_noteNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNoteNumber().size())
res.getNoteNumber().add(parsePositiveInt(null));
@@ -14844,13 +15002,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseExplanationOfBenefitAdjudicationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("subDetail")) {
- JsonArray array = json.getAsJsonArray("subDetail");
+ JsonArray array = getJArray(json, "subDetail");
for (int i = 0; i < array.size(); i++) {
res.getSubDetail().add(parseExplanationOfBenefitAddedItemDetailSubDetailComponent(array.get(i).getAsJsonObject()));
}
@@ -14868,7 +15026,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("productOrService"))
res.setProductOrService(parseCodeableConcept(getJObject(json, "productOrService")));
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
res.getModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -14884,7 +15042,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("net"))
res.setNet(parseMoney(getJObject(json, "net")));
if (json.has("noteNumber")) {
- JsonArray array = json.getAsJsonArray("noteNumber");
+ JsonArray array = getJArray(json, "noteNumber");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNoteNumber().add(new PositiveIntType());
@@ -14894,7 +15052,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_noteNumber")) {
- JsonArray array = json.getAsJsonArray("_noteNumber");
+ JsonArray array = getJArray(json, "_noteNumber");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNoteNumber().size())
res.getNoteNumber().add(parsePositiveInt(null));
@@ -14903,7 +15061,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("adjudication")) {
- JsonArray array = json.getAsJsonArray("adjudication");
+ JsonArray array = getJArray(json, "adjudication");
for (int i = 0; i < array.size(); i++) {
res.getAdjudication().add(parseExplanationOfBenefitAdjudicationComponent(array.get(i).getAsJsonObject()));
}
@@ -15001,7 +15159,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("term"))
res.setTerm(parseCodeableConcept(getJObject(json, "term")));
if (json.has("financial")) {
- JsonArray array = json.getAsJsonArray("financial");
+ JsonArray array = getJArray(json, "financial");
for (int i = 0; i < array.size(); i++) {
res.getFinancial().add(parseExplanationOfBenefitBenefitComponent(array.get(i).getAsJsonObject()));
}
@@ -15035,13 +15193,13 @@ public class JsonParser extends JsonParserBase {
protected void parseFamilyMemberHistoryProperties(JsonObject json, FamilyMemberHistory res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -15051,7 +15209,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -15060,7 +15218,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -15070,7 +15228,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -15112,25 +15270,25 @@ public class JsonParser extends JsonParserBase {
if (deceased != null)
res.setDeceased(deceased);
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("condition")) {
- JsonArray array = json.getAsJsonArray("condition");
+ JsonArray array = getJArray(json, "condition");
for (int i = 0; i < array.size(); i++) {
res.getCondition().add(parseFamilyMemberHistoryConditionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("procedure")) {
- JsonArray array = json.getAsJsonArray("procedure");
+ JsonArray array = getJArray(json, "procedure");
for (int i = 0; i < array.size(); i++) {
res.getProcedure().add(parseFamilyMemberHistoryProcedureComponent(array.get(i).getAsJsonObject()));
}
@@ -15157,7 +15315,7 @@ public class JsonParser extends JsonParserBase {
if (onset != null)
res.setOnset(onset);
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -15184,7 +15342,7 @@ public class JsonParser extends JsonParserBase {
if (performed != null)
res.setPerformed(performed);
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -15200,7 +15358,7 @@ public class JsonParser extends JsonParserBase {
protected void parseFlagProperties(JsonObject json, Flag res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -15210,7 +15368,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -15236,7 +15394,7 @@ public class JsonParser extends JsonParserBase {
protected void parseGoalProperties(JsonObject json, Goal res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -15248,7 +15406,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("achievementStatus"))
res.setAchievementStatus(parseCodeableConcept(getJObject(json, "achievementStatus")));
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -15267,7 +15425,7 @@ public class JsonParser extends JsonParserBase {
if (start != null)
res.setStart(start);
if (json.has("target")) {
- JsonArray array = json.getAsJsonArray("target");
+ JsonArray array = getJArray(json, "target");
for (int i = 0; i < array.size(); i++) {
res.getTarget().add(parseGoalTargetComponent(array.get(i).getAsJsonObject()));
}
@@ -15280,22 +15438,22 @@ public class JsonParser extends JsonParserBase {
res.setStatusReasonElement(parseString(json.get("statusReason").getAsString()));
if (json.has("_statusReason"))
parseElementProperties(getJObject(json, "_statusReason"), res.getStatusReasonElement());
- if (json.has("expressedBy"))
- res.setExpressedBy(parseReference(getJObject(json, "expressedBy")));
+ if (json.has("source"))
+ res.setSource(parseReference(getJObject(json, "source")));
if (json.has("addresses")) {
- JsonArray array = json.getAsJsonArray("addresses");
+ JsonArray array = getJArray(json, "addresses");
for (int i = 0; i < array.size(); i++) {
res.getAddresses().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("outcome")) {
- JsonArray array = json.getAsJsonArray("outcome");
+ JsonArray array = getJArray(json, "outcome");
for (int i = 0; i < array.size(); i++) {
res.getOutcome().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
@@ -15357,7 +15515,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -15367,13 +15525,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -15391,7 +15549,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_profile"))
parseElementProperties(getJObject(json, "_profile"), res.getProfileElement());
if (json.has("link")) {
- JsonArray array = json.getAsJsonArray("link");
+ JsonArray array = getJArray(json, "link");
for (int i = 0; i < array.size(); i++) {
res.getLink().add(parseGraphDefinitionLinkComponent(array.get(i).getAsJsonObject()));
}
@@ -15427,7 +15585,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("target")) {
- JsonArray array = json.getAsJsonArray("target");
+ JsonArray array = getJArray(json, "target");
for (int i = 0; i < array.size(); i++) {
res.getTarget().add(parseGraphDefinitionLinkTargetComponent(array.get(i).getAsJsonObject()));
}
@@ -15455,13 +15613,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_profile"))
parseElementProperties(getJObject(json, "_profile"), res.getProfileElement());
if (json.has("compartment")) {
- JsonArray array = json.getAsJsonArray("compartment");
+ JsonArray array = getJArray(json, "compartment");
for (int i = 0; i < array.size(); i++) {
res.getCompartment().add(parseGraphDefinitionLinkTargetCompartmentComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("link")) {
- JsonArray array = json.getAsJsonArray("link");
+ JsonArray array = getJArray(json, "link");
for (int i = 0; i < array.size(); i++) {
res.getLink().add(parseGraphDefinitionLinkComponent(array.get(i).getAsJsonObject()));
}
@@ -15507,7 +15665,7 @@ public class JsonParser extends JsonParserBase {
protected void parseGroupProperties(JsonObject json, Group res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -15537,13 +15695,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("managingEntity"))
res.setManagingEntity(parseReference(getJObject(json, "managingEntity")));
if (json.has("characteristic")) {
- JsonArray array = json.getAsJsonArray("characteristic");
+ JsonArray array = getJArray(json, "characteristic");
for (int i = 0; i < array.size(); i++) {
res.getCharacteristic().add(parseGroupCharacteristicComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("member")) {
- JsonArray array = json.getAsJsonArray("member");
+ JsonArray array = getJArray(json, "member");
for (int i = 0; i < array.size(); i++) {
res.getMember().add(parseGroupMemberComponent(array.get(i).getAsJsonObject()));
}
@@ -15600,7 +15758,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("requestIdentifier"))
res.setRequestIdentifier(parseIdentifier(getJObject(json, "requestIdentifier")));
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -15623,19 +15781,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("performer"))
res.setPerformer(parseReference(getJObject(json, "performer")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("evaluationMessage")) {
- JsonArray array = json.getAsJsonArray("evaluationMessage");
+ JsonArray array = getJArray(json, "evaluationMessage");
for (int i = 0; i < array.size(); i++) {
res.getEvaluationMessage().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -15645,7 +15803,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("result"))
res.setResult(parseReference(getJObject(json, "result")));
if (json.has("dataRequirement")) {
- JsonArray array = json.getAsJsonArray("dataRequirement");
+ JsonArray array = getJArray(json, "dataRequirement");
for (int i = 0; i < array.size(); i++) {
res.getDataRequirement().add(parseDataRequirement(array.get(i).getAsJsonObject()));
}
@@ -15661,7 +15819,7 @@ public class JsonParser extends JsonParserBase {
protected void parseHealthcareServiceProperties(JsonObject json, HealthcareService res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -15673,25 +15831,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("providedBy"))
res.setProvidedBy(parseReference(getJObject(json, "providedBy")));
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("specialty")) {
- JsonArray array = json.getAsJsonArray("specialty");
+ JsonArray array = getJArray(json, "specialty");
for (int i = 0; i < array.size(); i++) {
res.getSpecialty().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("location")) {
- JsonArray array = json.getAsJsonArray("location");
+ JsonArray array = getJArray(json, "location");
for (int i = 0; i < array.size(); i++) {
res.getLocation().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -15711,49 +15869,49 @@ public class JsonParser extends JsonParserBase {
if (json.has("photo"))
res.setPhoto(parseAttachment(getJObject(json, "photo")));
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
};
if (json.has("coverageArea")) {
- JsonArray array = json.getAsJsonArray("coverageArea");
+ JsonArray array = getJArray(json, "coverageArea");
for (int i = 0; i < array.size(); i++) {
res.getCoverageArea().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("serviceProvisionCode")) {
- JsonArray array = json.getAsJsonArray("serviceProvisionCode");
+ JsonArray array = getJArray(json, "serviceProvisionCode");
for (int i = 0; i < array.size(); i++) {
res.getServiceProvisionCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("eligibility")) {
- JsonArray array = json.getAsJsonArray("eligibility");
+ JsonArray array = getJArray(json, "eligibility");
for (int i = 0; i < array.size(); i++) {
res.getEligibility().add(parseHealthcareServiceEligibilityComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("program")) {
- JsonArray array = json.getAsJsonArray("program");
+ JsonArray array = getJArray(json, "program");
for (int i = 0; i < array.size(); i++) {
res.getProgram().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("characteristic")) {
- JsonArray array = json.getAsJsonArray("characteristic");
+ JsonArray array = getJArray(json, "characteristic");
for (int i = 0; i < array.size(); i++) {
res.getCharacteristic().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("communication")) {
- JsonArray array = json.getAsJsonArray("communication");
+ JsonArray array = getJArray(json, "communication");
for (int i = 0; i < array.size(); i++) {
res.getCommunication().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("referralMethod")) {
- JsonArray array = json.getAsJsonArray("referralMethod");
+ JsonArray array = getJArray(json, "referralMethod");
for (int i = 0; i < array.size(); i++) {
res.getReferralMethod().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -15763,13 +15921,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_appointmentRequired"))
parseElementProperties(getJObject(json, "_appointmentRequired"), res.getAppointmentRequiredElement());
if (json.has("availableTime")) {
- JsonArray array = json.getAsJsonArray("availableTime");
+ JsonArray array = getJArray(json, "availableTime");
for (int i = 0; i < array.size(); i++) {
res.getAvailableTime().add(parseHealthcareServiceAvailableTimeComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("notAvailable")) {
- JsonArray array = json.getAsJsonArray("notAvailable");
+ JsonArray array = getJArray(json, "notAvailable");
for (int i = 0; i < array.size(); i++) {
res.getNotAvailable().add(parseHealthcareServiceNotAvailableComponent(array.get(i).getAsJsonObject()));
}
@@ -15779,7 +15937,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_availabilityExceptions"))
parseElementProperties(getJObject(json, "_availabilityExceptions"), res.getAvailabilityExceptionsElement());
if (json.has("endpoint")) {
- JsonArray array = json.getAsJsonArray("endpoint");
+ JsonArray array = getJArray(json, "endpoint");
for (int i = 0; i < array.size(); i++) {
res.getEndpoint().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -15811,7 +15969,7 @@ public class JsonParser extends JsonParserBase {
protected void parseHealthcareServiceAvailableTimeComponentProperties(JsonObject json, HealthcareService.HealthcareServiceAvailableTimeComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("daysOfWeek")) {
- JsonArray array = json.getAsJsonArray("daysOfWeek");
+ JsonArray array = getJArray(json, "daysOfWeek");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDaysOfWeek().add(new Enumeration(new Enumerations.DaysOfWeekEnumFactory(), Enumerations.DaysOfWeek.NULL));
@@ -15821,7 +15979,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_daysOfWeek")) {
- JsonArray array = json.getAsJsonArray("_daysOfWeek");
+ JsonArray array = getJArray(json, "_daysOfWeek");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDaysOfWeek().size())
res.getDaysOfWeek().add(parseEnumeration(null, Enumerations.DaysOfWeek.NULL, new Enumerations.DaysOfWeekEnumFactory()));
@@ -15868,7 +16026,7 @@ public class JsonParser extends JsonParserBase {
protected void parseImagingStudyProperties(JsonObject json, ImagingStudy res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -15878,7 +16036,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("modality")) {
- JsonArray array = json.getAsJsonArray("modality");
+ JsonArray array = getJArray(json, "modality");
for (int i = 0; i < array.size(); i++) {
res.getModality().add(parseCoding(array.get(i).getAsJsonObject()));
}
@@ -15892,7 +16050,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_started"))
parseElementProperties(getJObject(json, "_started"), res.getStartedElement());
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -15900,13 +16058,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("referrer"))
res.setReferrer(parseReference(getJObject(json, "referrer")));
if (json.has("interpreter")) {
- JsonArray array = json.getAsJsonArray("interpreter");
+ JsonArray array = getJArray(json, "interpreter");
for (int i = 0; i < array.size(); i++) {
res.getInterpreter().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("endpoint")) {
- JsonArray array = json.getAsJsonArray("endpoint");
+ JsonArray array = getJArray(json, "endpoint");
for (int i = 0; i < array.size(); i++) {
res.getEndpoint().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -15920,7 +16078,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_numberOfInstances"))
parseElementProperties(getJObject(json, "_numberOfInstances"), res.getNumberOfInstancesElement());
if (json.has("procedure")) {
- JsonArray array = json.getAsJsonArray("procedure");
+ JsonArray array = getJArray(json, "procedure");
for (int i = 0; i < array.size(); i++) {
res.getProcedure().add(parseImagingStudyProcedureComponent(array.get(i).getAsJsonObject()));
}
@@ -15928,13 +16086,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("location"))
res.setLocation(parseReference(getJObject(json, "location")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -15944,7 +16102,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("series")) {
- JsonArray array = json.getAsJsonArray("series");
+ JsonArray array = getJArray(json, "series");
for (int i = 0; i < array.size(); i++) {
res.getSeries().add(parseImagingStudySeriesComponent(array.get(i).getAsJsonObject()));
}
@@ -15991,7 +16149,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_numberOfInstances"))
parseElementProperties(getJObject(json, "_numberOfInstances"), res.getNumberOfInstancesElement());
if (json.has("endpoint")) {
- JsonArray array = json.getAsJsonArray("endpoint");
+ JsonArray array = getJArray(json, "endpoint");
for (int i = 0; i < array.size(); i++) {
res.getEndpoint().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -16001,7 +16159,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("laterality"))
res.setLaterality(parseCoding(getJObject(json, "laterality")));
if (json.has("specimen")) {
- JsonArray array = json.getAsJsonArray("specimen");
+ JsonArray array = getJArray(json, "specimen");
for (int i = 0; i < array.size(); i++) {
res.getSpecimen().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -16011,13 +16169,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_started"))
parseElementProperties(getJObject(json, "_started"), res.getStartedElement());
if (json.has("performer")) {
- JsonArray array = json.getAsJsonArray("performer");
+ JsonArray array = getJArray(json, "performer");
for (int i = 0; i < array.size(); i++) {
res.getPerformer().add(parseImagingStudySeriesPerformerComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("instance")) {
- JsonArray array = json.getAsJsonArray("instance");
+ JsonArray array = getJArray(json, "instance");
for (int i = 0; i < array.size(); i++) {
res.getInstance().add(parseImagingStudySeriesInstanceComponent(array.get(i).getAsJsonObject()));
}
@@ -16071,13 +16229,13 @@ public class JsonParser extends JsonParserBase {
protected void parseImmunizationProperties(JsonObject json, Immunization res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -16087,7 +16245,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -16096,7 +16254,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -16106,7 +16264,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -16115,7 +16273,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -16165,19 +16323,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("doseQuantity"))
res.setDoseQuantity(parseQuantity(getJObject(json, "doseQuantity")));
if (json.has("performer")) {
- JsonArray array = json.getAsJsonArray("performer");
+ JsonArray array = getJArray(json, "performer");
for (int i = 0; i < array.size(); i++) {
res.getPerformer().add(parseImmunizationPerformerComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
@@ -16187,19 +16345,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_isSubpotent"))
parseElementProperties(getJObject(json, "_isSubpotent"), res.getIsSubpotentElement());
if (json.has("subpotentReason")) {
- JsonArray array = json.getAsJsonArray("subpotentReason");
+ JsonArray array = getJArray(json, "subpotentReason");
for (int i = 0; i < array.size(); i++) {
res.getSubpotentReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("education")) {
- JsonArray array = json.getAsJsonArray("education");
+ JsonArray array = getJArray(json, "education");
for (int i = 0; i < array.size(); i++) {
res.getEducation().add(parseImmunizationEducationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("programEligibility")) {
- JsonArray array = json.getAsJsonArray("programEligibility");
+ JsonArray array = getJArray(json, "programEligibility");
for (int i = 0; i < array.size(); i++) {
res.getProgramEligibility().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -16207,13 +16365,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("fundingSource"))
res.setFundingSource(parseCodeableConcept(getJObject(json, "fundingSource")));
if (json.has("reaction")) {
- JsonArray array = json.getAsJsonArray("reaction");
+ JsonArray array = getJArray(json, "reaction");
for (int i = 0; i < array.size(); i++) {
res.getReaction().add(parseImmunizationReactionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("protocolApplied")) {
- JsonArray array = json.getAsJsonArray("protocolApplied");
+ JsonArray array = getJArray(json, "protocolApplied");
for (int i = 0; i < array.size(); i++) {
res.getProtocolApplied().add(parseImmunizationProtocolAppliedComponent(array.get(i).getAsJsonObject()));
}
@@ -16295,7 +16453,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("authority"))
res.setAuthority(parseReference(getJObject(json, "authority")));
if (json.has("targetDisease")) {
- JsonArray array = json.getAsJsonArray("targetDisease");
+ JsonArray array = getJArray(json, "targetDisease");
for (int i = 0; i < array.size(); i++) {
res.getTargetDisease().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -16319,7 +16477,7 @@ public class JsonParser extends JsonParserBase {
protected void parseImmunizationEvaluationProperties(JsonObject json, ImmunizationEvaluation res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -16343,7 +16501,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("doseStatus"))
res.setDoseStatus(parseCodeableConcept(getJObject(json, "doseStatus")));
if (json.has("doseStatusReason")) {
- JsonArray array = json.getAsJsonArray("doseStatusReason");
+ JsonArray array = getJArray(json, "doseStatusReason");
for (int i = 0; i < array.size(); i++) {
res.getDoseStatusReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -16375,13 +16533,13 @@ public class JsonParser extends JsonParserBase {
protected void parseImmunizationRecommendationProperties(JsonObject json, ImmunizationRecommendation res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -16391,7 +16549,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -16400,7 +16558,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -16410,7 +16568,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -16427,7 +16585,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("authority"))
res.setAuthority(parseReference(getJObject(json, "authority")));
if (json.has("recommendation")) {
- JsonArray array = json.getAsJsonArray("recommendation");
+ JsonArray array = getJArray(json, "recommendation");
for (int i = 0; i < array.size(); i++) {
res.getRecommendation().add(parseImmunizationRecommendationRecommendationComponent(array.get(i).getAsJsonObject()));
}
@@ -16443,19 +16601,19 @@ public class JsonParser extends JsonParserBase {
protected void parseImmunizationRecommendationRecommendationComponentProperties(JsonObject json, ImmunizationRecommendation.ImmunizationRecommendationRecommendationComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("vaccineCode")) {
- JsonArray array = json.getAsJsonArray("vaccineCode");
+ JsonArray array = getJArray(json, "vaccineCode");
for (int i = 0; i < array.size(); i++) {
res.getVaccineCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("targetDisease")) {
- JsonArray array = json.getAsJsonArray("targetDisease");
+ JsonArray array = getJArray(json, "targetDisease");
for (int i = 0; i < array.size(); i++) {
res.getTargetDisease().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("contraindicatedVaccineCode")) {
- JsonArray array = json.getAsJsonArray("contraindicatedVaccineCode");
+ JsonArray array = getJArray(json, "contraindicatedVaccineCode");
for (int i = 0; i < array.size(); i++) {
res.getContraindicatedVaccineCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -16463,13 +16621,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("forecastStatus"))
res.setForecastStatus(parseCodeableConcept(getJObject(json, "forecastStatus")));
if (json.has("forecastReason")) {
- JsonArray array = json.getAsJsonArray("forecastReason");
+ JsonArray array = getJArray(json, "forecastReason");
for (int i = 0; i < array.size(); i++) {
res.getForecastReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("dateCriterion")) {
- JsonArray array = json.getAsJsonArray("dateCriterion");
+ JsonArray array = getJArray(json, "dateCriterion");
for (int i = 0; i < array.size(); i++) {
res.getDateCriterion().add(parseImmunizationRecommendationRecommendationDateCriterionComponent(array.get(i).getAsJsonObject()));
}
@@ -16491,13 +16649,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_seriesDoses"))
parseElementProperties(getJObject(json, "_seriesDoses"), res.getSeriesDosesElement());
if (json.has("supportingImmunization")) {
- JsonArray array = json.getAsJsonArray("supportingImmunization");
+ JsonArray array = getJArray(json, "supportingImmunization");
for (int i = 0; i < array.size(); i++) {
res.getSupportingImmunization().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("supportingPatientInformation")) {
- JsonArray array = json.getAsJsonArray("supportingPatientInformation");
+ JsonArray array = getJArray(json, "supportingPatientInformation");
for (int i = 0; i < array.size(); i++) {
res.getSupportingPatientInformation().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -16561,7 +16719,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -16571,13 +16729,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -16595,7 +16753,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_license"))
parseElementProperties(getJObject(json, "_license"), res.getLicenseElement());
if (json.has("fhirVersion")) {
- JsonArray array = json.getAsJsonArray("fhirVersion");
+ JsonArray array = getJArray(json, "fhirVersion");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getFhirVersion().add(new Enumeration(new Enumerations.FHIRVersionEnumFactory(), Enumerations.FHIRVersion.NULL));
@@ -16605,7 +16763,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_fhirVersion")) {
- JsonArray array = json.getAsJsonArray("_fhirVersion");
+ JsonArray array = getJArray(json, "_fhirVersion");
for (int i = 0; i < array.size(); i++) {
if (i == res.getFhirVersion().size())
res.getFhirVersion().add(parseEnumeration(null, Enumerations.FHIRVersion.NULL, new Enumerations.FHIRVersionEnumFactory()));
@@ -16614,13 +16772,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("dependsOn")) {
- JsonArray array = json.getAsJsonArray("dependsOn");
+ JsonArray array = getJArray(json, "dependsOn");
for (int i = 0; i < array.size(); i++) {
res.getDependsOn().add(parseImplementationGuideDependsOnComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("global")) {
- JsonArray array = json.getAsJsonArray("global");
+ JsonArray array = getJArray(json, "global");
for (int i = 0; i < array.size(); i++) {
res.getGlobal().add(parseImplementationGuideGlobalComponent(array.get(i).getAsJsonObject()));
}
@@ -16680,13 +16838,13 @@ public class JsonParser extends JsonParserBase {
protected void parseImplementationGuideDefinitionComponentProperties(JsonObject json, ImplementationGuide.ImplementationGuideDefinitionComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("grouping")) {
- JsonArray array = json.getAsJsonArray("grouping");
+ JsonArray array = getJArray(json, "grouping");
for (int i = 0; i < array.size(); i++) {
res.getGrouping().add(parseImplementationGuideDefinitionGroupingComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("resource")) {
- JsonArray array = json.getAsJsonArray("resource");
+ JsonArray array = getJArray(json, "resource");
for (int i = 0; i < array.size(); i++) {
res.getResource().add(parseImplementationGuideDefinitionResourceComponent(array.get(i).getAsJsonObject()));
}
@@ -16694,13 +16852,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("page"))
res.setPage(parseImplementationGuideDefinitionPageComponent(getJObject(json, "page")));
if (json.has("parameter")) {
- JsonArray array = json.getAsJsonArray("parameter");
+ JsonArray array = getJArray(json, "parameter");
for (int i = 0; i < array.size(); i++) {
res.getParameter().add(parseImplementationGuideDefinitionParameterComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("template")) {
- JsonArray array = json.getAsJsonArray("template");
+ JsonArray array = getJArray(json, "template");
for (int i = 0; i < array.size(); i++) {
res.getTemplate().add(parseImplementationGuideDefinitionTemplateComponent(array.get(i).getAsJsonObject()));
}
@@ -16736,7 +16894,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("reference"))
res.setReference(parseReference(getJObject(json, "reference")));
if (json.has("fhirVersion")) {
- JsonArray array = json.getAsJsonArray("fhirVersion");
+ JsonArray array = getJArray(json, "fhirVersion");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getFhirVersion().add(new Enumeration(new Enumerations.FHIRVersionEnumFactory(), Enumerations.FHIRVersion.NULL));
@@ -16746,7 +16904,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_fhirVersion")) {
- JsonArray array = json.getAsJsonArray("_fhirVersion");
+ JsonArray array = getJArray(json, "_fhirVersion");
for (int i = 0; i < array.size(); i++) {
if (i == res.getFhirVersion().size())
res.getFhirVersion().add(parseEnumeration(null, Enumerations.FHIRVersion.NULL, new Enumerations.FHIRVersionEnumFactory()));
@@ -16791,7 +16949,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_generation"))
parseElementProperties(getJObject(json, "_generation"), res.getGenerationElement());
if (json.has("page")) {
- JsonArray array = json.getAsJsonArray("page");
+ JsonArray array = getJArray(json, "page");
for (int i = 0; i < array.size(); i++) {
res.getPage().add(parseImplementationGuideDefinitionPageComponent(array.get(i).getAsJsonObject()));
}
@@ -16851,19 +17009,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_rendering"))
parseElementProperties(getJObject(json, "_rendering"), res.getRenderingElement());
if (json.has("resource")) {
- JsonArray array = json.getAsJsonArray("resource");
+ JsonArray array = getJArray(json, "resource");
for (int i = 0; i < array.size(); i++) {
res.getResource().add(parseImplementationGuideManifestResourceComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("page")) {
- JsonArray array = json.getAsJsonArray("page");
+ JsonArray array = getJArray(json, "page");
for (int i = 0; i < array.size(); i++) {
res.getPage().add(parseImplementationGuideManifestPageComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("image")) {
- JsonArray array = json.getAsJsonArray("image");
+ JsonArray array = getJArray(json, "image");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getImage().add(new StringType());
@@ -16873,7 +17031,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_image")) {
- JsonArray array = json.getAsJsonArray("_image");
+ JsonArray array = getJArray(json, "_image");
for (int i = 0; i < array.size(); i++) {
if (i == res.getImage().size())
res.getImage().add(parseString(null));
@@ -16882,7 +17040,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("other")) {
- JsonArray array = json.getAsJsonArray("other");
+ JsonArray array = getJArray(json, "other");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getOther().add(new StringType());
@@ -16892,7 +17050,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_other")) {
- JsonArray array = json.getAsJsonArray("_other");
+ JsonArray array = getJArray(json, "_other");
for (int i = 0; i < array.size(); i++) {
if (i == res.getOther().size())
res.getOther().add(parseString(null));
@@ -16938,7 +17096,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_title"))
parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
if (json.has("anchor")) {
- JsonArray array = json.getAsJsonArray("anchor");
+ JsonArray array = getJArray(json, "anchor");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getAnchor().add(new StringType());
@@ -16948,7 +17106,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_anchor")) {
- JsonArray array = json.getAsJsonArray("_anchor");
+ JsonArray array = getJArray(json, "_anchor");
for (int i = 0; i < array.size(); i++) {
if (i == res.getAnchor().size())
res.getAnchor().add(parseString(null));
@@ -16971,11 +17129,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("role"))
res.setRole(parseCodeableConcept(getJObject(json, "role")));
if (json.has("function")) {
- JsonArray array = json.getAsJsonArray("function");
+ JsonArray array = getJArray(json, "function");
for (int i = 0; i < array.size(); i++) {
res.getFunction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("group"))
+ res.setGroup(parseCodeableConcept(getJObject(json, "group")));
if (json.has("description"))
res.setDescriptionElement(parseMarkdown(json.get("description").getAsString()));
if (json.has("_description"))
@@ -16985,7 +17145,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_allergenicIndicator"))
parseElementProperties(getJObject(json, "_allergenicIndicator"), res.getAllergenicIndicatorElement());
if (json.has("manufacturer")) {
- JsonArray array = json.getAsJsonArray("manufacturer");
+ JsonArray array = getJArray(json, "manufacturer");
for (int i = 0; i < array.size(); i++) {
res.getManufacturer().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -16993,7 +17153,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("substance"))
res.setSubstance(parseIngredientSubstanceComponent(getJObject(json, "substance")));
if (json.has("specifiedSubstance")) {
- JsonArray array = json.getAsJsonArray("specifiedSubstance");
+ JsonArray array = getJArray(json, "specifiedSubstance");
for (int i = 0; i < array.size(); i++) {
res.getSpecifiedSubstance().add(parseIngredientSpecifiedSubstanceComponent(array.get(i).getAsJsonObject()));
}
@@ -17008,11 +17168,10 @@ public class JsonParser extends JsonParserBase {
protected void parseIngredientSubstanceComponentProperties(JsonObject json, Ingredient.IngredientSubstanceComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- DataType code = parseType("code", json);
- if (code != null)
- res.setCode(code);
+ if (json.has("code"))
+ res.setCode(parseCodeableReference(getJObject(json, "code")));
if (json.has("strength")) {
- JsonArray array = json.getAsJsonArray("strength");
+ JsonArray array = getJArray(json, "strength");
for (int i = 0; i < array.size(); i++) {
res.getStrength().add(parseIngredientSubstanceStrengthComponent(array.get(i).getAsJsonObject()));
}
@@ -17027,34 +17186,40 @@ public class JsonParser extends JsonParserBase {
protected void parseIngredientSubstanceStrengthComponentProperties(JsonObject json, Ingredient.IngredientSubstanceStrengthComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- if (json.has("presentation"))
- res.setPresentation(parseRatio(getJObject(json, "presentation")));
- if (json.has("presentationHighLimit"))
- res.setPresentationHighLimit(parseRatio(getJObject(json, "presentationHighLimit")));
+ DataType presentation = parseType("presentation", json);
+ if (presentation != null)
+ res.setPresentation(presentation);
+ DataType presentationHighLimit = parseType("presentationHighLimit", json);
+ if (presentationHighLimit != null)
+ res.setPresentationHighLimit(presentationHighLimit);
if (json.has("presentationText"))
res.setPresentationTextElement(parseString(json.get("presentationText").getAsString()));
if (json.has("_presentationText"))
parseElementProperties(getJObject(json, "_presentationText"), res.getPresentationTextElement());
- if (json.has("concentration"))
- res.setConcentration(parseRatio(getJObject(json, "concentration")));
- if (json.has("concentrationHighLimit"))
- res.setConcentrationHighLimit(parseRatio(getJObject(json, "concentrationHighLimit")));
+ DataType concentration = parseType("concentration", json);
+ if (concentration != null)
+ res.setConcentration(concentration);
+ DataType concentrationHighLimit = parseType("concentrationHighLimit", json);
+ if (concentrationHighLimit != null)
+ res.setConcentrationHighLimit(concentrationHighLimit);
if (json.has("concentrationText"))
res.setConcentrationTextElement(parseString(json.get("concentrationText").getAsString()));
if (json.has("_concentrationText"))
parseElementProperties(getJObject(json, "_concentrationText"), res.getConcentrationTextElement());
+ if (json.has("basis"))
+ res.setBasis(parseCodeableConcept(getJObject(json, "basis")));
if (json.has("measurementPoint"))
res.setMeasurementPointElement(parseString(json.get("measurementPoint").getAsString()));
if (json.has("_measurementPoint"))
parseElementProperties(getJObject(json, "_measurementPoint"), res.getMeasurementPointElement());
if (json.has("country")) {
- JsonArray array = json.getAsJsonArray("country");
+ JsonArray array = getJArray(json, "country");
for (int i = 0; i < array.size(); i++) {
res.getCountry().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("referenceStrength")) {
- JsonArray array = json.getAsJsonArray("referenceStrength");
+ JsonArray array = getJArray(json, "referenceStrength");
for (int i = 0; i < array.size(); i++) {
res.getReferenceStrength().add(parseIngredientSubstanceStrengthReferenceStrengthComponent(array.get(i).getAsJsonObject()));
}
@@ -17069,19 +17234,20 @@ public class JsonParser extends JsonParserBase {
protected void parseIngredientSubstanceStrengthReferenceStrengthComponentProperties(JsonObject json, Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- DataType substance = parseType("substance", json);
- if (substance != null)
- res.setSubstance(substance);
- if (json.has("strength"))
- res.setStrength(parseRatio(getJObject(json, "strength")));
- if (json.has("strengthHighLimit"))
- res.setStrengthHighLimit(parseRatio(getJObject(json, "strengthHighLimit")));
+ if (json.has("substance"))
+ res.setSubstance(parseCodeableReference(getJObject(json, "substance")));
+ DataType strength = parseType("strength", json);
+ if (strength != null)
+ res.setStrength(strength);
+ DataType strengthHighLimit = parseType("strengthHighLimit", json);
+ if (strengthHighLimit != null)
+ res.setStrengthHighLimit(strengthHighLimit);
if (json.has("measurementPoint"))
res.setMeasurementPointElement(parseString(json.get("measurementPoint").getAsString()));
if (json.has("_measurementPoint"))
parseElementProperties(getJObject(json, "_measurementPoint"), res.getMeasurementPointElement());
if (json.has("country")) {
- JsonArray array = json.getAsJsonArray("country");
+ JsonArray array = getJArray(json, "country");
for (int i = 0; i < array.size(); i++) {
res.getCountry().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -17096,15 +17262,14 @@ public class JsonParser extends JsonParserBase {
protected void parseIngredientSpecifiedSubstanceComponentProperties(JsonObject json, Ingredient.IngredientSpecifiedSubstanceComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- DataType code = parseType("code", json);
- if (code != null)
- res.setCode(code);
+ if (json.has("code"))
+ res.setCode(parseCodeableReference(getJObject(json, "code")));
if (json.has("group"))
res.setGroup(parseCodeableConcept(getJObject(json, "group")));
if (json.has("confidentiality"))
res.setConfidentiality(parseCodeableConcept(getJObject(json, "confidentiality")));
if (json.has("strength")) {
- JsonArray array = json.getAsJsonArray("strength");
+ JsonArray array = getJArray(json, "strength");
for (int i = 0; i < array.size(); i++) {
res.getStrength().add(parseIngredientSubstanceStrengthComponent(array.get(i).getAsJsonObject()));
}
@@ -17120,7 +17285,7 @@ public class JsonParser extends JsonParserBase {
protected void parseInsurancePlanProperties(JsonObject json, InsurancePlan res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -17130,7 +17295,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -17140,7 +17305,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_name"))
parseElementProperties(getJObject(json, "_name"), res.getNameElement());
if (json.has("alias")) {
- JsonArray array = json.getAsJsonArray("alias");
+ JsonArray array = getJArray(json, "alias");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getAlias().add(new StringType());
@@ -17150,7 +17315,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_alias")) {
- JsonArray array = json.getAsJsonArray("_alias");
+ JsonArray array = getJArray(json, "_alias");
for (int i = 0; i < array.size(); i++) {
if (i == res.getAlias().size())
res.getAlias().add(parseString(null));
@@ -17165,37 +17330,37 @@ public class JsonParser extends JsonParserBase {
if (json.has("administeredBy"))
res.setAdministeredBy(parseReference(getJObject(json, "administeredBy")));
if (json.has("coverageArea")) {
- JsonArray array = json.getAsJsonArray("coverageArea");
+ JsonArray array = getJArray(json, "coverageArea");
for (int i = 0; i < array.size(); i++) {
res.getCoverageArea().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseInsurancePlanContactComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("endpoint")) {
- JsonArray array = json.getAsJsonArray("endpoint");
+ JsonArray array = getJArray(json, "endpoint");
for (int i = 0; i < array.size(); i++) {
res.getEndpoint().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("network")) {
- JsonArray array = json.getAsJsonArray("network");
+ JsonArray array = getJArray(json, "network");
for (int i = 0; i < array.size(); i++) {
res.getNetwork().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("coverage")) {
- JsonArray array = json.getAsJsonArray("coverage");
+ JsonArray array = getJArray(json, "coverage");
for (int i = 0; i < array.size(); i++) {
res.getCoverage().add(parseInsurancePlanCoverageComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("plan")) {
- JsonArray array = json.getAsJsonArray("plan");
+ JsonArray array = getJArray(json, "plan");
for (int i = 0; i < array.size(); i++) {
res.getPlan().add(parseInsurancePlanPlanComponent(array.get(i).getAsJsonObject()));
}
@@ -17215,7 +17380,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("name"))
res.setName(parseHumanName(getJObject(json, "name")));
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
@@ -17235,13 +17400,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("network")) {
- JsonArray array = json.getAsJsonArray("network");
+ JsonArray array = getJArray(json, "network");
for (int i = 0; i < array.size(); i++) {
res.getNetwork().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("benefit")) {
- JsonArray array = json.getAsJsonArray("benefit");
+ JsonArray array = getJArray(json, "benefit");
for (int i = 0; i < array.size(); i++) {
res.getBenefit().add(parseInsurancePlanCoverageBenefitComponent(array.get(i).getAsJsonObject()));
}
@@ -17263,7 +17428,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_requirement"))
parseElementProperties(getJObject(json, "_requirement"), res.getRequirementElement());
if (json.has("limit")) {
- JsonArray array = json.getAsJsonArray("limit");
+ JsonArray array = getJArray(json, "limit");
for (int i = 0; i < array.size(); i++) {
res.getLimit().add(parseInsurancePlanCoverageBenefitLimitComponent(array.get(i).getAsJsonObject()));
}
@@ -17293,7 +17458,7 @@ public class JsonParser extends JsonParserBase {
protected void parseInsurancePlanPlanComponentProperties(JsonObject json, InsurancePlan.InsurancePlanPlanComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -17301,25 +17466,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("coverageArea")) {
- JsonArray array = json.getAsJsonArray("coverageArea");
+ JsonArray array = getJArray(json, "coverageArea");
for (int i = 0; i < array.size(); i++) {
res.getCoverageArea().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("network")) {
- JsonArray array = json.getAsJsonArray("network");
+ JsonArray array = getJArray(json, "network");
for (int i = 0; i < array.size(); i++) {
res.getNetwork().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("generalCost")) {
- JsonArray array = json.getAsJsonArray("generalCost");
+ JsonArray array = getJArray(json, "generalCost");
for (int i = 0; i < array.size(); i++) {
res.getGeneralCost().add(parseInsurancePlanPlanGeneralCostComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("specificCost")) {
- JsonArray array = json.getAsJsonArray("specificCost");
+ JsonArray array = getJArray(json, "specificCost");
for (int i = 0; i < array.size(); i++) {
res.getSpecificCost().add(parseInsurancePlanPlanSpecificCostComponent(array.get(i).getAsJsonObject()));
}
@@ -17359,7 +17524,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("category"))
res.setCategory(parseCodeableConcept(getJObject(json, "category")));
if (json.has("benefit")) {
- JsonArray array = json.getAsJsonArray("benefit");
+ JsonArray array = getJArray(json, "benefit");
for (int i = 0; i < array.size(); i++) {
res.getBenefit().add(parseInsurancePlanPlanBenefitComponent(array.get(i).getAsJsonObject()));
}
@@ -17377,7 +17542,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("cost")) {
- JsonArray array = json.getAsJsonArray("cost");
+ JsonArray array = getJArray(json, "cost");
for (int i = 0; i < array.size(); i++) {
res.getCost().add(parseInsurancePlanPlanBenefitCostComponent(array.get(i).getAsJsonObject()));
}
@@ -17397,7 +17562,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("applicability"))
res.setApplicability(parseCodeableConcept(getJObject(json, "applicability")));
if (json.has("qualifiers")) {
- JsonArray array = json.getAsJsonArray("qualifiers");
+ JsonArray array = getJArray(json, "qualifiers");
for (int i = 0; i < array.size(); i++) {
res.getQualifiers().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -17406,6 +17571,106 @@ public class JsonParser extends JsonParserBase {
res.setValue(parseQuantity(getJObject(json, "value")));
}
+ protected InventoryReport parseInventoryReport(JsonObject json) throws IOException, FHIRFormatError {
+ InventoryReport res = new InventoryReport();
+ parseInventoryReportProperties(json, res);
+ return res;
+ }
+
+ protected void parseInventoryReportProperties(JsonObject json, InventoryReport res) throws IOException, FHIRFormatError {
+ parseDomainResourceProperties(json, res);
+ if (json.has("identifier")) {
+ JsonArray array = getJArray(json, "identifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("status"))
+ res.setStatusElement(parseEnumeration(json.get("status").getAsString(), InventoryReport.InventoryReportStatus.NULL, new InventoryReport.InventoryReportStatusEnumFactory()));
+ if (json.has("_status"))
+ parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
+ if (json.has("countType"))
+ res.setCountTypeElement(parseEnumeration(json.get("countType").getAsString(), InventoryReport.InventoryCountType.NULL, new InventoryReport.InventoryCountTypeEnumFactory()));
+ if (json.has("_countType"))
+ parseElementProperties(getJObject(json, "_countType"), res.getCountTypeElement());
+ if (json.has("operationType"))
+ res.setOperationType(parseCodeableConcept(getJObject(json, "operationType")));
+ if (json.has("operationTypeReason"))
+ res.setOperationTypeReason(parseCodeableConcept(getJObject(json, "operationTypeReason")));
+ if (json.has("reportedDateTime"))
+ res.setReportedDateTimeElement(parseDateTime(json.get("reportedDateTime").getAsString()));
+ if (json.has("_reportedDateTime"))
+ parseElementProperties(getJObject(json, "_reportedDateTime"), res.getReportedDateTimeElement());
+ if (json.has("reporter"))
+ res.setReporter(parseReference(getJObject(json, "reporter")));
+ if (json.has("reportingPeriod"))
+ res.setReportingPeriod(parsePeriod(getJObject(json, "reportingPeriod")));
+ if (json.has("inventoryListing")) {
+ JsonArray array = getJArray(json, "inventoryListing");
+ for (int i = 0; i < array.size(); i++) {
+ res.getInventoryListing().add(parseInventoryReportInventoryListingComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("note"))
+ res.setNote(parseAnnotation(getJObject(json, "note")));
+ }
+
+ protected InventoryReport.InventoryReportInventoryListingComponent parseInventoryReportInventoryListingComponent(JsonObject json) throws IOException, FHIRFormatError {
+ InventoryReport.InventoryReportInventoryListingComponent res = new InventoryReport.InventoryReportInventoryListingComponent();
+ parseInventoryReportInventoryListingComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseInventoryReportInventoryListingComponentProperties(JsonObject json, InventoryReport.InventoryReportInventoryListingComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("location"))
+ res.setLocation(parseReference(getJObject(json, "location")));
+ if (json.has("itemStatus"))
+ res.setItemStatus(parseCodeableConcept(getJObject(json, "itemStatus")));
+ if (json.has("countingDateTime"))
+ res.setCountingDateTimeElement(parseDateTime(json.get("countingDateTime").getAsString()));
+ if (json.has("_countingDateTime"))
+ parseElementProperties(getJObject(json, "_countingDateTime"), res.getCountingDateTimeElement());
+ if (json.has("items")) {
+ JsonArray array = getJArray(json, "items");
+ for (int i = 0; i < array.size(); i++) {
+ res.getItems().add(parseInventoryReportInventoryListingItemsComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ }
+
+ protected InventoryReport.InventoryReportInventoryListingItemsComponent parseInventoryReportInventoryListingItemsComponent(JsonObject json) throws IOException, FHIRFormatError {
+ InventoryReport.InventoryReportInventoryListingItemsComponent res = new InventoryReport.InventoryReportInventoryListingItemsComponent();
+ parseInventoryReportInventoryListingItemsComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseInventoryReportInventoryListingItemsComponentProperties(JsonObject json, InventoryReport.InventoryReportInventoryListingItemsComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("category"))
+ res.setCategory(parseCodeableConcept(getJObject(json, "category")));
+ if (json.has("quantity"))
+ res.setQuantity(parseQuantity(getJObject(json, "quantity")));
+ if (json.has("item"))
+ res.setItem(parseCodeableReference(getJObject(json, "item")));
+ if (json.has("lot"))
+ res.setLotElement(parseString(json.get("lot").getAsString()));
+ if (json.has("_lot"))
+ parseElementProperties(getJObject(json, "_lot"), res.getLotElement());
+ if (json.has("serial"))
+ res.setSerialElement(parseString(json.get("serial").getAsString()));
+ if (json.has("_serial"))
+ parseElementProperties(getJObject(json, "_serial"), res.getSerialElement());
+ if (json.has("expiry"))
+ res.setExpiryElement(parseDateTime(json.get("expiry").getAsString()));
+ if (json.has("_expiry"))
+ parseElementProperties(getJObject(json, "_expiry"), res.getExpiryElement());
+ if (json.has("manufacturingDate"))
+ res.setManufacturingDateElement(parseDateTime(json.get("manufacturingDate").getAsString()));
+ if (json.has("_manufacturingDate"))
+ parseElementProperties(getJObject(json, "_manufacturingDate"), res.getManufacturingDateElement());
+ }
+
protected Invoice parseInvoice(JsonObject json) throws IOException, FHIRFormatError {
Invoice res = new Invoice();
parseInvoiceProperties(json, res);
@@ -17415,7 +17680,7 @@ public class JsonParser extends JsonParserBase {
protected void parseInvoiceProperties(JsonObject json, Invoice res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -17439,7 +17704,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_date"))
parseElementProperties(getJObject(json, "_date"), res.getDateElement());
if (json.has("participant")) {
- JsonArray array = json.getAsJsonArray("participant");
+ JsonArray array = getJArray(json, "participant");
for (int i = 0; i < array.size(); i++) {
res.getParticipant().add(parseInvoiceParticipantComponent(array.get(i).getAsJsonObject()));
}
@@ -17449,13 +17714,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("account"))
res.setAccount(parseReference(getJObject(json, "account")));
if (json.has("lineItem")) {
- JsonArray array = json.getAsJsonArray("lineItem");
+ JsonArray array = getJArray(json, "lineItem");
for (int i = 0; i < array.size(); i++) {
res.getLineItem().add(parseInvoiceLineItemComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("totalPriceComponent")) {
- JsonArray array = json.getAsJsonArray("totalPriceComponent");
+ JsonArray array = getJArray(json, "totalPriceComponent");
for (int i = 0; i < array.size(); i++) {
res.getTotalPriceComponent().add(parseInvoiceLineItemPriceComponentComponent(array.get(i).getAsJsonObject()));
}
@@ -17469,7 +17734,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_paymentTerms"))
parseElementProperties(getJObject(json, "_paymentTerms"), res.getPaymentTermsElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -17506,7 +17771,7 @@ public class JsonParser extends JsonParserBase {
if (chargeItem != null)
res.setChargeItem(chargeItem);
if (json.has("priceComponent")) {
- JsonArray array = json.getAsJsonArray("priceComponent");
+ JsonArray array = getJArray(json, "priceComponent");
for (int i = 0; i < array.size(); i++) {
res.getPriceComponent().add(parseInvoiceLineItemPriceComponentComponent(array.get(i).getAsJsonObject()));
}
@@ -17548,7 +17813,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -17591,7 +17856,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -17601,13 +17866,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -17635,55 +17900,55 @@ public class JsonParser extends JsonParserBase {
if (json.has("effectivePeriod"))
res.setEffectivePeriod(parsePeriod(getJObject(json, "effectivePeriod")));
if (json.has("topic")) {
- JsonArray array = json.getAsJsonArray("topic");
+ JsonArray array = getJArray(json, "topic");
for (int i = 0; i < array.size(); i++) {
res.getTopic().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("editor")) {
- JsonArray array = json.getAsJsonArray("editor");
+ JsonArray array = getJArray(json, "editor");
for (int i = 0; i < array.size(); i++) {
res.getEditor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("reviewer")) {
- JsonArray array = json.getAsJsonArray("reviewer");
+ JsonArray array = getJArray(json, "reviewer");
for (int i = 0; i < array.size(); i++) {
res.getReviewer().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("endorser")) {
- JsonArray array = json.getAsJsonArray("endorser");
+ JsonArray array = getJArray(json, "endorser");
for (int i = 0; i < array.size(); i++) {
res.getEndorser().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedArtifact")) {
- JsonArray array = json.getAsJsonArray("relatedArtifact");
+ JsonArray array = getJArray(json, "relatedArtifact");
for (int i = 0; i < array.size(); i++) {
res.getRelatedArtifact().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
}
};
if (json.has("parameter")) {
- JsonArray array = json.getAsJsonArray("parameter");
+ JsonArray array = getJArray(json, "parameter");
for (int i = 0; i < array.size(); i++) {
res.getParameter().add(parseParameterDefinition(array.get(i).getAsJsonObject()));
}
};
if (json.has("dataRequirement")) {
- JsonArray array = json.getAsJsonArray("dataRequirement");
+ JsonArray array = getJArray(json, "dataRequirement");
for (int i = 0; i < array.size(); i++) {
res.getDataRequirement().add(parseDataRequirement(array.get(i).getAsJsonObject()));
}
};
if (json.has("content")) {
- JsonArray array = json.getAsJsonArray("content");
+ JsonArray array = getJArray(json, "content");
for (int i = 0; i < array.size(); i++) {
res.getContent().add(parseAttachment(array.get(i).getAsJsonObject()));
}
@@ -17705,7 +17970,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("author"))
res.setAuthor(parseReference(getJObject(json, "author")));
if (json.has("item")) {
- JsonArray array = json.getAsJsonArray("item");
+ JsonArray array = getJArray(json, "item");
for (int i = 0; i < array.size(); i++) {
res.getItem().add(parseLinkageItemComponent(array.get(i).getAsJsonObject()));
}
@@ -17737,7 +18002,7 @@ public class JsonParser extends JsonParserBase {
protected void parseListResourceProperties(JsonObject json, ListResource res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -17769,13 +18034,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("orderedBy"))
res.setOrderedBy(parseCodeableConcept(getJObject(json, "orderedBy")));
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("entry")) {
- JsonArray array = json.getAsJsonArray("entry");
+ JsonArray array = getJArray(json, "entry");
for (int i = 0; i < array.size(); i++) {
res.getEntry().add(parseListResourceEntryComponent(array.get(i).getAsJsonObject()));
}
@@ -17815,7 +18080,7 @@ public class JsonParser extends JsonParserBase {
protected void parseLocationProperties(JsonObject json, Location res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -17831,7 +18096,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_name"))
parseElementProperties(getJObject(json, "_name"), res.getNameElement());
if (json.has("alias")) {
- JsonArray array = json.getAsJsonArray("alias");
+ JsonArray array = getJArray(json, "alias");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getAlias().add(new StringType());
@@ -17841,7 +18106,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_alias")) {
- JsonArray array = json.getAsJsonArray("_alias");
+ JsonArray array = getJArray(json, "_alias");
for (int i = 0; i < array.size(); i++) {
if (i == res.getAlias().size())
res.getAlias().add(parseString(null));
@@ -17858,13 +18123,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_mode"))
parseElementProperties(getJObject(json, "_mode"), res.getModeElement());
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
@@ -17880,7 +18145,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("partOf"))
res.setPartOf(parseReference(getJObject(json, "partOf")));
if (json.has("hoursOfOperation")) {
- JsonArray array = json.getAsJsonArray("hoursOfOperation");
+ JsonArray array = getJArray(json, "hoursOfOperation");
for (int i = 0; i < array.size(); i++) {
res.getHoursOfOperation().add(parseLocationHoursOfOperationComponent(array.get(i).getAsJsonObject()));
}
@@ -17890,7 +18155,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_availabilityExceptions"))
parseElementProperties(getJObject(json, "_availabilityExceptions"), res.getAvailabilityExceptionsElement());
if (json.has("endpoint")) {
- JsonArray array = json.getAsJsonArray("endpoint");
+ JsonArray array = getJArray(json, "endpoint");
for (int i = 0; i < array.size(); i++) {
res.getEndpoint().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -17928,7 +18193,7 @@ public class JsonParser extends JsonParserBase {
protected void parseLocationHoursOfOperationComponentProperties(JsonObject json, Location.LocationHoursOfOperationComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("daysOfWeek")) {
- JsonArray array = json.getAsJsonArray("daysOfWeek");
+ JsonArray array = getJArray(json, "daysOfWeek");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDaysOfWeek().add(new Enumeration(new Enumerations.DaysOfWeekEnumFactory(), Enumerations.DaysOfWeek.NULL));
@@ -17938,7 +18203,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_daysOfWeek")) {
- JsonArray array = json.getAsJsonArray("_daysOfWeek");
+ JsonArray array = getJArray(json, "_daysOfWeek");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDaysOfWeek().size())
res.getDaysOfWeek().add(parseEnumeration(null, Enumerations.DaysOfWeek.NULL, new Enumerations.DaysOfWeekEnumFactory()));
@@ -17969,7 +18234,7 @@ public class JsonParser extends JsonParserBase {
protected void parseManufacturedItemDefinitionProperties(JsonObject json, ManufacturedItemDefinition res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -17979,19 +18244,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("unitOfPresentation"))
res.setUnitOfPresentation(parseCodeableConcept(getJObject(json, "unitOfPresentation")));
if (json.has("manufacturer")) {
- JsonArray array = json.getAsJsonArray("manufacturer");
+ JsonArray array = getJArray(json, "manufacturer");
for (int i = 0; i < array.size(); i++) {
res.getManufacturer().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("ingredient")) {
- JsonArray array = json.getAsJsonArray("ingredient");
+ JsonArray array = getJArray(json, "ingredient");
for (int i = 0; i < array.size(); i++) {
- res.getIngredient().add(parseReference(array.get(i).getAsJsonObject()));
+ res.getIngredient().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("property")) {
- JsonArray array = json.getAsJsonArray("property");
+ JsonArray array = getJArray(json, "property");
for (int i = 0; i < array.size(); i++) {
res.getProperty().add(parseManufacturedItemDefinitionPropertyComponent(array.get(i).getAsJsonObject()));
}
@@ -18026,7 +18291,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -18058,6 +18323,10 @@ public class JsonParser extends JsonParserBase {
DataType subject = parseType("subject", json);
if (subject != null)
res.setSubject(subject);
+ if (json.has("basis"))
+ res.setBasisElement(parseEnumeration(json.get("basis").getAsString(), Enumerations.FHIRAllTypes.NULL, new Enumerations.FHIRAllTypesEnumFactory()));
+ if (json.has("_basis"))
+ parseElementProperties(getJObject(json, "_basis"), res.getBasisElement());
if (json.has("date"))
res.setDateElement(parseDateTime(json.get("date").getAsString()));
if (json.has("_date"))
@@ -18067,7 +18336,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -18077,13 +18346,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -18111,43 +18380,43 @@ public class JsonParser extends JsonParserBase {
if (json.has("effectivePeriod"))
res.setEffectivePeriod(parsePeriod(getJObject(json, "effectivePeriod")));
if (json.has("topic")) {
- JsonArray array = json.getAsJsonArray("topic");
+ JsonArray array = getJArray(json, "topic");
for (int i = 0; i < array.size(); i++) {
res.getTopic().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("editor")) {
- JsonArray array = json.getAsJsonArray("editor");
+ JsonArray array = getJArray(json, "editor");
for (int i = 0; i < array.size(); i++) {
res.getEditor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("reviewer")) {
- JsonArray array = json.getAsJsonArray("reviewer");
+ JsonArray array = getJArray(json, "reviewer");
for (int i = 0; i < array.size(); i++) {
res.getReviewer().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("endorser")) {
- JsonArray array = json.getAsJsonArray("endorser");
+ JsonArray array = getJArray(json, "endorser");
for (int i = 0; i < array.size(); i++) {
res.getEndorser().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedArtifact")) {
- JsonArray array = json.getAsJsonArray("relatedArtifact");
+ JsonArray array = getJArray(json, "relatedArtifact");
for (int i = 0; i < array.size(); i++) {
res.getRelatedArtifact().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
}
};
if (json.has("library")) {
- JsonArray array = json.getAsJsonArray("library");
+ JsonArray array = getJArray(json, "library");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getLibrary().add(new CanonicalType());
@@ -18157,7 +18426,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_library")) {
- JsonArray array = json.getAsJsonArray("_library");
+ JsonArray array = getJArray(json, "_library");
for (int i = 0; i < array.size(); i++) {
if (i == res.getLibrary().size())
res.getLibrary().add(parseCanonical(null));
@@ -18171,10 +18440,12 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_disclaimer"), res.getDisclaimerElement());
if (json.has("scoring"))
res.setScoring(parseCodeableConcept(getJObject(json, "scoring")));
+ if (json.has("scoringUnit"))
+ res.setScoringUnit(parseCodeableConcept(getJObject(json, "scoringUnit")));
if (json.has("compositeScoring"))
res.setCompositeScoring(parseCodeableConcept(getJObject(json, "compositeScoring")));
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -18198,7 +18469,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("improvementNotation"))
res.setImprovementNotation(parseCodeableConcept(getJObject(json, "improvementNotation")));
if (json.has("definition")) {
- JsonArray array = json.getAsJsonArray("definition");
+ JsonArray array = getJArray(json, "definition");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDefinition().add(new MarkdownType());
@@ -18208,7 +18479,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_definition")) {
- JsonArray array = json.getAsJsonArray("_definition");
+ JsonArray array = getJArray(json, "_definition");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDefinition().size())
res.getDefinition().add(parseMarkdown(null));
@@ -18221,13 +18492,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_guidance"))
parseElementProperties(getJObject(json, "_guidance"), res.getGuidanceElement());
if (json.has("group")) {
- JsonArray array = json.getAsJsonArray("group");
+ JsonArray array = getJArray(json, "group");
for (int i = 0; i < array.size(); i++) {
res.getGroup().add(parseMeasureGroupComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("supplementalData")) {
- JsonArray array = json.getAsJsonArray("supplementalData");
+ JsonArray array = getJArray(json, "supplementalData");
for (int i = 0; i < array.size(); i++) {
res.getSupplementalData().add(parseMeasureSupplementalDataComponent(array.get(i).getAsJsonObject()));
}
@@ -18248,14 +18519,30 @@ public class JsonParser extends JsonParserBase {
res.setDescriptionElement(parseString(json.get("description").getAsString()));
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
+ if (json.has("type")) {
+ JsonArray array = getJArray(json, "type");
+ for (int i = 0; i < array.size(); i++) {
+ res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("basis"))
+ res.setBasisElement(parseEnumeration(json.get("basis").getAsString(), Enumerations.FHIRAllTypes.NULL, new Enumerations.FHIRAllTypesEnumFactory()));
+ if (json.has("_basis"))
+ parseElementProperties(getJObject(json, "_basis"), res.getBasisElement());
+ if (json.has("scoring"))
+ res.setScoring(parseCodeableConcept(getJObject(json, "scoring")));
+ if (json.has("scoringUnit"))
+ res.setScoringUnit(parseCodeableConcept(getJObject(json, "scoringUnit")));
+ if (json.has("improvementNotation"))
+ res.setImprovementNotation(parseCodeableConcept(getJObject(json, "improvementNotation")));
if (json.has("population")) {
- JsonArray array = json.getAsJsonArray("population");
+ JsonArray array = getJArray(json, "population");
for (int i = 0; i < array.size(); i++) {
res.getPopulation().add(parseMeasureGroupPopulationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("stratifier")) {
- JsonArray array = json.getAsJsonArray("stratifier");
+ JsonArray array = getJArray(json, "stratifier");
for (int i = 0; i < array.size(); i++) {
res.getStratifier().add(parseMeasureGroupStratifierComponent(array.get(i).getAsJsonObject()));
}
@@ -18278,6 +18565,12 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("criteria"))
res.setCriteria(parseExpression(getJObject(json, "criteria")));
+ if (json.has("inputPopulationId"))
+ res.setInputPopulationIdElement(parseString(json.get("inputPopulationId").getAsString()));
+ if (json.has("_inputPopulationId"))
+ parseElementProperties(getJObject(json, "_inputPopulationId"), res.getInputPopulationIdElement());
+ if (json.has("aggregateMethod"))
+ res.setAggregateMethod(parseCodeableConcept(getJObject(json, "aggregateMethod")));
}
protected Measure.MeasureGroupStratifierComponent parseMeasureGroupStratifierComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -18297,7 +18590,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("criteria"))
res.setCriteria(parseExpression(getJObject(json, "criteria")));
if (json.has("component")) {
- JsonArray array = json.getAsJsonArray("component");
+ JsonArray array = getJArray(json, "component");
for (int i = 0; i < array.size(); i++) {
res.getComponent().add(parseMeasureGroupStratifierComponentComponent(array.get(i).getAsJsonObject()));
}
@@ -18333,7 +18626,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
if (json.has("usage")) {
- JsonArray array = json.getAsJsonArray("usage");
+ JsonArray array = getJArray(json, "usage");
for (int i = 0; i < array.size(); i++) {
res.getUsage().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -18355,7 +18648,7 @@ public class JsonParser extends JsonParserBase {
protected void parseMeasureReportProperties(JsonObject json, MeasureReport res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -18368,6 +18661,10 @@ public class JsonParser extends JsonParserBase {
res.setTypeElement(parseEnumeration(json.get("type").getAsString(), MeasureReport.MeasureReportType.NULL, new MeasureReport.MeasureReportTypeEnumFactory()));
if (json.has("_type"))
parseElementProperties(getJObject(json, "_type"), res.getTypeElement());
+ if (json.has("dataUpdateType"))
+ res.setDataUpdateTypeElement(parseEnumeration(json.get("dataUpdateType").getAsString(), MeasureReport.SubmitDataUpdateType.NULL, new MeasureReport.SubmitDataUpdateTypeEnumFactory()));
+ if (json.has("_dataUpdateType"))
+ parseElementProperties(getJObject(json, "_dataUpdateType"), res.getDataUpdateTypeElement());
if (json.has("measure"))
res.setMeasureElement(parseCanonical(json.get("measure").getAsString()));
if (json.has("_measure"))
@@ -18380,18 +18677,22 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_date"), res.getDateElement());
if (json.has("reporter"))
res.setReporter(parseReference(getJObject(json, "reporter")));
+ if (json.has("reportingVendor"))
+ res.setReportingVendor(parseReference(getJObject(json, "reportingVendor")));
if (json.has("period"))
res.setPeriod(parsePeriod(getJObject(json, "period")));
+ if (json.has("scoring"))
+ res.setScoring(parseCodeableConcept(getJObject(json, "scoring")));
if (json.has("improvementNotation"))
res.setImprovementNotation(parseCodeableConcept(getJObject(json, "improvementNotation")));
if (json.has("group")) {
- JsonArray array = json.getAsJsonArray("group");
+ JsonArray array = getJArray(json, "group");
for (int i = 0; i < array.size(); i++) {
res.getGroup().add(parseMeasureReportGroupComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("evaluatedResource")) {
- JsonArray array = json.getAsJsonArray("evaluatedResource");
+ JsonArray array = getJArray(json, "evaluatedResource");
for (int i = 0; i < array.size(); i++) {
res.getEvaluatedResource().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -18409,15 +18710,16 @@ public class JsonParser extends JsonParserBase {
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
if (json.has("population")) {
- JsonArray array = json.getAsJsonArray("population");
+ JsonArray array = getJArray(json, "population");
for (int i = 0; i < array.size(); i++) {
res.getPopulation().add(parseMeasureReportGroupPopulationComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("measureScore"))
- res.setMeasureScore(parseQuantity(getJObject(json, "measureScore")));
+ DataType measureScore = parseType("measureScore", json);
+ if (measureScore != null)
+ res.setMeasureScore(measureScore);
if (json.has("stratifier")) {
- JsonArray array = json.getAsJsonArray("stratifier");
+ JsonArray array = getJArray(json, "stratifier");
for (int i = 0; i < array.size(); i++) {
res.getStratifier().add(parseMeasureReportGroupStratifierComponent(array.get(i).getAsJsonObject()));
}
@@ -18451,13 +18753,13 @@ public class JsonParser extends JsonParserBase {
protected void parseMeasureReportGroupStratifierComponentProperties(JsonObject json, MeasureReport.MeasureReportGroupStratifierComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("stratum")) {
- JsonArray array = json.getAsJsonArray("stratum");
+ JsonArray array = getJArray(json, "stratum");
for (int i = 0; i < array.size(); i++) {
res.getStratum().add(parseMeasureReportStratifierGroupComponent(array.get(i).getAsJsonObject()));
}
@@ -18472,22 +18774,24 @@ public class JsonParser extends JsonParserBase {
protected void parseMeasureReportStratifierGroupComponentProperties(JsonObject json, MeasureReport.StratifierGroupComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- if (json.has("value"))
- res.setValue(parseCodeableConcept(getJObject(json, "value")));
+ DataType value = parseType("value", json);
+ if (value != null)
+ res.setValue(value);
if (json.has("component")) {
- JsonArray array = json.getAsJsonArray("component");
+ JsonArray array = getJArray(json, "component");
for (int i = 0; i < array.size(); i++) {
res.getComponent().add(parseMeasureReportStratifierGroupComponentComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("population")) {
- JsonArray array = json.getAsJsonArray("population");
+ JsonArray array = getJArray(json, "population");
for (int i = 0; i < array.size(); i++) {
res.getPopulation().add(parseMeasureReportStratifierGroupPopulationComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("measureScore"))
- res.setMeasureScore(parseQuantity(getJObject(json, "measureScore")));
+ DataType measureScore = parseType("measureScore", json);
+ if (measureScore != null)
+ res.setMeasureScore(measureScore);
}
protected MeasureReport.StratifierGroupComponentComponent parseMeasureReportStratifierGroupComponentComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -18500,8 +18804,9 @@ public class JsonParser extends JsonParserBase {
parseBackboneElementProperties(json, res);
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
- if (json.has("value"))
- res.setValue(parseCodeableConcept(getJObject(json, "value")));
+ DataType value = parseType("value", json);
+ if (value != null)
+ res.setValue(value);
}
protected MeasureReport.StratifierGroupPopulationComponent parseMeasureReportStratifierGroupPopulationComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -18531,7 +18836,7 @@ public class JsonParser extends JsonParserBase {
protected void parseMedicationProperties(JsonObject json, Medication res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -18542,14 +18847,14 @@ public class JsonParser extends JsonParserBase {
res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Medication.MedicationStatusCodes.NULL, new Medication.MedicationStatusCodesEnumFactory()));
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
- if (json.has("manufacturer"))
- res.setManufacturer(parseReference(getJObject(json, "manufacturer")));
+ if (json.has("sponsor"))
+ res.setSponsor(parseReference(getJObject(json, "sponsor")));
if (json.has("doseForm"))
res.setDoseForm(parseCodeableConcept(getJObject(json, "doseForm")));
if (json.has("amount"))
res.setAmount(parseRatio(getJObject(json, "amount")));
if (json.has("ingredient")) {
- JsonArray array = json.getAsJsonArray("ingredient");
+ JsonArray array = getJArray(json, "ingredient");
for (int i = 0; i < array.size(); i++) {
res.getIngredient().add(parseMedicationIngredientComponent(array.get(i).getAsJsonObject()));
}
@@ -18604,13 +18909,13 @@ public class JsonParser extends JsonParserBase {
protected void parseMedicationAdministrationProperties(JsonObject json, MedicationAdministration res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -18620,7 +18925,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -18629,7 +18934,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -18639,7 +18944,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -18648,13 +18953,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
res.getPartOf().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -18664,13 +18969,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("statusReason")) {
- JsonArray array = json.getAsJsonArray("statusReason");
+ JsonArray array = getJArray(json, "statusReason");
for (int i = 0; i < array.size(); i++) {
res.getStatusReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -18682,7 +18987,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("encounter"))
res.setEncounter(parseReference(getJObject(json, "encounter")));
if (json.has("supportingInformation")) {
- JsonArray array = json.getAsJsonArray("supportingInformation");
+ JsonArray array = getJArray(json, "supportingInformation");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInformation().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -18695,13 +19000,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_recorded"))
parseElementProperties(getJObject(json, "_recorded"), res.getRecordedElement());
if (json.has("performer")) {
- JsonArray array = json.getAsJsonArray("performer");
+ JsonArray array = getJArray(json, "performer");
for (int i = 0; i < array.size(); i++) {
res.getPerformer().add(parseMedicationAdministrationPerformerComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
@@ -18709,13 +19014,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("request"))
res.setRequest(parseReference(getJObject(json, "request")));
if (json.has("device")) {
- JsonArray array = json.getAsJsonArray("device");
+ JsonArray array = getJArray(json, "device");
for (int i = 0; i < array.size(); i++) {
res.getDevice().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -18723,7 +19028,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("dosage"))
res.setDosage(parseMedicationAdministrationDosageComponent(getJObject(json, "dosage")));
if (json.has("eventHistory")) {
- JsonArray array = json.getAsJsonArray("eventHistory");
+ JsonArray array = getJArray(json, "eventHistory");
for (int i = 0; i < array.size(); i++) {
res.getEventHistory().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -18778,19 +19083,19 @@ public class JsonParser extends JsonParserBase {
protected void parseMedicationDispenseProperties(JsonObject json, MedicationDispense res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
res.getPartOf().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -18802,7 +19107,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("statusReason"))
res.setStatusReason(parseCodeableReference(getJObject(json, "statusReason")));
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -18814,13 +19119,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("encounter"))
res.setEncounter(parseReference(getJObject(json, "encounter")));
if (json.has("supportingInformation")) {
- JsonArray array = json.getAsJsonArray("supportingInformation");
+ JsonArray array = getJArray(json, "supportingInformation");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInformation().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("performer")) {
- JsonArray array = json.getAsJsonArray("performer");
+ JsonArray array = getJArray(json, "performer");
for (int i = 0; i < array.size(); i++) {
res.getPerformer().add(parseMedicationDispensePerformerComponent(array.get(i).getAsJsonObject()));
}
@@ -18828,7 +19133,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("location"))
res.setLocation(parseReference(getJObject(json, "location")));
if (json.has("authorizingPrescription")) {
- JsonArray array = json.getAsJsonArray("authorizingPrescription");
+ JsonArray array = getJArray(json, "authorizingPrescription");
for (int i = 0; i < array.size(); i++) {
res.getAuthorizingPrescription().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -18850,13 +19155,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("destination"))
res.setDestination(parseReference(getJObject(json, "destination")));
if (json.has("receiver")) {
- JsonArray array = json.getAsJsonArray("receiver");
+ JsonArray array = getJArray(json, "receiver");
for (int i = 0; i < array.size(); i++) {
res.getReceiver().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -18866,7 +19171,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_renderedDosageInstruction"))
parseElementProperties(getJObject(json, "_renderedDosageInstruction"), res.getRenderedDosageInstructionElement());
if (json.has("dosageInstruction")) {
- JsonArray array = json.getAsJsonArray("dosageInstruction");
+ JsonArray array = getJArray(json, "dosageInstruction");
for (int i = 0; i < array.size(); i++) {
res.getDosageInstruction().add(parseDosage(array.get(i).getAsJsonObject()));
}
@@ -18874,13 +19179,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("substitution"))
res.setSubstitution(parseMedicationDispenseSubstitutionComponent(getJObject(json, "substitution")));
if (json.has("detectedIssue")) {
- JsonArray array = json.getAsJsonArray("detectedIssue");
+ JsonArray array = getJArray(json, "detectedIssue");
for (int i = 0; i < array.size(); i++) {
res.getDetectedIssue().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("eventHistory")) {
- JsonArray array = json.getAsJsonArray("eventHistory");
+ JsonArray array = getJArray(json, "eventHistory");
for (int i = 0; i < array.size(); i++) {
res.getEventHistory().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -18916,7 +19221,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -18934,7 +19239,7 @@ public class JsonParser extends JsonParserBase {
protected void parseMedicationKnowledgeProperties(JsonObject json, MedicationKnowledge res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -18947,14 +19252,14 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("author"))
res.setAuthor(parseReference(getJObject(json, "author")));
- if (json.has("manufacturer"))
- res.setManufacturer(parseReference(getJObject(json, "manufacturer")));
+ if (json.has("sponsor"))
+ res.setSponsor(parseReference(getJObject(json, "sponsor")));
if (json.has("doseForm"))
res.setDoseForm(parseCodeableConcept(getJObject(json, "doseForm")));
if (json.has("amount"))
res.setAmount(parseQuantity(getJObject(json, "amount")));
if (json.has("synonym")) {
- JsonArray array = json.getAsJsonArray("synonym");
+ JsonArray array = getJArray(json, "synonym");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSynonym().add(new StringType());
@@ -18964,7 +19269,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_synonym")) {
- JsonArray array = json.getAsJsonArray("_synonym");
+ JsonArray array = getJArray(json, "_synonym");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSynonym().size())
res.getSynonym().add(parseString(null));
@@ -18973,13 +19278,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("relatedMedicationKnowledge")) {
- JsonArray array = json.getAsJsonArray("relatedMedicationKnowledge");
+ JsonArray array = getJArray(json, "relatedMedicationKnowledge");
for (int i = 0; i < array.size(); i++) {
res.getRelatedMedicationKnowledge().add(parseMedicationKnowledgeRelatedMedicationKnowledgeComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("associatedMedication")) {
- JsonArray array = json.getAsJsonArray("associatedMedication");
+ JsonArray array = getJArray(json, "associatedMedication");
for (int i = 0; i < array.size(); i++) {
res.getAssociatedMedication().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -18987,25 +19292,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("associatedDefinition"))
res.setAssociatedDefinition(parseReference(getJObject(json, "associatedDefinition")));
if (json.has("productType")) {
- JsonArray array = json.getAsJsonArray("productType");
+ JsonArray array = getJArray(json, "productType");
for (int i = 0; i < array.size(); i++) {
res.getProductType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("monograph")) {
- JsonArray array = json.getAsJsonArray("monograph");
+ JsonArray array = getJArray(json, "monograph");
for (int i = 0; i < array.size(); i++) {
res.getMonograph().add(parseMedicationKnowledgeMonographComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("ingredient")) {
- JsonArray array = json.getAsJsonArray("ingredient");
+ JsonArray array = getJArray(json, "ingredient");
for (int i = 0; i < array.size(); i++) {
res.getIngredient().add(parseMedicationKnowledgeIngredientComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("device")) {
- JsonArray array = json.getAsJsonArray("device");
+ JsonArray array = getJArray(json, "device");
for (int i = 0; i < array.size(); i++) {
res.getDevice().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -19015,61 +19320,61 @@ public class JsonParser extends JsonParserBase {
if (json.has("_preparationInstruction"))
parseElementProperties(getJObject(json, "_preparationInstruction"), res.getPreparationInstructionElement());
if (json.has("intendedRoute")) {
- JsonArray array = json.getAsJsonArray("intendedRoute");
+ JsonArray array = getJArray(json, "intendedRoute");
for (int i = 0; i < array.size(); i++) {
res.getIntendedRoute().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("cost")) {
- JsonArray array = json.getAsJsonArray("cost");
+ JsonArray array = getJArray(json, "cost");
for (int i = 0; i < array.size(); i++) {
res.getCost().add(parseMedicationKnowledgeCostComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("monitoringProgram")) {
- JsonArray array = json.getAsJsonArray("monitoringProgram");
+ JsonArray array = getJArray(json, "monitoringProgram");
for (int i = 0; i < array.size(); i++) {
res.getMonitoringProgram().add(parseMedicationKnowledgeMonitoringProgramComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("administrationGuideline")) {
- JsonArray array = json.getAsJsonArray("administrationGuideline");
+ if (json.has("indicationGuideline")) {
+ JsonArray array = getJArray(json, "indicationGuideline");
for (int i = 0; i < array.size(); i++) {
- res.getAdministrationGuideline().add(parseMedicationKnowledgeAdministrationGuidelineComponent(array.get(i).getAsJsonObject()));
+ res.getIndicationGuideline().add(parseMedicationKnowledgeIndicationGuidelineComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("medicineClassification")) {
- JsonArray array = json.getAsJsonArray("medicineClassification");
+ JsonArray array = getJArray(json, "medicineClassification");
for (int i = 0; i < array.size(); i++) {
res.getMedicineClassification().add(parseMedicationKnowledgeMedicineClassificationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("packaging")) {
- JsonArray array = json.getAsJsonArray("packaging");
+ JsonArray array = getJArray(json, "packaging");
for (int i = 0; i < array.size(); i++) {
res.getPackaging().add(parseMedicationKnowledgePackagingComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("drugCharacteristic")) {
- JsonArray array = json.getAsJsonArray("drugCharacteristic");
+ JsonArray array = getJArray(json, "drugCharacteristic");
for (int i = 0; i < array.size(); i++) {
res.getDrugCharacteristic().add(parseMedicationKnowledgeDrugCharacteristicComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("clinicalUseIssue")) {
- JsonArray array = json.getAsJsonArray("clinicalUseIssue");
+ JsonArray array = getJArray(json, "clinicalUseIssue");
for (int i = 0; i < array.size(); i++) {
res.getClinicalUseIssue().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("regulatory")) {
- JsonArray array = json.getAsJsonArray("regulatory");
+ JsonArray array = getJArray(json, "regulatory");
for (int i = 0; i < array.size(); i++) {
res.getRegulatory().add(parseMedicationKnowledgeRegulatoryComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("kineticCharacteristic")) {
- JsonArray array = json.getAsJsonArray("kineticCharacteristic");
+ JsonArray array = getJArray(json, "kineticCharacteristic");
for (int i = 0; i < array.size(); i++) {
res.getKineticCharacteristic().add(parseMedicationKnowledgeKineticCharacteristicComponent(array.get(i).getAsJsonObject()));
}
@@ -19087,7 +19392,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("reference")) {
- JsonArray array = json.getAsJsonArray("reference");
+ JsonArray array = getJArray(json, "reference");
for (int i = 0; i < array.size(); i++) {
res.getReference().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -19119,9 +19424,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("item"))
res.setItem(parseCodeableReference(getJObject(json, "item")));
if (json.has("isActive"))
- res.setIsActiveElement(parseBoolean(json.get("isActive").getAsBoolean()));
- if (json.has("_isActive"))
- parseElementProperties(getJObject(json, "_isActive"), res.getIsActiveElement());
+ res.setIsActive(parseCodeableConcept(getJObject(json, "isActive")));
DataType strength = parseType("strength", json);
if (strength != null)
res.setStrength(strength);
@@ -19136,7 +19439,7 @@ public class JsonParser extends JsonParserBase {
protected void parseMedicationKnowledgeCostComponentProperties(JsonObject json, MedicationKnowledge.MedicationKnowledgeCostComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("effectiveDate")) {
- JsonArray array = json.getAsJsonArray("effectiveDate");
+ JsonArray array = getJArray(json, "effectiveDate");
for (int i = 0; i < array.size(); i++) {
res.getEffectiveDate().add(parsePeriod(array.get(i).getAsJsonObject()));
}
@@ -19168,55 +19471,79 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_name"), res.getNameElement());
}
- protected MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent parseMedicationKnowledgeAdministrationGuidelineComponent(JsonObject json) throws IOException, FHIRFormatError {
- MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent res = new MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent();
- parseMedicationKnowledgeAdministrationGuidelineComponentProperties(json, res);
+ protected MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent parseMedicationKnowledgeIndicationGuidelineComponent(JsonObject json) throws IOException, FHIRFormatError {
+ MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent res = new MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent();
+ parseMedicationKnowledgeIndicationGuidelineComponentProperties(json, res);
return res;
}
- protected void parseMedicationKnowledgeAdministrationGuidelineComponentProperties(JsonObject json, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent res) throws IOException, FHIRFormatError {
+ protected void parseMedicationKnowledgeIndicationGuidelineComponentProperties(JsonObject json, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- if (json.has("dosage")) {
- JsonArray array = json.getAsJsonArray("dosage");
+ if (json.has("indication")) {
+ JsonArray array = getJArray(json, "indication");
for (int i = 0; i < array.size(); i++) {
- res.getDosage().add(parseMedicationKnowledgeAdministrationGuidelineDosageComponent(array.get(i).getAsJsonObject()));
+ res.getIndication().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
- if (json.has("indication"))
- res.setIndication(parseCodeableReference(getJObject(json, "indication")));
- if (json.has("patientCharacteristic")) {
- JsonArray array = json.getAsJsonArray("patientCharacteristic");
+ if (json.has("dosingGuideline")) {
+ JsonArray array = getJArray(json, "dosingGuideline");
for (int i = 0; i < array.size(); i++) {
- res.getPatientCharacteristic().add(parseMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent(array.get(i).getAsJsonObject()));
+ res.getDosingGuideline().add(parseMedicationKnowledgeIndicationGuidelineDosingGuidelineComponent(array.get(i).getAsJsonObject()));
}
};
}
- protected MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent parseMedicationKnowledgeAdministrationGuidelineDosageComponent(JsonObject json) throws IOException, FHIRFormatError {
- MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent res = new MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent();
- parseMedicationKnowledgeAdministrationGuidelineDosageComponentProperties(json, res);
+ protected MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent parseMedicationKnowledgeIndicationGuidelineDosingGuidelineComponent(JsonObject json) throws IOException, FHIRFormatError {
+ MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent res = new MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent();
+ parseMedicationKnowledgeIndicationGuidelineDosingGuidelineComponentProperties(json, res);
return res;
}
- protected void parseMedicationKnowledgeAdministrationGuidelineDosageComponentProperties(JsonObject json, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent res) throws IOException, FHIRFormatError {
+ protected void parseMedicationKnowledgeIndicationGuidelineDosingGuidelineComponentProperties(JsonObject json, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("treatmentIntent"))
+ res.setTreatmentIntent(parseCodeableConcept(getJObject(json, "treatmentIntent")));
+ if (json.has("dosage")) {
+ JsonArray array = getJArray(json, "dosage");
+ for (int i = 0; i < array.size(); i++) {
+ res.getDosage().add(parseMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("administrationTreatment"))
+ res.setAdministrationTreatment(parseCodeableConcept(getJObject(json, "administrationTreatment")));
+ if (json.has("patientCharacteristic")) {
+ JsonArray array = getJArray(json, "patientCharacteristic");
+ for (int i = 0; i < array.size(); i++) {
+ res.getPatientCharacteristic().add(parseMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ }
+
+ protected MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent parseMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent(JsonObject json) throws IOException, FHIRFormatError {
+ MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent res = new MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent();
+ parseMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponentProperties(JsonObject json, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("dosage")) {
- JsonArray array = json.getAsJsonArray("dosage");
+ JsonArray array = getJArray(json, "dosage");
for (int i = 0; i < array.size(); i++) {
res.getDosage().add(parseDosage(array.get(i).getAsJsonObject()));
}
};
}
- protected MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent parseMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent(JsonObject json) throws IOException, FHIRFormatError {
- MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent res = new MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent();
- parseMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponentProperties(json, res);
+ protected MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent parseMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent(JsonObject json) throws IOException, FHIRFormatError {
+ MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent res = new MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent();
+ parseMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponentProperties(json, res);
return res;
}
- protected void parseMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponentProperties(JsonObject json, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent res) throws IOException, FHIRFormatError {
+ protected void parseMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponentProperties(JsonObject json, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
@@ -19236,7 +19563,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("classification")) {
- JsonArray array = json.getAsJsonArray("classification");
+ JsonArray array = getJArray(json, "classification");
for (int i = 0; i < array.size(); i++) {
res.getClassification().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -19264,7 +19591,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("material"))
res.setMaterial(parseCodeableConcept(getJObject(json, "material")));
if (json.has("packaging")) {
- JsonArray array = json.getAsJsonArray("packaging");
+ JsonArray array = getJArray(json, "packaging");
for (int i = 0; i < array.size(); i++) {
res.getPackaging().add(parseMedicationKnowledgePackagingComponent(array.get(i).getAsJsonObject()));
}
@@ -19297,13 +19624,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("regulatoryAuthority"))
res.setRegulatoryAuthority(parseReference(getJObject(json, "regulatoryAuthority")));
if (json.has("substitution")) {
- JsonArray array = json.getAsJsonArray("substitution");
+ JsonArray array = getJArray(json, "substitution");
for (int i = 0; i < array.size(); i++) {
res.getSubstitution().add(parseMedicationKnowledgeRegulatorySubstitutionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("schedule")) {
- JsonArray array = json.getAsJsonArray("schedule");
+ JsonArray array = getJArray(json, "schedule");
for (int i = 0; i < array.size(); i++) {
res.getSchedule().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -19366,7 +19693,7 @@ public class JsonParser extends JsonParserBase {
protected void parseMedicationRequestProperties(JsonObject json, MedicationRequest res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -19382,7 +19709,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_intent"))
parseElementProperties(getJObject(json, "_intent"), res.getIntentElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -19408,7 +19735,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("encounter"))
res.setEncounter(parseReference(getJObject(json, "encounter")));
if (json.has("supportingInformation")) {
- JsonArray array = json.getAsJsonArray("supportingInformation");
+ JsonArray array = getJArray(json, "supportingInformation");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInformation().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -19426,13 +19753,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("recorder"))
res.setRecorder(parseReference(getJObject(json, "recorder")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -19442,7 +19769,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -19451,7 +19778,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -19461,7 +19788,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -19470,7 +19797,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -19480,13 +19807,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("courseOfTherapyType"))
res.setCourseOfTherapyType(parseCodeableConcept(getJObject(json, "courseOfTherapyType")));
if (json.has("insurance")) {
- JsonArray array = json.getAsJsonArray("insurance");
+ JsonArray array = getJArray(json, "insurance");
for (int i = 0; i < array.size(); i++) {
res.getInsurance().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -19496,7 +19823,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_renderedDosageInstruction"))
parseElementProperties(getJObject(json, "_renderedDosageInstruction"), res.getRenderedDosageInstructionElement());
if (json.has("dosageInstruction")) {
- JsonArray array = json.getAsJsonArray("dosageInstruction");
+ JsonArray array = getJArray(json, "dosageInstruction");
for (int i = 0; i < array.size(); i++) {
res.getDosageInstruction().add(parseDosage(array.get(i).getAsJsonObject()));
}
@@ -19508,13 +19835,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("priorPrescription"))
res.setPriorPrescription(parseReference(getJObject(json, "priorPrescription")));
if (json.has("detectedIssue")) {
- JsonArray array = json.getAsJsonArray("detectedIssue");
+ JsonArray array = getJArray(json, "detectedIssue");
for (int i = 0; i < array.size(); i++) {
res.getDetectedIssue().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("eventHistory")) {
- JsonArray array = json.getAsJsonArray("eventHistory");
+ JsonArray array = getJArray(json, "eventHistory");
for (int i = 0; i < array.size(); i++) {
res.getEventHistory().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -19545,6 +19872,14 @@ public class JsonParser extends JsonParserBase {
res.setExpectedSupplyDuration(parseDuration(getJObject(json, "expectedSupplyDuration")));
if (json.has("dispenser"))
res.setDispenser(parseReference(getJObject(json, "dispenser")));
+ if (json.has("dispenserInstruction")) {
+ JsonArray array = getJArray(json, "dispenserInstruction");
+ for (int i = 0; i < array.size(); i++) {
+ res.getDispenserInstruction().add(parseAnnotation(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("doseAdministrationAid"))
+ res.setDoseAdministrationAid(parseCodeableConcept(getJObject(json, "doseAdministrationAid")));
}
protected MedicationRequest.MedicationRequestDispenseRequestInitialFillComponent parseMedicationRequestDispenseRequestInitialFillComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -19585,19 +19920,19 @@ public class JsonParser extends JsonParserBase {
protected void parseMedicationUsageProperties(JsonObject json, MedicationUsage res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
res.getPartOf().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -19607,13 +19942,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("statusReason")) {
- JsonArray array = json.getAsJsonArray("statusReason");
+ JsonArray array = getJArray(json, "statusReason");
for (int i = 0; i < array.size(); i++) {
res.getStatusReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -19634,19 +19969,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("informationSource"))
res.setInformationSource(parseReference(getJObject(json, "informationSource")));
if (json.has("derivedFrom")) {
- JsonArray array = json.getAsJsonArray("derivedFrom");
+ JsonArray array = getJArray(json, "derivedFrom");
for (int i = 0; i < array.size(); i++) {
res.getDerivedFrom().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -19656,15 +19991,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_renderedDosageInstruction"))
parseElementProperties(getJObject(json, "_renderedDosageInstruction"), res.getRenderedDosageInstructionElement());
if (json.has("dosage")) {
- JsonArray array = json.getAsJsonArray("dosage");
+ JsonArray array = getJArray(json, "dosage");
for (int i = 0; i < array.size(); i++) {
res.getDosage().add(parseDosage(array.get(i).getAsJsonObject()));
}
};
- if (json.has("takenAsOrdered"))
- res.setTakenAsOrderedElement(parseBoolean(json.get("takenAsOrdered").getAsBoolean()));
- if (json.has("_takenAsOrdered"))
- parseElementProperties(getJObject(json, "_takenAsOrdered"), res.getTakenAsOrderedElement());
+ if (json.has("adherence"))
+ res.setAdherence(parseCodeableConcept(getJObject(json, "adherence")));
}
protected MedicinalProductDefinition parseMedicinalProductDefinition(JsonObject json) throws IOException, FHIRFormatError {
@@ -19676,7 +20009,7 @@ public class JsonParser extends JsonParserBase {
protected void parseMedicinalProductDefinitionProperties(JsonObject json, MedicinalProductDefinition res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -19710,7 +20043,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("additionalMonitoringIndicator"))
res.setAdditionalMonitoringIndicator(parseCodeableConcept(getJObject(json, "additionalMonitoringIndicator")));
if (json.has("specialMeasures")) {
- JsonArray array = json.getAsJsonArray("specialMeasures");
+ JsonArray array = getJArray(json, "specialMeasures");
for (int i = 0; i < array.size(); i++) {
res.getSpecialMeasures().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -19718,87 +20051,87 @@ public class JsonParser extends JsonParserBase {
if (json.has("paediatricUseIndicator"))
res.setPaediatricUseIndicator(parseCodeableConcept(getJObject(json, "paediatricUseIndicator")));
if (json.has("classification")) {
- JsonArray array = json.getAsJsonArray("classification");
+ JsonArray array = getJArray(json, "classification");
for (int i = 0; i < array.size(); i++) {
res.getClassification().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("characteristic")) {
- JsonArray array = json.getAsJsonArray("characteristic");
+ JsonArray array = getJArray(json, "characteristic");
for (int i = 0; i < array.size(); i++) {
res.getCharacteristic().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("marketingStatus")) {
- JsonArray array = json.getAsJsonArray("marketingStatus");
+ JsonArray array = getJArray(json, "marketingStatus");
for (int i = 0; i < array.size(); i++) {
res.getMarketingStatus().add(parseMarketingStatus(array.get(i).getAsJsonObject()));
}
};
- if (json.has("pharmaceuticalProduct")) {
- JsonArray array = json.getAsJsonArray("pharmaceuticalProduct");
- for (int i = 0; i < array.size(); i++) {
- res.getPharmaceuticalProduct().add(parseReference(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("packagedMedicinalProduct")) {
- JsonArray array = json.getAsJsonArray("packagedMedicinalProduct");
- for (int i = 0; i < array.size(); i++) {
- res.getPackagedMedicinalProduct().add(parseReference(array.get(i).getAsJsonObject()));
- }
- };
if (json.has("ingredient")) {
- JsonArray array = json.getAsJsonArray("ingredient");
+ JsonArray array = getJArray(json, "ingredient");
for (int i = 0; i < array.size(); i++) {
- res.getIngredient().add(parseReference(array.get(i).getAsJsonObject()));
+ res.getIngredient().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("impurity")) {
- JsonArray array = json.getAsJsonArray("impurity");
+ JsonArray array = getJArray(json, "impurity");
for (int i = 0; i < array.size(); i++) {
res.getImpurity().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("attachedDocument")) {
- JsonArray array = json.getAsJsonArray("attachedDocument");
+ JsonArray array = getJArray(json, "attachedDocument");
for (int i = 0; i < array.size(); i++) {
res.getAttachedDocument().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("masterFile")) {
- JsonArray array = json.getAsJsonArray("masterFile");
+ JsonArray array = getJArray(json, "masterFile");
for (int i = 0; i < array.size(); i++) {
res.getMasterFile().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseMedicinalProductDefinitionContactComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("clinicalTrial")) {
- JsonArray array = json.getAsJsonArray("clinicalTrial");
+ JsonArray array = getJArray(json, "clinicalTrial");
for (int i = 0; i < array.size(); i++) {
res.getClinicalTrial().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("name")) {
- JsonArray array = json.getAsJsonArray("name");
+ JsonArray array = getJArray(json, "name");
for (int i = 0; i < array.size(); i++) {
res.getName().add(parseMedicinalProductDefinitionNameComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("crossReference")) {
- JsonArray array = json.getAsJsonArray("crossReference");
+ JsonArray array = getJArray(json, "crossReference");
for (int i = 0; i < array.size(); i++) {
res.getCrossReference().add(parseMedicinalProductDefinitionCrossReferenceComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("manufacturingBusinessOperation")) {
- JsonArray array = json.getAsJsonArray("manufacturingBusinessOperation");
+ if (json.has("operation")) {
+ JsonArray array = getJArray(json, "operation");
for (int i = 0; i < array.size(); i++) {
- res.getManufacturingBusinessOperation().add(parseMedicinalProductDefinitionManufacturingBusinessOperationComponent(array.get(i).getAsJsonObject()));
+ res.getOperation().add(parseMedicinalProductDefinitionOperationComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("package")) {
+ JsonArray array = getJArray(json, "package");
+ for (int i = 0; i < array.size(); i++) {
+ res.getPackage().add(parseMedicinalProductDefinitionPackageComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("administrableProduct")) {
+ JsonArray array = getJArray(json, "administrableProduct");
+ for (int i = 0; i < array.size(); i++) {
+ res.getAdministrableProduct().add(parseMedicinalProductDefinitionAdministrableProductComponent(array.get(i).getAsJsonObject()));
}
};
}
@@ -19832,13 +20165,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("namePart")) {
- JsonArray array = json.getAsJsonArray("namePart");
+ JsonArray array = getJArray(json, "namePart");
for (int i = 0; i < array.size(); i++) {
res.getNamePart().add(parseMedicinalProductDefinitionNameNamePartComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("countryLanguage")) {
- JsonArray array = json.getAsJsonArray("countryLanguage");
+ JsonArray array = getJArray(json, "countryLanguage");
for (int i = 0; i < array.size(); i++) {
res.getCountryLanguage().add(parseMedicinalProductDefinitionNameCountryLanguageComponent(array.get(i).getAsJsonObject()));
}
@@ -19891,22 +20224,22 @@ public class JsonParser extends JsonParserBase {
res.setType(parseCodeableConcept(getJObject(json, "type")));
}
- protected MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent parseMedicinalProductDefinitionManufacturingBusinessOperationComponent(JsonObject json) throws IOException, FHIRFormatError {
- MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent res = new MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent();
- parseMedicinalProductDefinitionManufacturingBusinessOperationComponentProperties(json, res);
+ protected MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent parseMedicinalProductDefinitionOperationComponent(JsonObject json) throws IOException, FHIRFormatError {
+ MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent res = new MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent();
+ parseMedicinalProductDefinitionOperationComponentProperties(json, res);
return res;
}
- protected void parseMedicinalProductDefinitionManufacturingBusinessOperationComponentProperties(JsonObject json, MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent res) throws IOException, FHIRFormatError {
+ protected void parseMedicinalProductDefinitionOperationComponentProperties(JsonObject json, MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("type"))
res.setType(parseCodeableReference(getJObject(json, "type")));
if (json.has("effectiveDate"))
res.setEffectiveDate(parsePeriod(getJObject(json, "effectiveDate")));
- if (json.has("manufacturer")) {
- JsonArray array = json.getAsJsonArray("manufacturer");
+ if (json.has("organization")) {
+ JsonArray array = getJArray(json, "organization");
for (int i = 0; i < array.size(); i++) {
- res.getManufacturer().add(parseReference(array.get(i).getAsJsonObject()));
+ res.getOrganization().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("authorization"))
@@ -19915,6 +20248,41 @@ public class JsonParser extends JsonParserBase {
res.setConfidentialityIndicator(parseCodeableConcept(getJObject(json, "confidentialityIndicator")));
}
+ protected MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent parseMedicinalProductDefinitionPackageComponent(JsonObject json) throws IOException, FHIRFormatError {
+ MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent res = new MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent();
+ parseMedicinalProductDefinitionPackageComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseMedicinalProductDefinitionPackageComponentProperties(JsonObject json, MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ DataType size = parseType("size", json);
+ if (size != null)
+ res.setSize(size);
+ if (json.has("package"))
+ res.setPackage(parseReference(getJObject(json, "package")));
+ }
+
+ protected MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent parseMedicinalProductDefinitionAdministrableProductComponent(JsonObject json) throws IOException, FHIRFormatError {
+ MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent res = new MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent();
+ parseMedicinalProductDefinitionAdministrableProductComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseMedicinalProductDefinitionAdministrableProductComponentProperties(JsonObject json, MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("route")) {
+ JsonArray array = getJArray(json, "route");
+ for (int i = 0; i < array.size(); i++) {
+ res.getRoute().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("product"))
+ res.setProduct(parseReference(getJObject(json, "product")));
+ }
+
protected MessageDefinition parseMessageDefinition(JsonObject json) throws IOException, FHIRFormatError {
MessageDefinition res = new MessageDefinition();
parseMessageDefinitionProperties(json, res);
@@ -19928,7 +20296,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -19946,7 +20314,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_title"))
parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
if (json.has("replaces")) {
- JsonArray array = json.getAsJsonArray("replaces");
+ JsonArray array = getJArray(json, "replaces");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getReplaces().add(new CanonicalType());
@@ -19956,7 +20324,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_replaces")) {
- JsonArray array = json.getAsJsonArray("_replaces");
+ JsonArray array = getJArray(json, "_replaces");
for (int i = 0; i < array.size(); i++) {
if (i == res.getReplaces().size())
res.getReplaces().add(parseCanonical(null));
@@ -19981,7 +20349,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -19991,13 +20359,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -20015,7 +20383,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_base"))
parseElementProperties(getJObject(json, "_base"), res.getBaseElement());
if (json.has("parent")) {
- JsonArray array = json.getAsJsonArray("parent");
+ JsonArray array = getJArray(json, "parent");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getParent().add(new CanonicalType());
@@ -20025,7 +20393,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_parent")) {
- JsonArray array = json.getAsJsonArray("_parent");
+ JsonArray array = getJArray(json, "_parent");
for (int i = 0; i < array.size(); i++) {
if (i == res.getParent().size())
res.getParent().add(parseCanonical(null));
@@ -20041,7 +20409,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_category"))
parseElementProperties(getJObject(json, "_category"), res.getCategoryElement());
if (json.has("focus")) {
- JsonArray array = json.getAsJsonArray("focus");
+ JsonArray array = getJArray(json, "focus");
for (int i = 0; i < array.size(); i++) {
res.getFocus().add(parseMessageDefinitionFocusComponent(array.get(i).getAsJsonObject()));
}
@@ -20051,13 +20419,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_responseRequired"))
parseElementProperties(getJObject(json, "_responseRequired"), res.getResponseRequiredElement());
if (json.has("allowedResponse")) {
- JsonArray array = json.getAsJsonArray("allowedResponse");
+ JsonArray array = getJArray(json, "allowedResponse");
for (int i = 0; i < array.size(); i++) {
res.getAllowedResponse().add(parseMessageDefinitionAllowedResponseComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("graph")) {
- JsonArray array = json.getAsJsonArray("graph");
+ JsonArray array = getJArray(json, "graph");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getGraph().add(new CanonicalType());
@@ -20067,7 +20435,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_graph")) {
- JsonArray array = json.getAsJsonArray("_graph");
+ JsonArray array = getJArray(json, "_graph");
for (int i = 0; i < array.size(); i++) {
if (i == res.getGraph().size())
res.getGraph().add(parseCanonical(null));
@@ -20133,7 +20501,7 @@ public class JsonParser extends JsonParserBase {
if (event != null)
res.setEvent(event);
if (json.has("destination")) {
- JsonArray array = json.getAsJsonArray("destination");
+ JsonArray array = getJArray(json, "destination");
for (int i = 0; i < array.size(); i++) {
res.getDestination().add(parseMessageHeaderMessageDestinationComponent(array.get(i).getAsJsonObject()));
}
@@ -20153,7 +20521,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("response"))
res.setResponse(parseMessageHeaderResponseComponent(getJObject(json, "response")));
if (json.has("focus")) {
- JsonArray array = json.getAsJsonArray("focus");
+ JsonArray array = getJArray(json, "focus");
for (int i = 0; i < array.size(); i++) {
res.getFocus().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -20243,7 +20611,7 @@ public class JsonParser extends JsonParserBase {
protected void parseMolecularSequenceProperties(JsonObject json, MolecularSequence res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -20269,7 +20637,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("referenceSeq"))
res.setReferenceSeq(parseMolecularSequenceReferenceSeqComponent(getJObject(json, "referenceSeq")));
if (json.has("variant")) {
- JsonArray array = json.getAsJsonArray("variant");
+ JsonArray array = getJArray(json, "variant");
for (int i = 0; i < array.size(); i++) {
res.getVariant().add(parseMolecularSequenceVariantComponent(array.get(i).getAsJsonObject()));
}
@@ -20279,7 +20647,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_observedSeq"))
parseElementProperties(getJObject(json, "_observedSeq"), res.getObservedSeqElement());
if (json.has("quality")) {
- JsonArray array = json.getAsJsonArray("quality");
+ JsonArray array = getJArray(json, "quality");
for (int i = 0; i < array.size(); i++) {
res.getQuality().add(parseMolecularSequenceQualityComponent(array.get(i).getAsJsonObject()));
}
@@ -20289,19 +20657,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_readCoverage"))
parseElementProperties(getJObject(json, "_readCoverage"), res.getReadCoverageElement());
if (json.has("repository")) {
- JsonArray array = json.getAsJsonArray("repository");
+ JsonArray array = getJArray(json, "repository");
for (int i = 0; i < array.size(); i++) {
res.getRepository().add(parseMolecularSequenceRepositoryComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("pointer")) {
- JsonArray array = json.getAsJsonArray("pointer");
+ JsonArray array = getJArray(json, "pointer");
for (int i = 0; i < array.size(); i++) {
res.getPointer().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("structureVariant")) {
- JsonArray array = json.getAsJsonArray("structureVariant");
+ JsonArray array = getJArray(json, "structureVariant");
for (int i = 0; i < array.size(); i++) {
res.getStructureVariant().add(parseMolecularSequenceStructureVariantComponent(array.get(i).getAsJsonObject()));
}
@@ -20451,7 +20819,7 @@ public class JsonParser extends JsonParserBase {
protected void parseMolecularSequenceQualityRocComponentProperties(JsonObject json, MolecularSequence.MolecularSequenceQualityRocComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("score")) {
- JsonArray array = json.getAsJsonArray("score");
+ JsonArray array = getJArray(json, "score");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getScore().add(new IntegerType());
@@ -20461,7 +20829,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_score")) {
- JsonArray array = json.getAsJsonArray("_score");
+ JsonArray array = getJArray(json, "_score");
for (int i = 0; i < array.size(); i++) {
if (i == res.getScore().size())
res.getScore().add(parseInteger(null));
@@ -20470,7 +20838,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("numTP")) {
- JsonArray array = json.getAsJsonArray("numTP");
+ JsonArray array = getJArray(json, "numTP");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNumTP().add(new IntegerType());
@@ -20480,7 +20848,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_numTP")) {
- JsonArray array = json.getAsJsonArray("_numTP");
+ JsonArray array = getJArray(json, "_numTP");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNumTP().size())
res.getNumTP().add(parseInteger(null));
@@ -20489,7 +20857,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("numFP")) {
- JsonArray array = json.getAsJsonArray("numFP");
+ JsonArray array = getJArray(json, "numFP");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNumFP().add(new IntegerType());
@@ -20499,7 +20867,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_numFP")) {
- JsonArray array = json.getAsJsonArray("_numFP");
+ JsonArray array = getJArray(json, "_numFP");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNumFP().size())
res.getNumFP().add(parseInteger(null));
@@ -20508,7 +20876,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("numFN")) {
- JsonArray array = json.getAsJsonArray("numFN");
+ JsonArray array = getJArray(json, "numFN");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getNumFN().add(new IntegerType());
@@ -20518,7 +20886,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_numFN")) {
- JsonArray array = json.getAsJsonArray("_numFN");
+ JsonArray array = getJArray(json, "_numFN");
for (int i = 0; i < array.size(); i++) {
if (i == res.getNumFN().size())
res.getNumFN().add(parseInteger(null));
@@ -20527,7 +20895,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("precision")) {
- JsonArray array = json.getAsJsonArray("precision");
+ JsonArray array = getJArray(json, "precision");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPrecision().add(new DecimalType());
@@ -20537,7 +20905,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_precision")) {
- JsonArray array = json.getAsJsonArray("_precision");
+ JsonArray array = getJArray(json, "_precision");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPrecision().size())
res.getPrecision().add(parseDecimal(null));
@@ -20546,7 +20914,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("sensitivity")) {
- JsonArray array = json.getAsJsonArray("sensitivity");
+ JsonArray array = getJArray(json, "sensitivity");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSensitivity().add(new DecimalType());
@@ -20556,7 +20924,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_sensitivity")) {
- JsonArray array = json.getAsJsonArray("_sensitivity");
+ JsonArray array = getJArray(json, "_sensitivity");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSensitivity().size())
res.getSensitivity().add(parseDecimal(null));
@@ -20565,7 +20933,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("fMeasure")) {
- JsonArray array = json.getAsJsonArray("fMeasure");
+ JsonArray array = getJArray(json, "fMeasure");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getFMeasure().add(new DecimalType());
@@ -20575,7 +20943,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_fMeasure")) {
- JsonArray array = json.getAsJsonArray("_fMeasure");
+ JsonArray array = getJArray(json, "_fMeasure");
for (int i = 0; i < array.size(); i++) {
if (i == res.getFMeasure().size())
res.getFMeasure().add(parseDecimal(null));
@@ -20699,6 +21067,10 @@ public class JsonParser extends JsonParserBase {
res.setNameElement(parseString(json.get("name").getAsString()));
if (json.has("_name"))
parseElementProperties(getJObject(json, "_name"), res.getNameElement());
+ if (json.has("title"))
+ res.setTitleElement(parseString(json.get("title").getAsString()));
+ if (json.has("_title"))
+ parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
if (json.has("status"))
res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
if (json.has("_status"))
@@ -20716,7 +21088,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -20732,13 +21104,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -20748,7 +21120,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_usage"))
parseElementProperties(getJObject(json, "_usage"), res.getUsageElement());
if (json.has("uniqueId")) {
- JsonArray array = json.getAsJsonArray("uniqueId");
+ JsonArray array = getJArray(json, "uniqueId");
for (int i = 0; i < array.size(); i++) {
res.getUniqueId().add(parseNamingSystemUniqueIdComponent(array.get(i).getAsJsonObject()));
}
@@ -20781,6 +21153,10 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_comment"), res.getCommentElement());
if (json.has("period"))
res.setPeriod(parsePeriod(getJObject(json, "period")));
+ if (json.has("authoritative"))
+ res.setAuthoritativeElement(parseBoolean(json.get("authoritative").getAsBoolean()));
+ if (json.has("_authoritative"))
+ parseElementProperties(getJObject(json, "_authoritative"), res.getAuthoritativeElement());
}
protected NutritionIntake parseNutritionIntake(JsonObject json) throws IOException, FHIRFormatError {
@@ -20792,13 +21168,13 @@ public class JsonParser extends JsonParserBase {
protected void parseNutritionIntakeProperties(JsonObject json, NutritionIntake res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -20808,7 +21184,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -20817,7 +21193,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -20827,7 +21203,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -20836,13 +21212,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
res.getPartOf().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -20852,7 +21228,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("statusReason")) {
- JsonArray array = json.getAsJsonArray("statusReason");
+ JsonArray array = getJArray(json, "statusReason");
for (int i = 0; i < array.size(); i++) {
res.getStatusReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -20874,19 +21250,19 @@ public class JsonParser extends JsonParserBase {
if (reported != null)
res.setReported(reported);
if (json.has("consumedItem")) {
- JsonArray array = json.getAsJsonArray("consumedItem");
+ JsonArray array = getJArray(json, "consumedItem");
for (int i = 0; i < array.size(); i++) {
res.getConsumedItem().add(parseNutritionIntakeConsumedItemComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("ingredientLabel")) {
- JsonArray array = json.getAsJsonArray("ingredientLabel");
+ JsonArray array = getJArray(json, "ingredientLabel");
for (int i = 0; i < array.size(); i++) {
res.getIngredientLabel().add(parseNutritionIntakeIngredientLabelComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("performer")) {
- JsonArray array = json.getAsJsonArray("performer");
+ JsonArray array = getJArray(json, "performer");
for (int i = 0; i < array.size(); i++) {
res.getPerformer().add(parseNutritionIntakePerformerComponent(array.get(i).getAsJsonObject()));
}
@@ -20894,19 +21270,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("location"))
res.setLocation(parseReference(getJObject(json, "location")));
if (json.has("derivedFrom")) {
- JsonArray array = json.getAsJsonArray("derivedFrom");
+ JsonArray array = getJArray(json, "derivedFrom");
for (int i = 0; i < array.size(); i++) {
res.getDerivedFrom().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -20976,13 +21352,13 @@ public class JsonParser extends JsonParserBase {
protected void parseNutritionOrderProperties(JsonObject json, NutritionOrder res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -20992,7 +21368,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -21001,7 +21377,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -21011,7 +21387,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -21020,7 +21396,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiates")) {
- JsonArray array = json.getAsJsonArray("instantiates");
+ JsonArray array = getJArray(json, "instantiates");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiates().add(new UriType());
@@ -21030,7 +21406,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiates")) {
- JsonArray array = json.getAsJsonArray("_instantiates");
+ JsonArray array = getJArray(json, "_instantiates");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiates().size())
res.getInstantiates().add(parseUri(null));
@@ -21057,19 +21433,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("orderer"))
res.setOrderer(parseReference(getJObject(json, "orderer")));
if (json.has("allergyIntolerance")) {
- JsonArray array = json.getAsJsonArray("allergyIntolerance");
+ JsonArray array = getJArray(json, "allergyIntolerance");
for (int i = 0; i < array.size(); i++) {
res.getAllergyIntolerance().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("foodPreferenceModifier")) {
- JsonArray array = json.getAsJsonArray("foodPreferenceModifier");
+ JsonArray array = getJArray(json, "foodPreferenceModifier");
for (int i = 0; i < array.size(); i++) {
res.getFoodPreferenceModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("excludeFoodModifier")) {
- JsonArray array = json.getAsJsonArray("excludeFoodModifier");
+ JsonArray array = getJArray(json, "excludeFoodModifier");
for (int i = 0; i < array.size(); i++) {
res.getExcludeFoodModifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -21077,7 +21453,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("oralDiet"))
res.setOralDiet(parseNutritionOrderOralDietComponent(getJObject(json, "oralDiet")));
if (json.has("supplement")) {
- JsonArray array = json.getAsJsonArray("supplement");
+ JsonArray array = getJArray(json, "supplement");
for (int i = 0; i < array.size(); i++) {
res.getSupplement().add(parseNutritionOrderSupplementComponent(array.get(i).getAsJsonObject()));
}
@@ -21085,7 +21461,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("enteralFormula"))
res.setEnteralFormula(parseNutritionOrderEnteralFormulaComponent(getJObject(json, "enteralFormula")));
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -21101,31 +21477,31 @@ public class JsonParser extends JsonParserBase {
protected void parseNutritionOrderOralDietComponentProperties(JsonObject json, NutritionOrder.NutritionOrderOralDietComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("schedule")) {
- JsonArray array = json.getAsJsonArray("schedule");
+ JsonArray array = getJArray(json, "schedule");
for (int i = 0; i < array.size(); i++) {
res.getSchedule().add(parseTiming(array.get(i).getAsJsonObject()));
}
};
if (json.has("nutrient")) {
- JsonArray array = json.getAsJsonArray("nutrient");
+ JsonArray array = getJArray(json, "nutrient");
for (int i = 0; i < array.size(); i++) {
res.getNutrient().add(parseNutritionOrderOralDietNutrientComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("texture")) {
- JsonArray array = json.getAsJsonArray("texture");
+ JsonArray array = getJArray(json, "texture");
for (int i = 0; i < array.size(); i++) {
res.getTexture().add(parseNutritionOrderOralDietTextureComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("fluidConsistencyType")) {
- JsonArray array = json.getAsJsonArray("fluidConsistencyType");
+ JsonArray array = getJArray(json, "fluidConsistencyType");
for (int i = 0; i < array.size(); i++) {
res.getFluidConsistencyType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -21179,7 +21555,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_productName"))
parseElementProperties(getJObject(json, "_productName"), res.getProductNameElement());
if (json.has("schedule")) {
- JsonArray array = json.getAsJsonArray("schedule");
+ JsonArray array = getJArray(json, "schedule");
for (int i = 0; i < array.size(); i++) {
res.getSchedule().add(parseTiming(array.get(i).getAsJsonObject()));
}
@@ -21217,7 +21593,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("routeofAdministration"))
res.setRouteofAdministration(parseCodeableConcept(getJObject(json, "routeofAdministration")));
if (json.has("administration")) {
- JsonArray array = json.getAsJsonArray("administration");
+ JsonArray array = getJArray(json, "administration");
for (int i = 0; i < array.size(); i++) {
res.getAdministration().add(parseNutritionOrderEnteralFormulaAdministrationComponent(array.get(i).getAsJsonObject()));
}
@@ -21260,7 +21636,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -21268,31 +21644,31 @@ public class JsonParser extends JsonParserBase {
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
if (json.has("manufacturer")) {
- JsonArray array = json.getAsJsonArray("manufacturer");
+ JsonArray array = getJArray(json, "manufacturer");
for (int i = 0; i < array.size(); i++) {
res.getManufacturer().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("nutrient")) {
- JsonArray array = json.getAsJsonArray("nutrient");
+ JsonArray array = getJArray(json, "nutrient");
for (int i = 0; i < array.size(); i++) {
res.getNutrient().add(parseNutritionProductNutrientComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("ingredient")) {
- JsonArray array = json.getAsJsonArray("ingredient");
+ JsonArray array = getJArray(json, "ingredient");
for (int i = 0; i < array.size(); i++) {
res.getIngredient().add(parseNutritionProductIngredientComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("knownAllergen")) {
- JsonArray array = json.getAsJsonArray("knownAllergen");
+ JsonArray array = getJArray(json, "knownAllergen");
for (int i = 0; i < array.size(); i++) {
res.getKnownAllergen().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("productCharacteristic")) {
- JsonArray array = json.getAsJsonArray("productCharacteristic");
+ JsonArray array = getJArray(json, "productCharacteristic");
for (int i = 0; i < array.size(); i++) {
res.getProductCharacteristic().add(parseNutritionProductProductCharacteristicComponent(array.get(i).getAsJsonObject()));
}
@@ -21300,7 +21676,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("instance"))
res.setInstance(parseNutritionProductInstanceComponent(getJObject(json, "instance")));
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -21318,7 +21694,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("item"))
res.setItem(parseCodeableReference(getJObject(json, "item")));
if (json.has("amount")) {
- JsonArray array = json.getAsJsonArray("amount");
+ JsonArray array = getJArray(json, "amount");
for (int i = 0; i < array.size(); i++) {
res.getAmount().add(parseRatio(array.get(i).getAsJsonObject()));
}
@@ -21336,7 +21712,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("item"))
res.setItem(parseCodeableReference(getJObject(json, "item")));
if (json.has("amount")) {
- JsonArray array = json.getAsJsonArray("amount");
+ JsonArray array = getJArray(json, "amount");
for (int i = 0; i < array.size(); i++) {
res.getAmount().add(parseRatio(array.get(i).getAsJsonObject()));
}
@@ -21369,7 +21745,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("quantity"))
res.setQuantity(parseQuantity(getJObject(json, "quantity")));
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -21397,19 +21773,22 @@ public class JsonParser extends JsonParserBase {
protected void parseObservationProperties(JsonObject json, Observation res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
+ DataType instantiates = parseType("instantiates", json);
+ if (instantiates != null)
+ res.setInstantiates(instantiates);
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
res.getPartOf().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -21419,7 +21798,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -21429,7 +21808,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("subject"))
res.setSubject(parseReference(getJObject(json, "subject")));
if (json.has("focus")) {
- JsonArray array = json.getAsJsonArray("focus");
+ JsonArray array = getJArray(json, "focus");
for (int i = 0; i < array.size(); i++) {
res.getFocus().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -21444,7 +21823,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_issued"))
parseElementProperties(getJObject(json, "_issued"), res.getIssuedElement());
if (json.has("performer")) {
- JsonArray array = json.getAsJsonArray("performer");
+ JsonArray array = getJArray(json, "performer");
for (int i = 0; i < array.size(); i++) {
res.getPerformer().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -21455,13 +21834,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("dataAbsentReason"))
res.setDataAbsentReason(parseCodeableConcept(getJObject(json, "dataAbsentReason")));
if (json.has("interpretation")) {
- JsonArray array = json.getAsJsonArray("interpretation");
+ JsonArray array = getJArray(json, "interpretation");
for (int i = 0; i < array.size(); i++) {
res.getInterpretation().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -21475,25 +21854,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("device"))
res.setDevice(parseReference(getJObject(json, "device")));
if (json.has("referenceRange")) {
- JsonArray array = json.getAsJsonArray("referenceRange");
+ JsonArray array = getJArray(json, "referenceRange");
for (int i = 0; i < array.size(); i++) {
res.getReferenceRange().add(parseObservationReferenceRangeComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("hasMember")) {
- JsonArray array = json.getAsJsonArray("hasMember");
+ JsonArray array = getJArray(json, "hasMember");
for (int i = 0; i < array.size(); i++) {
res.getHasMember().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("derivedFrom")) {
- JsonArray array = json.getAsJsonArray("derivedFrom");
+ JsonArray array = getJArray(json, "derivedFrom");
for (int i = 0; i < array.size(); i++) {
res.getDerivedFrom().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("component")) {
- JsonArray array = json.getAsJsonArray("component");
+ JsonArray array = getJArray(json, "component");
for (int i = 0; i < array.size(); i++) {
res.getComponent().add(parseObservationComponentComponent(array.get(i).getAsJsonObject()));
}
@@ -21515,7 +21894,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("appliesTo")) {
- JsonArray array = json.getAsJsonArray("appliesTo");
+ JsonArray array = getJArray(json, "appliesTo");
for (int i = 0; i < array.size(); i++) {
res.getAppliesTo().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -21544,13 +21923,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("dataAbsentReason"))
res.setDataAbsentReason(parseCodeableConcept(getJObject(json, "dataAbsentReason")));
if (json.has("interpretation")) {
- JsonArray array = json.getAsJsonArray("interpretation");
+ JsonArray array = getJArray(json, "interpretation");
for (int i = 0; i < array.size(); i++) {
res.getInterpretation().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("referenceRange")) {
- JsonArray array = json.getAsJsonArray("referenceRange");
+ JsonArray array = getJArray(json, "referenceRange");
for (int i = 0; i < array.size(); i++) {
res.getReferenceRange().add(parseObservationReferenceRangeComponent(array.get(i).getAsJsonObject()));
}
@@ -21575,48 +21954,14 @@ public class JsonParser extends JsonParserBase {
res.setVersionElement(parseString(json.get("version").getAsString()));
if (json.has("_version"))
parseElementProperties(getJObject(json, "_version"), res.getVersionElement());
+ if (json.has("name"))
+ res.setNameElement(parseString(json.get("name").getAsString()));
+ if (json.has("_name"))
+ parseElementProperties(getJObject(json, "_name"), res.getNameElement());
if (json.has("title"))
res.setTitleElement(parseString(json.get("title").getAsString()));
if (json.has("_title"))
parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
- if (json.has("derivedFromCanonical")) {
- JsonArray array = json.getAsJsonArray("derivedFromCanonical");
- for (int i = 0; i < array.size(); i++) {
- if (array.get(i).isJsonNull()) {
- res.getDerivedFromCanonical().add(new CanonicalType());
- } else {;
- res.getDerivedFromCanonical().add(parseCanonical(array.get(i).getAsString()));
- }
- }
- };
- if (json.has("_derivedFromCanonical")) {
- JsonArray array = json.getAsJsonArray("_derivedFromCanonical");
- for (int i = 0; i < array.size(); i++) {
- if (i == res.getDerivedFromCanonical().size())
- res.getDerivedFromCanonical().add(parseCanonical(null));
- if (array.get(i) instanceof JsonObject)
- parseElementProperties(array.get(i).getAsJsonObject(), res.getDerivedFromCanonical().get(i));
- }
- };
- if (json.has("derivedFromUri")) {
- JsonArray array = json.getAsJsonArray("derivedFromUri");
- for (int i = 0; i < array.size(); i++) {
- if (array.get(i).isJsonNull()) {
- res.getDerivedFromUri().add(new UriType());
- } else {;
- res.getDerivedFromUri().add(parseUri(array.get(i).getAsString()));
- }
- }
- };
- if (json.has("_derivedFromUri")) {
- JsonArray array = json.getAsJsonArray("_derivedFromUri");
- for (int i = 0; i < array.size(); i++) {
- if (i == res.getDerivedFromUri().size())
- res.getDerivedFromUri().add(parseUri(null));
- if (array.get(i) instanceof JsonObject)
- parseElementProperties(array.get(i).getAsJsonObject(), res.getDerivedFromUri().get(i));
- }
- };
if (json.has("status"))
res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
if (json.has("_status"))
@@ -21625,9 +21970,6 @@ public class JsonParser extends JsonParserBase {
res.setExperimentalElement(parseBoolean(json.get("experimental").getAsBoolean()));
if (json.has("_experimental"))
parseElementProperties(getJObject(json, "_experimental"), res.getExperimentalElement());
- DataType subject = parseType("subject", json);
- if (subject != null)
- res.setSubject(subject);
if (json.has("date"))
res.setDateElement(parseDateTime(json.get("date").getAsString()));
if (json.has("_date"))
@@ -21635,7 +21977,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("publisher"))
res.setPublisher(parseReference(getJObject(json, "publisher")));
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -21645,13 +21987,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -21674,10 +22016,50 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_lastReviewDate"), res.getLastReviewDateElement());
if (json.has("effectivePeriod"))
res.setEffectivePeriod(parsePeriod(getJObject(json, "effectivePeriod")));
+ if (json.has("derivedFromCanonical")) {
+ JsonArray array = getJArray(json, "derivedFromCanonical");
+ for (int i = 0; i < array.size(); i++) {
+ if (array.get(i).isJsonNull()) {
+ res.getDerivedFromCanonical().add(new CanonicalType());
+ } else {;
+ res.getDerivedFromCanonical().add(parseCanonical(array.get(i).getAsString()));
+ }
+ }
+ };
+ if (json.has("_derivedFromCanonical")) {
+ JsonArray array = getJArray(json, "_derivedFromCanonical");
+ for (int i = 0; i < array.size(); i++) {
+ if (i == res.getDerivedFromCanonical().size())
+ res.getDerivedFromCanonical().add(parseCanonical(null));
+ if (array.get(i) instanceof JsonObject)
+ parseElementProperties(array.get(i).getAsJsonObject(), res.getDerivedFromCanonical().get(i));
+ }
+ };
+ if (json.has("derivedFromUri")) {
+ JsonArray array = getJArray(json, "derivedFromUri");
+ for (int i = 0; i < array.size(); i++) {
+ if (array.get(i).isJsonNull()) {
+ res.getDerivedFromUri().add(new UriType());
+ } else {;
+ res.getDerivedFromUri().add(parseUri(array.get(i).getAsString()));
+ }
+ }
+ };
+ if (json.has("_derivedFromUri")) {
+ JsonArray array = getJArray(json, "_derivedFromUri");
+ for (int i = 0; i < array.size(); i++) {
+ if (i == res.getDerivedFromUri().size())
+ res.getDerivedFromUri().add(parseUri(null));
+ if (array.get(i) instanceof JsonObject)
+ parseElementProperties(array.get(i).getAsJsonObject(), res.getDerivedFromUri().get(i));
+ }
+ };
+ if (json.has("subject"))
+ res.setSubject(parseCodeableConcept(getJObject(json, "subject")));
if (json.has("performerType"))
res.setPerformerType(parseCodeableConcept(getJObject(json, "performerType")));
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -21685,7 +22067,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
if (json.has("permittedDataType")) {
- JsonArray array = json.getAsJsonArray("permittedDataType");
+ JsonArray array = getJArray(json, "permittedDataType");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPermittedDataType().add(new Enumeration(new ObservationDefinition.ObservationDataTypeEnumFactory(), ObservationDefinition.ObservationDataType.NULL));
@@ -21695,7 +22077,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_permittedDataType")) {
- JsonArray array = json.getAsJsonArray("_permittedDataType");
+ JsonArray array = getJArray(json, "_permittedDataType");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPermittedDataType().size())
res.getPermittedDataType().add(parseEnumeration(null, ObservationDefinition.ObservationDataType.NULL, new ObservationDefinition.ObservationDataTypeEnumFactory()));
@@ -21711,38 +22093,38 @@ public class JsonParser extends JsonParserBase {
res.setBodySite(parseCodeableConcept(getJObject(json, "bodySite")));
if (json.has("method"))
res.setMethod(parseCodeableConcept(getJObject(json, "method")));
- if (json.has("specimen"))
- res.setSpecimen(parseReference(getJObject(json, "specimen")));
- if (json.has("device"))
- res.setDevice(parseReference(getJObject(json, "device")));
+ if (json.has("specimen")) {
+ JsonArray array = getJArray(json, "specimen");
+ for (int i = 0; i < array.size(); i++) {
+ res.getSpecimen().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("device")) {
+ JsonArray array = getJArray(json, "device");
+ for (int i = 0; i < array.size(); i++) {
+ res.getDevice().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("preferredReportName"))
res.setPreferredReportNameElement(parseString(json.get("preferredReportName").getAsString()));
if (json.has("_preferredReportName"))
parseElementProperties(getJObject(json, "_preferredReportName"), res.getPreferredReportNameElement());
if (json.has("quantitativeDetails"))
res.setQuantitativeDetails(parseObservationDefinitionQuantitativeDetailsComponent(getJObject(json, "quantitativeDetails")));
- if (json.has("qualifiedInterval")) {
- JsonArray array = json.getAsJsonArray("qualifiedInterval");
+ if (json.has("qualifiedValue")) {
+ JsonArray array = getJArray(json, "qualifiedValue");
for (int i = 0; i < array.size(); i++) {
- res.getQualifiedInterval().add(parseObservationDefinitionQualifiedIntervalComponent(array.get(i).getAsJsonObject()));
+ res.getQualifiedValue().add(parseObservationDefinitionQualifiedValueComponent(array.get(i).getAsJsonObject()));
}
};
- if (json.has("validCodedValueSet"))
- res.setValidCodedValueSet(parseReference(getJObject(json, "validCodedValueSet")));
- if (json.has("normalCodedValueSet"))
- res.setNormalCodedValueSet(parseReference(getJObject(json, "normalCodedValueSet")));
- if (json.has("abnormalCodedValueSet"))
- res.setAbnormalCodedValueSet(parseReference(getJObject(json, "abnormalCodedValueSet")));
- if (json.has("criticalCodedValueSet"))
- res.setCriticalCodedValueSet(parseReference(getJObject(json, "criticalCodedValueSet")));
if (json.has("hasMember")) {
- JsonArray array = json.getAsJsonArray("hasMember");
+ JsonArray array = getJArray(json, "hasMember");
for (int i = 0; i < array.size(); i++) {
res.getHasMember().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("component")) {
- JsonArray array = json.getAsJsonArray("component");
+ JsonArray array = getJArray(json, "component");
for (int i = 0; i < array.size(); i++) {
res.getComponent().add(parseObservationDefinitionComponentComponent(array.get(i).getAsJsonObject()));
}
@@ -21757,10 +22139,10 @@ public class JsonParser extends JsonParserBase {
protected void parseObservationDefinitionQuantitativeDetailsComponentProperties(JsonObject json, ObservationDefinition.ObservationDefinitionQuantitativeDetailsComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- if (json.has("customaryUnit"))
- res.setCustomaryUnit(parseCodeableConcept(getJObject(json, "customaryUnit")));
if (json.has("unit"))
res.setUnit(parseCodeableConcept(getJObject(json, "unit")));
+ if (json.has("customaryUnit"))
+ res.setCustomaryUnit(parseCodeableConcept(getJObject(json, "customaryUnit")));
if (json.has("conversionFactor"))
res.setConversionFactorElement(parseDecimal(json.get("conversionFactor").getAsBigDecimal()));
if (json.has("_conversionFactor"))
@@ -21771,24 +22153,18 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_decimalPrecision"), res.getDecimalPrecisionElement());
}
- protected ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent parseObservationDefinitionQualifiedIntervalComponent(JsonObject json) throws IOException, FHIRFormatError {
- ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent res = new ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent();
- parseObservationDefinitionQualifiedIntervalComponentProperties(json, res);
+ protected ObservationDefinition.ObservationDefinitionQualifiedValueComponent parseObservationDefinitionQualifiedValueComponent(JsonObject json) throws IOException, FHIRFormatError {
+ ObservationDefinition.ObservationDefinitionQualifiedValueComponent res = new ObservationDefinition.ObservationDefinitionQualifiedValueComponent();
+ parseObservationDefinitionQualifiedValueComponentProperties(json, res);
return res;
}
- protected void parseObservationDefinitionQualifiedIntervalComponentProperties(JsonObject json, ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent res) throws IOException, FHIRFormatError {
+ protected void parseObservationDefinitionQualifiedValueComponentProperties(JsonObject json, ObservationDefinition.ObservationDefinitionQualifiedValueComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- if (json.has("category"))
- res.setCategoryElement(parseEnumeration(json.get("category").getAsString(), ObservationDefinition.ObservationRangeCategory.NULL, new ObservationDefinition.ObservationRangeCategoryEnumFactory()));
- if (json.has("_category"))
- parseElementProperties(getJObject(json, "_category"), res.getCategoryElement());
- if (json.has("range"))
- res.setRange(parseRange(getJObject(json, "range")));
if (json.has("context"))
res.setContext(parseCodeableConcept(getJObject(json, "context")));
if (json.has("appliesTo")) {
- JsonArray array = json.getAsJsonArray("appliesTo");
+ JsonArray array = getJArray(json, "appliesTo");
for (int i = 0; i < array.size(); i++) {
res.getAppliesTo().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -21805,6 +22181,28 @@ public class JsonParser extends JsonParserBase {
res.setConditionElement(parseString(json.get("condition").getAsString()));
if (json.has("_condition"))
parseElementProperties(getJObject(json, "_condition"), res.getConditionElement());
+ if (json.has("rangeCategory"))
+ res.setRangeCategoryElement(parseEnumeration(json.get("rangeCategory").getAsString(), ObservationDefinition.ObservationRangeCategory.NULL, new ObservationDefinition.ObservationRangeCategoryEnumFactory()));
+ if (json.has("_rangeCategory"))
+ parseElementProperties(getJObject(json, "_rangeCategory"), res.getRangeCategoryElement());
+ if (json.has("range"))
+ res.setRange(parseRange(getJObject(json, "range")));
+ if (json.has("validCodedValueSet"))
+ res.setValidCodedValueSetElement(parseCanonical(json.get("validCodedValueSet").getAsString()));
+ if (json.has("_validCodedValueSet"))
+ parseElementProperties(getJObject(json, "_validCodedValueSet"), res.getValidCodedValueSetElement());
+ if (json.has("normalCodedValueSet"))
+ res.setNormalCodedValueSetElement(parseCanonical(json.get("normalCodedValueSet").getAsString()));
+ if (json.has("_normalCodedValueSet"))
+ parseElementProperties(getJObject(json, "_normalCodedValueSet"), res.getNormalCodedValueSetElement());
+ if (json.has("abnormalCodedValueSet"))
+ res.setAbnormalCodedValueSetElement(parseCanonical(json.get("abnormalCodedValueSet").getAsString()));
+ if (json.has("_abnormalCodedValueSet"))
+ parseElementProperties(getJObject(json, "_abnormalCodedValueSet"), res.getAbnormalCodedValueSetElement());
+ if (json.has("criticalCodedValueSet"))
+ res.setCriticalCodedValueSetElement(parseCanonical(json.get("criticalCodedValueSet").getAsString()));
+ if (json.has("_criticalCodedValueSet"))
+ parseElementProperties(getJObject(json, "_criticalCodedValueSet"), res.getCriticalCodedValueSetElement());
}
protected ObservationDefinition.ObservationDefinitionComponentComponent parseObservationDefinitionComponentComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -21818,7 +22216,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
if (json.has("permittedDataType")) {
- JsonArray array = json.getAsJsonArray("permittedDataType");
+ JsonArray array = getJArray(json, "permittedDataType");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPermittedDataType().add(new Enumeration(new ObservationDefinition.ObservationDataTypeEnumFactory(), ObservationDefinition.ObservationDataType.NULL));
@@ -21828,7 +22226,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_permittedDataType")) {
- JsonArray array = json.getAsJsonArray("_permittedDataType");
+ JsonArray array = getJArray(json, "_permittedDataType");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPermittedDataType().size())
res.getPermittedDataType().add(parseEnumeration(null, ObservationDefinition.ObservationDataType.NULL, new ObservationDefinition.ObservationDataTypeEnumFactory()));
@@ -21838,10 +22236,10 @@ public class JsonParser extends JsonParserBase {
};
if (json.has("quantitativeDetails"))
res.setQuantitativeDetails(parseObservationDefinitionQuantitativeDetailsComponent(getJObject(json, "quantitativeDetails")));
- if (json.has("qualifiedInterval")) {
- JsonArray array = json.getAsJsonArray("qualifiedInterval");
+ if (json.has("qualifiedValue")) {
+ JsonArray array = getJArray(json, "qualifiedValue");
for (int i = 0; i < array.size(); i++) {
- res.getQualifiedInterval().add(parseObservationDefinitionQualifiedIntervalComponent(array.get(i).getAsJsonObject()));
+ res.getQualifiedValue().add(parseObservationDefinitionQualifiedValueComponent(array.get(i).getAsJsonObject()));
}
};
}
@@ -21891,7 +22289,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -21901,13 +22299,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -21933,7 +22331,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_base"))
parseElementProperties(getJObject(json, "_base"), res.getBaseElement());
if (json.has("resource")) {
- JsonArray array = json.getAsJsonArray("resource");
+ JsonArray array = getJArray(json, "resource");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getResource().add(new CodeType());
@@ -21943,7 +22341,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_resource")) {
- JsonArray array = json.getAsJsonArray("_resource");
+ JsonArray array = getJArray(json, "_resource");
for (int i = 0; i < array.size(); i++) {
if (i == res.getResource().size())
res.getResource().add(parseCode(null));
@@ -21972,13 +22370,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_outputProfile"))
parseElementProperties(getJObject(json, "_outputProfile"), res.getOutputProfileElement());
if (json.has("parameter")) {
- JsonArray array = json.getAsJsonArray("parameter");
+ JsonArray array = getJArray(json, "parameter");
for (int i = 0; i < array.size(); i++) {
res.getParameter().add(parseOperationDefinitionParameterComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("overload")) {
- JsonArray array = json.getAsJsonArray("overload");
+ JsonArray array = getJArray(json, "overload");
for (int i = 0; i < array.size(); i++) {
res.getOverload().add(parseOperationDefinitionOverloadComponent(array.get(i).getAsJsonObject()));
}
@@ -22018,7 +22416,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_type"))
parseElementProperties(getJObject(json, "_type"), res.getTypeElement());
if (json.has("targetProfile")) {
- JsonArray array = json.getAsJsonArray("targetProfile");
+ JsonArray array = getJArray(json, "targetProfile");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getTargetProfile().add(new CanonicalType());
@@ -22028,7 +22426,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_targetProfile")) {
- JsonArray array = json.getAsJsonArray("_targetProfile");
+ JsonArray array = getJArray(json, "_targetProfile");
for (int i = 0; i < array.size(); i++) {
if (i == res.getTargetProfile().size())
res.getTargetProfile().add(parseCanonical(null));
@@ -22043,13 +22441,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("binding"))
res.setBinding(parseOperationDefinitionParameterBindingComponent(getJObject(json, "binding")));
if (json.has("referencedFrom")) {
- JsonArray array = json.getAsJsonArray("referencedFrom");
+ JsonArray array = getJArray(json, "referencedFrom");
for (int i = 0; i < array.size(); i++) {
res.getReferencedFrom().add(parseOperationDefinitionParameterReferencedFromComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("part")) {
- JsonArray array = json.getAsJsonArray("part");
+ JsonArray array = getJArray(json, "part");
for (int i = 0; i < array.size(); i++) {
res.getPart().add(parseOperationDefinitionParameterComponent(array.get(i).getAsJsonObject()));
}
@@ -22101,7 +22499,7 @@ public class JsonParser extends JsonParserBase {
protected void parseOperationDefinitionOverloadComponentProperties(JsonObject json, OperationDefinition.OperationDefinitionOverloadComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("parameterName")) {
- JsonArray array = json.getAsJsonArray("parameterName");
+ JsonArray array = getJArray(json, "parameterName");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getParameterName().add(new StringType());
@@ -22111,7 +22509,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_parameterName")) {
- JsonArray array = json.getAsJsonArray("_parameterName");
+ JsonArray array = getJArray(json, "_parameterName");
for (int i = 0; i < array.size(); i++) {
if (i == res.getParameterName().size())
res.getParameterName().add(parseString(null));
@@ -22134,7 +22532,7 @@ public class JsonParser extends JsonParserBase {
protected void parseOperationOutcomeProperties(JsonObject json, OperationOutcome res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("issue")) {
- JsonArray array = json.getAsJsonArray("issue");
+ JsonArray array = getJArray(json, "issue");
for (int i = 0; i < array.size(); i++) {
res.getIssue().add(parseOperationOutcomeIssueComponent(array.get(i).getAsJsonObject()));
}
@@ -22164,7 +22562,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_diagnostics"))
parseElementProperties(getJObject(json, "_diagnostics"), res.getDiagnosticsElement());
if (json.has("location")) {
- JsonArray array = json.getAsJsonArray("location");
+ JsonArray array = getJArray(json, "location");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getLocation().add(new StringType());
@@ -22174,7 +22572,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_location")) {
- JsonArray array = json.getAsJsonArray("_location");
+ JsonArray array = getJArray(json, "_location");
for (int i = 0; i < array.size(); i++) {
if (i == res.getLocation().size())
res.getLocation().add(parseString(null));
@@ -22183,7 +22581,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("expression")) {
- JsonArray array = json.getAsJsonArray("expression");
+ JsonArray array = getJArray(json, "expression");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getExpression().add(new StringType());
@@ -22193,7 +22591,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_expression")) {
- JsonArray array = json.getAsJsonArray("_expression");
+ JsonArray array = getJArray(json, "_expression");
for (int i = 0; i < array.size(); i++) {
if (i == res.getExpression().size())
res.getExpression().add(parseString(null));
@@ -22212,7 +22610,7 @@ public class JsonParser extends JsonParserBase {
protected void parseOrganizationProperties(JsonObject json, Organization res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -22222,7 +22620,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_active"))
parseElementProperties(getJObject(json, "_active"), res.getActiveElement());
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -22232,7 +22630,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_name"))
parseElementProperties(getJObject(json, "_name"), res.getNameElement());
if (json.has("alias")) {
- JsonArray array = json.getAsJsonArray("alias");
+ JsonArray array = getJArray(json, "alias");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getAlias().add(new StringType());
@@ -22242,7 +22640,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_alias")) {
- JsonArray array = json.getAsJsonArray("_alias");
+ JsonArray array = getJArray(json, "_alias");
for (int i = 0; i < array.size(); i++) {
if (i == res.getAlias().size())
res.getAlias().add(parseString(null));
@@ -22251,13 +22649,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
};
if (json.has("address")) {
- JsonArray array = json.getAsJsonArray("address");
+ JsonArray array = getJArray(json, "address");
for (int i = 0; i < array.size(); i++) {
res.getAddress().add(parseAddress(array.get(i).getAsJsonObject()));
}
@@ -22265,13 +22663,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("partOf"))
res.setPartOf(parseReference(getJObject(json, "partOf")));
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseOrganizationContactComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("endpoint")) {
- JsonArray array = json.getAsJsonArray("endpoint");
+ JsonArray array = getJArray(json, "endpoint");
for (int i = 0; i < array.size(); i++) {
res.getEndpoint().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -22291,7 +22689,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("name"))
res.setName(parseHumanName(getJObject(json, "name")));
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
@@ -22309,7 +22707,7 @@ public class JsonParser extends JsonParserBase {
protected void parseOrganizationAffiliationProperties(JsonObject json, OrganizationAffiliation res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -22325,43 +22723,43 @@ public class JsonParser extends JsonParserBase {
if (json.has("participatingOrganization"))
res.setParticipatingOrganization(parseReference(getJObject(json, "participatingOrganization")));
if (json.has("network")) {
- JsonArray array = json.getAsJsonArray("network");
+ JsonArray array = getJArray(json, "network");
for (int i = 0; i < array.size(); i++) {
res.getNetwork().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("specialty")) {
- JsonArray array = json.getAsJsonArray("specialty");
+ JsonArray array = getJArray(json, "specialty");
for (int i = 0; i < array.size(); i++) {
res.getSpecialty().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("location")) {
- JsonArray array = json.getAsJsonArray("location");
+ JsonArray array = getJArray(json, "location");
for (int i = 0; i < array.size(); i++) {
res.getLocation().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("healthcareService")) {
- JsonArray array = json.getAsJsonArray("healthcareService");
+ JsonArray array = getJArray(json, "healthcareService");
for (int i = 0; i < array.size(); i++) {
res.getHealthcareService().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
};
if (json.has("endpoint")) {
- JsonArray array = json.getAsJsonArray("endpoint");
+ JsonArray array = getJArray(json, "endpoint");
for (int i = 0; i < array.size(); i++) {
res.getEndpoint().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -22377,7 +22775,7 @@ public class JsonParser extends JsonParserBase {
protected void parsePackagedProductDefinitionProperties(JsonObject json, PackagedProductDefinition res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -22389,7 +22787,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("subject")) {
- JsonArray array = json.getAsJsonArray("subject");
+ JsonArray array = getJArray(json, "subject");
for (int i = 0; i < array.size(); i++) {
res.getSubject().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -22400,6 +22798,12 @@ public class JsonParser extends JsonParserBase {
res.setStatusDateElement(parseDateTime(json.get("statusDate").getAsString()));
if (json.has("_statusDate"))
parseElementProperties(getJObject(json, "_statusDate"), res.getStatusDateElement());
+ if (json.has("containedItemQuantity")) {
+ JsonArray array = getJArray(json, "containedItemQuantity");
+ for (int i = 0; i < array.size(); i++) {
+ res.getContainedItemQuantity().add(parseQuantity(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("description"))
res.setDescriptionElement(parseMarkdown(json.get("description").getAsString()));
if (json.has("_description"))
@@ -22407,13 +22811,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("legalStatusOfSupply"))
res.setLegalStatusOfSupply(parseCodeableConcept(getJObject(json, "legalStatusOfSupply")));
if (json.has("marketingStatus")) {
- JsonArray array = json.getAsJsonArray("marketingStatus");
+ JsonArray array = getJArray(json, "marketingStatus");
for (int i = 0; i < array.size(); i++) {
res.getMarketingStatus().add(parseMarketingStatus(array.get(i).getAsJsonObject()));
}
};
if (json.has("characteristic")) {
- JsonArray array = json.getAsJsonArray("characteristic");
+ JsonArray array = getJArray(json, "characteristic");
for (int i = 0; i < array.size(); i++) {
res.getCharacteristic().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -22425,37 +22829,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("marketingAuthorization"))
res.setMarketingAuthorization(parseReference(getJObject(json, "marketingAuthorization")));
if (json.has("manufacturer")) {
- JsonArray array = json.getAsJsonArray("manufacturer");
+ JsonArray array = getJArray(json, "manufacturer");
for (int i = 0; i < array.size(); i++) {
res.getManufacturer().add(parseReference(array.get(i).getAsJsonObject()));
}
};
- if (json.has("batchIdentifier")) {
- JsonArray array = json.getAsJsonArray("batchIdentifier");
+ if (json.has("attachedDocument")) {
+ JsonArray array = getJArray(json, "attachedDocument");
for (int i = 0; i < array.size(); i++) {
- res.getBatchIdentifier().add(parsePackagedProductDefinitionBatchIdentifierComponent(array.get(i).getAsJsonObject()));
+ res.getAttachedDocument().add(parseReference(array.get(i).getAsJsonObject()));
}
};
- if (json.has("package")) {
- JsonArray array = json.getAsJsonArray("package");
- for (int i = 0; i < array.size(); i++) {
- res.getPackage().add(parsePackagedProductDefinitionPackageComponent(array.get(i).getAsJsonObject()));
- }
- };
- }
-
- protected PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent parsePackagedProductDefinitionBatchIdentifierComponent(JsonObject json) throws IOException, FHIRFormatError {
- PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent res = new PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent();
- parsePackagedProductDefinitionBatchIdentifierComponentProperties(json, res);
- return res;
- }
-
- protected void parsePackagedProductDefinitionBatchIdentifierComponentProperties(JsonObject json, PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("outerPackaging"))
- res.setOuterPackaging(parseIdentifier(getJObject(json, "outerPackaging")));
- if (json.has("immediatePackaging"))
- res.setImmediatePackaging(parseIdentifier(getJObject(json, "immediatePackaging")));
+ if (json.has("package"))
+ res.setPackage(parsePackagedProductDefinitionPackageComponent(getJObject(json, "package")));
}
protected PackagedProductDefinition.PackagedProductDefinitionPackageComponent parsePackagedProductDefinitionPackageComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -22467,7 +22853,7 @@ public class JsonParser extends JsonParserBase {
protected void parsePackagedProductDefinitionPackageComponentProperties(JsonObject json, PackagedProductDefinition.PackagedProductDefinitionPackageComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -22479,43 +22865,43 @@ public class JsonParser extends JsonParserBase {
if (json.has("_quantity"))
parseElementProperties(getJObject(json, "_quantity"), res.getQuantityElement());
if (json.has("material")) {
- JsonArray array = json.getAsJsonArray("material");
+ JsonArray array = getJArray(json, "material");
for (int i = 0; i < array.size(); i++) {
res.getMaterial().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("alternateMaterial")) {
- JsonArray array = json.getAsJsonArray("alternateMaterial");
+ JsonArray array = getJArray(json, "alternateMaterial");
for (int i = 0; i < array.size(); i++) {
res.getAlternateMaterial().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("shelfLifeStorage")) {
- JsonArray array = json.getAsJsonArray("shelfLifeStorage");
+ JsonArray array = getJArray(json, "shelfLifeStorage");
for (int i = 0; i < array.size(); i++) {
res.getShelfLifeStorage().add(parseProductShelfLife(array.get(i).getAsJsonObject()));
}
};
if (json.has("manufacturer")) {
- JsonArray array = json.getAsJsonArray("manufacturer");
+ JsonArray array = getJArray(json, "manufacturer");
for (int i = 0; i < array.size(); i++) {
res.getManufacturer().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("property")) {
- JsonArray array = json.getAsJsonArray("property");
+ JsonArray array = getJArray(json, "property");
for (int i = 0; i < array.size(); i++) {
res.getProperty().add(parsePackagedProductDefinitionPackagePropertyComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("containedItem")) {
- JsonArray array = json.getAsJsonArray("containedItem");
+ JsonArray array = getJArray(json, "containedItem");
for (int i = 0; i < array.size(); i++) {
res.getContainedItem().add(parsePackagedProductDefinitionPackageContainedItemComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("package")) {
- JsonArray array = json.getAsJsonArray("package");
+ JsonArray array = getJArray(json, "package");
for (int i = 0; i < array.size(); i++) {
res.getPackage().add(parsePackagedProductDefinitionPackageComponent(array.get(i).getAsJsonObject()));
}
@@ -22546,9 +22932,9 @@ public class JsonParser extends JsonParserBase {
protected void parsePackagedProductDefinitionPackageContainedItemComponentProperties(JsonObject json, PackagedProductDefinition.PackagedProductDefinitionPackageContainedItemComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("item")) {
- JsonArray array = json.getAsJsonArray("item");
+ JsonArray array = getJArray(json, "item");
for (int i = 0; i < array.size(); i++) {
- res.getItem().add(parseReference(array.get(i).getAsJsonObject()));
+ res.getItem().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
DataType amount = parseType("amount", json);
@@ -22565,7 +22951,7 @@ public class JsonParser extends JsonParserBase {
protected void parseParametersProperties(JsonObject json, Parameters res) throws IOException, FHIRFormatError {
parseResourceProperties(json, res);
if (json.has("parameter")) {
- JsonArray array = json.getAsJsonArray("parameter");
+ JsonArray array = getJArray(json, "parameter");
for (int i = 0; i < array.size(); i++) {
res.getParameter().add(parseParametersParameterComponent(array.get(i).getAsJsonObject()));
}
@@ -22590,7 +22976,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("resource"))
res.setResource(parseResource(getJObject(json, "resource")));
if (json.has("part")) {
- JsonArray array = json.getAsJsonArray("part");
+ JsonArray array = getJArray(json, "part");
for (int i = 0; i < array.size(); i++) {
res.getPart().add(parseParametersParameterComponent(array.get(i).getAsJsonObject()));
}
@@ -22606,7 +22992,7 @@ public class JsonParser extends JsonParserBase {
protected void parsePatientProperties(JsonObject json, Patient res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -22616,13 +23002,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_active"))
parseElementProperties(getJObject(json, "_active"), res.getActiveElement());
if (json.has("name")) {
- JsonArray array = json.getAsJsonArray("name");
+ JsonArray array = getJArray(json, "name");
for (int i = 0; i < array.size(); i++) {
res.getName().add(parseHumanName(array.get(i).getAsJsonObject()));
}
};
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
@@ -22639,7 +23025,7 @@ public class JsonParser extends JsonParserBase {
if (deceased != null)
res.setDeceased(deceased);
if (json.has("address")) {
- JsonArray array = json.getAsJsonArray("address");
+ JsonArray array = getJArray(json, "address");
for (int i = 0; i < array.size(); i++) {
res.getAddress().add(parseAddress(array.get(i).getAsJsonObject()));
}
@@ -22650,25 +23036,25 @@ public class JsonParser extends JsonParserBase {
if (multipleBirth != null)
res.setMultipleBirth(multipleBirth);
if (json.has("photo")) {
- JsonArray array = json.getAsJsonArray("photo");
+ JsonArray array = getJArray(json, "photo");
for (int i = 0; i < array.size(); i++) {
res.getPhoto().add(parseAttachment(array.get(i).getAsJsonObject()));
}
};
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parsePatientContactComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("communication")) {
- JsonArray array = json.getAsJsonArray("communication");
+ JsonArray array = getJArray(json, "communication");
for (int i = 0; i < array.size(); i++) {
res.getCommunication().add(parsePatientCommunicationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("generalPractitioner")) {
- JsonArray array = json.getAsJsonArray("generalPractitioner");
+ JsonArray array = getJArray(json, "generalPractitioner");
for (int i = 0; i < array.size(); i++) {
res.getGeneralPractitioner().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -22676,7 +23062,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("managingOrganization"))
res.setManagingOrganization(parseReference(getJObject(json, "managingOrganization")));
if (json.has("link")) {
- JsonArray array = json.getAsJsonArray("link");
+ JsonArray array = getJArray(json, "link");
for (int i = 0; i < array.size(); i++) {
res.getLink().add(parsePatientLinkComponent(array.get(i).getAsJsonObject()));
}
@@ -22692,7 +23078,7 @@ public class JsonParser extends JsonParserBase {
protected void parsePatientContactComponentProperties(JsonObject json, Patient.ContactComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("relationship")) {
- JsonArray array = json.getAsJsonArray("relationship");
+ JsonArray array = getJArray(json, "relationship");
for (int i = 0; i < array.size(); i++) {
res.getRelationship().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -22700,7 +23086,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("name"))
res.setName(parseHumanName(getJObject(json, "name")));
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
@@ -22758,7 +23144,7 @@ public class JsonParser extends JsonParserBase {
protected void parsePaymentNoticeProperties(JsonObject json, PaymentNotice res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -22802,7 +23188,7 @@ public class JsonParser extends JsonParserBase {
protected void parsePaymentReconciliationProperties(JsonObject json, PaymentReconciliation res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -22824,7 +23210,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("requestor"))
res.setRequestor(parseReference(getJObject(json, "requestor")));
if (json.has("outcome"))
- res.setOutcomeElement(parseEnumeration(json.get("outcome").getAsString(), Enumerations.ClaimProcessingCodes.NULL, new Enumerations.ClaimProcessingCodesEnumFactory()));
+ res.setOutcomeElement(parseEnumeration(json.get("outcome").getAsString(), PaymentReconciliation.PaymentOutcome.NULL, new PaymentReconciliation.PaymentOutcomeEnumFactory()));
if (json.has("_outcome"))
parseElementProperties(getJObject(json, "_outcome"), res.getOutcomeElement());
if (json.has("disposition"))
@@ -22840,7 +23226,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("paymentIdentifier"))
res.setPaymentIdentifier(parseIdentifier(getJObject(json, "paymentIdentifier")));
if (json.has("detail")) {
- JsonArray array = json.getAsJsonArray("detail");
+ JsonArray array = getJArray(json, "detail");
for (int i = 0; i < array.size(); i++) {
res.getDetail().add(parsePaymentReconciliationDetailsComponent(array.get(i).getAsJsonObject()));
}
@@ -22848,7 +23234,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("formCode"))
res.setFormCode(parseCodeableConcept(getJObject(json, "formCode")));
if (json.has("processNote")) {
- JsonArray array = json.getAsJsonArray("processNote");
+ JsonArray array = getJArray(json, "processNote");
for (int i = 0; i < array.size(); i++) {
res.getProcessNote().add(parsePaymentReconciliationNotesComponent(array.get(i).getAsJsonObject()));
}
@@ -22922,7 +23308,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("asserter"))
res.setAsserter(parseReference(getJObject(json, "asserter")));
if (json.has("assertionDate")) {
- JsonArray array = json.getAsJsonArray("assertionDate");
+ JsonArray array = getJArray(json, "assertionDate");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getAssertionDate().add(new DateTimeType());
@@ -22932,7 +23318,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_assertionDate")) {
- JsonArray array = json.getAsJsonArray("_assertionDate");
+ JsonArray array = getJArray(json, "_assertionDate");
for (int i = 0; i < array.size(); i++) {
if (i == res.getAssertionDate().size())
res.getAssertionDate().add(parseDateTime(null));
@@ -22943,19 +23329,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("validity"))
res.setValidity(parsePeriod(getJObject(json, "validity")));
if (json.has("purpose")) {
- JsonArray array = json.getAsJsonArray("purpose");
+ JsonArray array = getJArray(json, "purpose");
for (int i = 0; i < array.size(); i++) {
res.getPurpose().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("dataScope")) {
- JsonArray array = json.getAsJsonArray("dataScope");
+ JsonArray array = getJArray(json, "dataScope");
for (int i = 0; i < array.size(); i++) {
res.getDataScope().add(parseExpression(array.get(i).getAsJsonObject()));
}
};
if (json.has("processingActivity")) {
- JsonArray array = json.getAsJsonArray("processingActivity");
+ JsonArray array = getJArray(json, "processingActivity");
for (int i = 0; i < array.size(); i++) {
res.getProcessingActivity().add(parsePermissionProcessingActivityComponent(array.get(i).getAsJsonObject()));
}
@@ -22963,7 +23349,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("justification"))
res.setJustification(parsePermissionJustificationComponent(getJObject(json, "justification")));
if (json.has("usageLimitations")) {
- JsonArray array = json.getAsJsonArray("usageLimitations");
+ JsonArray array = getJArray(json, "usageLimitations");
for (int i = 0; i < array.size(); i++) {
res.getUsageLimitations().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -22979,19 +23365,19 @@ public class JsonParser extends JsonParserBase {
protected void parsePermissionProcessingActivityComponentProperties(JsonObject json, Permission.PermissionProcessingActivityComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("partyReference")) {
- JsonArray array = json.getAsJsonArray("partyReference");
+ JsonArray array = getJArray(json, "partyReference");
for (int i = 0; i < array.size(); i++) {
res.getPartyReference().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("partyCodeableConcept")) {
- JsonArray array = json.getAsJsonArray("partyCodeableConcept");
+ JsonArray array = getJArray(json, "partyCodeableConcept");
for (int i = 0; i < array.size(); i++) {
res.getPartyCodeableConcept().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("purpose")) {
- JsonArray array = json.getAsJsonArray("purpose");
+ JsonArray array = getJArray(json, "purpose");
for (int i = 0; i < array.size(); i++) {
res.getPurpose().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -23007,13 +23393,13 @@ public class JsonParser extends JsonParserBase {
protected void parsePermissionJustificationComponentProperties(JsonObject json, Permission.PermissionJustificationComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("evidence")) {
- JsonArray array = json.getAsJsonArray("evidence");
+ JsonArray array = getJArray(json, "evidence");
for (int i = 0; i < array.size(); i++) {
res.getEvidence().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("grounds")) {
- JsonArray array = json.getAsJsonArray("grounds");
+ JsonArray array = getJArray(json, "grounds");
for (int i = 0; i < array.size(); i++) {
res.getGrounds().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -23029,19 +23415,19 @@ public class JsonParser extends JsonParserBase {
protected void parsePersonProperties(JsonObject json, Person res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("name")) {
- JsonArray array = json.getAsJsonArray("name");
+ JsonArray array = getJArray(json, "name");
for (int i = 0; i < array.size(); i++) {
res.getName().add(parseHumanName(array.get(i).getAsJsonObject()));
}
};
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
@@ -23055,7 +23441,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_birthDate"))
parseElementProperties(getJObject(json, "_birthDate"), res.getBirthDateElement());
if (json.has("address")) {
- JsonArray array = json.getAsJsonArray("address");
+ JsonArray array = getJArray(json, "address");
for (int i = 0; i < array.size(); i++) {
res.getAddress().add(parseAddress(array.get(i).getAsJsonObject()));
}
@@ -23069,7 +23455,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_active"))
parseElementProperties(getJObject(json, "_active"), res.getActiveElement());
if (json.has("link")) {
- JsonArray array = json.getAsJsonArray("link");
+ JsonArray array = getJArray(json, "link");
for (int i = 0; i < array.size(); i++) {
res.getLink().add(parsePersonLinkComponent(array.get(i).getAsJsonObject()));
}
@@ -23105,7 +23491,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -23148,7 +23534,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -23158,13 +23544,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -23192,43 +23578,43 @@ public class JsonParser extends JsonParserBase {
if (json.has("effectivePeriod"))
res.setEffectivePeriod(parsePeriod(getJObject(json, "effectivePeriod")));
if (json.has("topic")) {
- JsonArray array = json.getAsJsonArray("topic");
+ JsonArray array = getJArray(json, "topic");
for (int i = 0; i < array.size(); i++) {
res.getTopic().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("editor")) {
- JsonArray array = json.getAsJsonArray("editor");
+ JsonArray array = getJArray(json, "editor");
for (int i = 0; i < array.size(); i++) {
res.getEditor().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("reviewer")) {
- JsonArray array = json.getAsJsonArray("reviewer");
+ JsonArray array = getJArray(json, "reviewer");
for (int i = 0; i < array.size(); i++) {
res.getReviewer().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("endorser")) {
- JsonArray array = json.getAsJsonArray("endorser");
+ JsonArray array = getJArray(json, "endorser");
for (int i = 0; i < array.size(); i++) {
res.getEndorser().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedArtifact")) {
- JsonArray array = json.getAsJsonArray("relatedArtifact");
+ JsonArray array = getJArray(json, "relatedArtifact");
for (int i = 0; i < array.size(); i++) {
res.getRelatedArtifact().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
}
};
if (json.has("library")) {
- JsonArray array = json.getAsJsonArray("library");
+ JsonArray array = getJArray(json, "library");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getLibrary().add(new CanonicalType());
@@ -23238,7 +23624,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_library")) {
- JsonArray array = json.getAsJsonArray("_library");
+ JsonArray array = getJArray(json, "_library");
for (int i = 0; i < array.size(); i++) {
if (i == res.getLibrary().size())
res.getLibrary().add(parseCanonical(null));
@@ -23247,13 +23633,19 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("goal")) {
- JsonArray array = json.getAsJsonArray("goal");
+ JsonArray array = getJArray(json, "goal");
for (int i = 0; i < array.size(); i++) {
res.getGoal().add(parsePlanDefinitionGoalComponent(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("actor")) {
+ JsonArray array = getJArray(json, "actor");
+ for (int i = 0; i < array.size(); i++) {
+ res.getActor().add(parsePlanDefinitionActorComponent(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("action")) {
- JsonArray array = json.getAsJsonArray("action");
+ JsonArray array = getJArray(json, "action");
for (int i = 0; i < array.size(); i++) {
res.getAction().add(parsePlanDefinitionActionComponent(array.get(i).getAsJsonObject()));
}
@@ -23277,19 +23669,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("start"))
res.setStart(parseCodeableConcept(getJObject(json, "start")));
if (json.has("addresses")) {
- JsonArray array = json.getAsJsonArray("addresses");
+ JsonArray array = getJArray(json, "addresses");
for (int i = 0; i < array.size(); i++) {
res.getAddresses().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("documentation")) {
- JsonArray array = json.getAsJsonArray("documentation");
+ JsonArray array = getJArray(json, "documentation");
for (int i = 0; i < array.size(); i++) {
res.getDocumentation().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
}
};
if (json.has("target")) {
- JsonArray array = json.getAsJsonArray("target");
+ JsonArray array = getJArray(json, "target");
for (int i = 0; i < array.size(); i++) {
res.getTarget().add(parsePlanDefinitionGoalTargetComponent(array.get(i).getAsJsonObject()));
}
@@ -23313,6 +23705,48 @@ public class JsonParser extends JsonParserBase {
res.setDue(parseDuration(getJObject(json, "due")));
}
+ protected PlanDefinition.PlanDefinitionActorComponent parsePlanDefinitionActorComponent(JsonObject json) throws IOException, FHIRFormatError {
+ PlanDefinition.PlanDefinitionActorComponent res = new PlanDefinition.PlanDefinitionActorComponent();
+ parsePlanDefinitionActorComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parsePlanDefinitionActorComponentProperties(JsonObject json, PlanDefinition.PlanDefinitionActorComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("title"))
+ res.setTitleElement(parseString(json.get("title").getAsString()));
+ if (json.has("_title"))
+ parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
+ if (json.has("description"))
+ res.setDescriptionElement(parseMarkdown(json.get("description").getAsString()));
+ if (json.has("_description"))
+ parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
+ if (json.has("option")) {
+ JsonArray array = getJArray(json, "option");
+ for (int i = 0; i < array.size(); i++) {
+ res.getOption().add(parsePlanDefinitionActorOptionComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ }
+
+ protected PlanDefinition.PlanDefinitionActorOptionComponent parsePlanDefinitionActorOptionComponent(JsonObject json) throws IOException, FHIRFormatError {
+ PlanDefinition.PlanDefinitionActorOptionComponent res = new PlanDefinition.PlanDefinitionActorOptionComponent();
+ parsePlanDefinitionActorOptionComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parsePlanDefinitionActorOptionComponentProperties(JsonObject json, PlanDefinition.PlanDefinitionActorOptionComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setTypeElement(parseEnumeration(json.get("type").getAsString(), Enumerations.ActionParticipantType.NULL, new Enumerations.ActionParticipantTypeEnumFactory()));
+ if (json.has("_type"))
+ parseElementProperties(getJObject(json, "_type"), res.getTypeElement());
+ if (json.has("typeReference"))
+ res.setTypeReference(parseReference(getJObject(json, "typeReference")));
+ if (json.has("role"))
+ res.setRole(parseCodeableConcept(getJObject(json, "role")));
+ }
+
protected PlanDefinition.PlanDefinitionActionComponent parsePlanDefinitionActionComponent(JsonObject json) throws IOException, FHIRFormatError {
PlanDefinition.PlanDefinitionActionComponent res = new PlanDefinition.PlanDefinitionActionComponent();
parsePlanDefinitionActionComponentProperties(json, res);
@@ -23341,26 +23775,22 @@ public class JsonParser extends JsonParserBase {
res.setPriorityElement(parseEnumeration(json.get("priority").getAsString(), Enumerations.RequestPriority.NULL, new Enumerations.RequestPriorityEnumFactory()));
if (json.has("_priority"))
parseElementProperties(getJObject(json, "_priority"), res.getPriorityElement());
- if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
- for (int i = 0; i < array.size(); i++) {
- res.getCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
- }
- };
+ if (json.has("code"))
+ res.setCode(parseCodeableConcept(getJObject(json, "code")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("documentation")) {
- JsonArray array = json.getAsJsonArray("documentation");
+ JsonArray array = getJArray(json, "documentation");
for (int i = 0; i < array.size(); i++) {
res.getDocumentation().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
}
};
if (json.has("goalId")) {
- JsonArray array = json.getAsJsonArray("goalId");
+ JsonArray array = getJArray(json, "goalId");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getGoalId().add(new IdType());
@@ -23370,7 +23800,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_goalId")) {
- JsonArray array = json.getAsJsonArray("_goalId");
+ JsonArray array = getJArray(json, "_goalId");
for (int i = 0; i < array.size(); i++) {
if (i == res.getGoalId().size())
res.getGoalId().add(parseId(null));
@@ -23382,31 +23812,31 @@ public class JsonParser extends JsonParserBase {
if (subject != null)
res.setSubject(subject);
if (json.has("trigger")) {
- JsonArray array = json.getAsJsonArray("trigger");
+ JsonArray array = getJArray(json, "trigger");
for (int i = 0; i < array.size(); i++) {
res.getTrigger().add(parseTriggerDefinition(array.get(i).getAsJsonObject()));
}
};
if (json.has("condition")) {
- JsonArray array = json.getAsJsonArray("condition");
+ JsonArray array = getJArray(json, "condition");
for (int i = 0; i < array.size(); i++) {
res.getCondition().add(parsePlanDefinitionActionConditionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("input")) {
- JsonArray array = json.getAsJsonArray("input");
+ JsonArray array = getJArray(json, "input");
for (int i = 0; i < array.size(); i++) {
- res.getInput().add(parseDataRequirement(array.get(i).getAsJsonObject()));
+ res.getInput().add(parsePlanDefinitionActionInputComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("output")) {
- JsonArray array = json.getAsJsonArray("output");
+ JsonArray array = getJArray(json, "output");
for (int i = 0; i < array.size(); i++) {
- res.getOutput().add(parseDataRequirement(array.get(i).getAsJsonObject()));
+ res.getOutput().add(parsePlanDefinitionActionOutputComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedAction")) {
- JsonArray array = json.getAsJsonArray("relatedAction");
+ JsonArray array = getJArray(json, "relatedAction");
for (int i = 0; i < array.size(); i++) {
res.getRelatedAction().add(parsePlanDefinitionActionRelatedActionComponent(array.get(i).getAsJsonObject()));
}
@@ -23414,8 +23844,10 @@ public class JsonParser extends JsonParserBase {
DataType timing = parseType("timing", json);
if (timing != null)
res.setTiming(timing);
+ if (json.has("location"))
+ res.setLocation(parseCodeableReference(getJObject(json, "location")));
if (json.has("participant")) {
- JsonArray array = json.getAsJsonArray("participant");
+ JsonArray array = getJArray(json, "participant");
for (int i = 0; i < array.size(); i++) {
res.getParticipant().add(parsePlanDefinitionActionParticipantComponent(array.get(i).getAsJsonObject()));
}
@@ -23450,13 +23882,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_transform"))
parseElementProperties(getJObject(json, "_transform"), res.getTransformElement());
if (json.has("dynamicValue")) {
- JsonArray array = json.getAsJsonArray("dynamicValue");
+ JsonArray array = getJArray(json, "dynamicValue");
for (int i = 0; i < array.size(); i++) {
res.getDynamicValue().add(parsePlanDefinitionActionDynamicValueComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("action")) {
- JsonArray array = json.getAsJsonArray("action");
+ JsonArray array = getJArray(json, "action");
for (int i = 0; i < array.size(); i++) {
res.getAction().add(parsePlanDefinitionActionComponent(array.get(i).getAsJsonObject()));
}
@@ -23479,6 +23911,46 @@ public class JsonParser extends JsonParserBase {
res.setExpression(parseExpression(getJObject(json, "expression")));
}
+ protected PlanDefinition.PlanDefinitionActionInputComponent parsePlanDefinitionActionInputComponent(JsonObject json) throws IOException, FHIRFormatError {
+ PlanDefinition.PlanDefinitionActionInputComponent res = new PlanDefinition.PlanDefinitionActionInputComponent();
+ parsePlanDefinitionActionInputComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parsePlanDefinitionActionInputComponentProperties(JsonObject json, PlanDefinition.PlanDefinitionActionInputComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("title"))
+ res.setTitleElement(parseString(json.get("title").getAsString()));
+ if (json.has("_title"))
+ parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
+ if (json.has("requirement"))
+ res.setRequirement(parseDataRequirement(getJObject(json, "requirement")));
+ if (json.has("relatedData"))
+ res.setRelatedDataElement(parseId(json.get("relatedData").getAsString()));
+ if (json.has("_relatedData"))
+ parseElementProperties(getJObject(json, "_relatedData"), res.getRelatedDataElement());
+ }
+
+ protected PlanDefinition.PlanDefinitionActionOutputComponent parsePlanDefinitionActionOutputComponent(JsonObject json) throws IOException, FHIRFormatError {
+ PlanDefinition.PlanDefinitionActionOutputComponent res = new PlanDefinition.PlanDefinitionActionOutputComponent();
+ parsePlanDefinitionActionOutputComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parsePlanDefinitionActionOutputComponentProperties(JsonObject json, PlanDefinition.PlanDefinitionActionOutputComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("title"))
+ res.setTitleElement(parseString(json.get("title").getAsString()));
+ if (json.has("_title"))
+ parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
+ if (json.has("requirement"))
+ res.setRequirement(parseDataRequirement(getJObject(json, "requirement")));
+ if (json.has("relatedData"))
+ res.setRelatedDataElement(parseString(json.get("relatedData").getAsString()));
+ if (json.has("_relatedData"))
+ parseElementProperties(getJObject(json, "_relatedData"), res.getRelatedDataElement());
+ }
+
protected PlanDefinition.PlanDefinitionActionRelatedActionComponent parsePlanDefinitionActionRelatedActionComponent(JsonObject json) throws IOException, FHIRFormatError {
PlanDefinition.PlanDefinitionActionRelatedActionComponent res = new PlanDefinition.PlanDefinitionActionRelatedActionComponent();
parsePlanDefinitionActionRelatedActionComponentProperties(json, res);
@@ -23487,10 +23959,10 @@ public class JsonParser extends JsonParserBase {
protected void parsePlanDefinitionActionRelatedActionComponentProperties(JsonObject json, PlanDefinition.PlanDefinitionActionRelatedActionComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- if (json.has("actionId"))
- res.setActionIdElement(parseId(json.get("actionId").getAsString()));
- if (json.has("_actionId"))
- parseElementProperties(getJObject(json, "_actionId"), res.getActionIdElement());
+ if (json.has("targetId"))
+ res.setTargetIdElement(parseId(json.get("targetId").getAsString()));
+ if (json.has("_targetId"))
+ parseElementProperties(getJObject(json, "_targetId"), res.getTargetIdElement());
if (json.has("relationship"))
res.setRelationshipElement(parseEnumeration(json.get("relationship").getAsString(), Enumerations.ActionRelationshipType.NULL, new Enumerations.ActionRelationshipTypeEnumFactory()));
if (json.has("_relationship"))
@@ -23508,12 +23980,20 @@ public class JsonParser extends JsonParserBase {
protected void parsePlanDefinitionActionParticipantComponentProperties(JsonObject json, PlanDefinition.PlanDefinitionActionParticipantComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
+ if (json.has("actorId"))
+ res.setActorIdElement(parseString(json.get("actorId").getAsString()));
+ if (json.has("_actorId"))
+ parseElementProperties(getJObject(json, "_actorId"), res.getActorIdElement());
if (json.has("type"))
res.setTypeElement(parseEnumeration(json.get("type").getAsString(), Enumerations.ActionParticipantType.NULL, new Enumerations.ActionParticipantTypeEnumFactory()));
if (json.has("_type"))
parseElementProperties(getJObject(json, "_type"), res.getTypeElement());
+ if (json.has("typeReference"))
+ res.setTypeReference(parseReference(getJObject(json, "typeReference")));
if (json.has("role"))
res.setRole(parseCodeableConcept(getJObject(json, "role")));
+ if (json.has("function"))
+ res.setFunction(parseCodeableConcept(getJObject(json, "function")));
}
protected PlanDefinition.PlanDefinitionActionDynamicValueComponent parsePlanDefinitionActionDynamicValueComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -23541,7 +24021,7 @@ public class JsonParser extends JsonParserBase {
protected void parsePractitionerProperties(JsonObject json, Practitioner res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -23551,19 +24031,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_active"))
parseElementProperties(getJObject(json, "_active"), res.getActiveElement());
if (json.has("name")) {
- JsonArray array = json.getAsJsonArray("name");
+ JsonArray array = getJArray(json, "name");
for (int i = 0; i < array.size(); i++) {
res.getName().add(parseHumanName(array.get(i).getAsJsonObject()));
}
};
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
};
if (json.has("address")) {
- JsonArray array = json.getAsJsonArray("address");
+ JsonArray array = getJArray(json, "address");
for (int i = 0; i < array.size(); i++) {
res.getAddress().add(parseAddress(array.get(i).getAsJsonObject()));
}
@@ -23577,19 +24057,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_birthDate"))
parseElementProperties(getJObject(json, "_birthDate"), res.getBirthDateElement());
if (json.has("photo")) {
- JsonArray array = json.getAsJsonArray("photo");
+ JsonArray array = getJArray(json, "photo");
for (int i = 0; i < array.size(); i++) {
res.getPhoto().add(parseAttachment(array.get(i).getAsJsonObject()));
}
};
if (json.has("qualification")) {
- JsonArray array = json.getAsJsonArray("qualification");
+ JsonArray array = getJArray(json, "qualification");
for (int i = 0; i < array.size(); i++) {
res.getQualification().add(parsePractitionerQualificationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("communication")) {
- JsonArray array = json.getAsJsonArray("communication");
+ JsonArray array = getJArray(json, "communication");
for (int i = 0; i < array.size(); i++) {
res.getCommunication().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -23605,7 +24085,7 @@ public class JsonParser extends JsonParserBase {
protected void parsePractitionerQualificationComponentProperties(JsonObject json, Practitioner.PractitionerQualificationComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -23627,7 +24107,7 @@ public class JsonParser extends JsonParserBase {
protected void parsePractitionerRoleProperties(JsonObject json, PractitionerRole res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -23643,43 +24123,43 @@ public class JsonParser extends JsonParserBase {
if (json.has("organization"))
res.setOrganization(parseReference(getJObject(json, "organization")));
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("specialty")) {
- JsonArray array = json.getAsJsonArray("specialty");
+ JsonArray array = getJArray(json, "specialty");
for (int i = 0; i < array.size(); i++) {
res.getSpecialty().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("location")) {
- JsonArray array = json.getAsJsonArray("location");
+ JsonArray array = getJArray(json, "location");
for (int i = 0; i < array.size(); i++) {
res.getLocation().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("healthcareService")) {
- JsonArray array = json.getAsJsonArray("healthcareService");
+ JsonArray array = getJArray(json, "healthcareService");
for (int i = 0; i < array.size(); i++) {
res.getHealthcareService().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
};
if (json.has("availableTime")) {
- JsonArray array = json.getAsJsonArray("availableTime");
+ JsonArray array = getJArray(json, "availableTime");
for (int i = 0; i < array.size(); i++) {
res.getAvailableTime().add(parsePractitionerRoleAvailableTimeComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("notAvailable")) {
- JsonArray array = json.getAsJsonArray("notAvailable");
+ JsonArray array = getJArray(json, "notAvailable");
for (int i = 0; i < array.size(); i++) {
res.getNotAvailable().add(parsePractitionerRoleNotAvailableComponent(array.get(i).getAsJsonObject()));
}
@@ -23689,7 +24169,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_availabilityExceptions"))
parseElementProperties(getJObject(json, "_availabilityExceptions"), res.getAvailabilityExceptionsElement());
if (json.has("endpoint")) {
- JsonArray array = json.getAsJsonArray("endpoint");
+ JsonArray array = getJArray(json, "endpoint");
for (int i = 0; i < array.size(); i++) {
res.getEndpoint().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -23705,7 +24185,7 @@ public class JsonParser extends JsonParserBase {
protected void parsePractitionerRoleAvailableTimeComponentProperties(JsonObject json, PractitionerRole.PractitionerRoleAvailableTimeComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("daysOfWeek")) {
- JsonArray array = json.getAsJsonArray("daysOfWeek");
+ JsonArray array = getJArray(json, "daysOfWeek");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDaysOfWeek().add(new Enumeration(new Enumerations.DaysOfWeekEnumFactory(), Enumerations.DaysOfWeek.NULL));
@@ -23715,7 +24195,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_daysOfWeek")) {
- JsonArray array = json.getAsJsonArray("_daysOfWeek");
+ JsonArray array = getJArray(json, "_daysOfWeek");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDaysOfWeek().size())
res.getDaysOfWeek().add(parseEnumeration(null, Enumerations.DaysOfWeek.NULL, new Enumerations.DaysOfWeekEnumFactory()));
@@ -23762,13 +24242,13 @@ public class JsonParser extends JsonParserBase {
protected void parseProcedureProperties(JsonObject json, Procedure res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -23778,7 +24258,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -23787,7 +24267,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -23797,7 +24277,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -23806,13 +24286,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
res.getPartOf().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -23824,7 +24304,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("statusReason"))
res.setStatusReason(parseCodeableConcept(getJObject(json, "statusReason")));
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -23848,7 +24328,7 @@ public class JsonParser extends JsonParserBase {
if (reported != null)
res.setReported(reported);
if (json.has("performer")) {
- JsonArray array = json.getAsJsonArray("performer");
+ JsonArray array = getJArray(json, "performer");
for (int i = 0; i < array.size(); i++) {
res.getPerformer().add(parseProcedurePerformerComponent(array.get(i).getAsJsonObject()));
}
@@ -23856,13 +24336,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("location"))
res.setLocation(parseReference(getJObject(json, "location")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("bodySite")) {
- JsonArray array = json.getAsJsonArray("bodySite");
+ JsonArray array = getJArray(json, "bodySite");
for (int i = 0; i < array.size(); i++) {
res.getBodySite().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -23870,47 +24350,53 @@ public class JsonParser extends JsonParserBase {
if (json.has("outcome"))
res.setOutcome(parseCodeableConcept(getJObject(json, "outcome")));
if (json.has("report")) {
- JsonArray array = json.getAsJsonArray("report");
+ JsonArray array = getJArray(json, "report");
for (int i = 0; i < array.size(); i++) {
res.getReport().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("complication")) {
- JsonArray array = json.getAsJsonArray("complication");
+ JsonArray array = getJArray(json, "complication");
for (int i = 0; i < array.size(); i++) {
res.getComplication().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("complicationDetail")) {
- JsonArray array = json.getAsJsonArray("complicationDetail");
+ JsonArray array = getJArray(json, "complicationDetail");
for (int i = 0; i < array.size(); i++) {
res.getComplicationDetail().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("followUp")) {
- JsonArray array = json.getAsJsonArray("followUp");
+ JsonArray array = getJArray(json, "followUp");
for (int i = 0; i < array.size(); i++) {
res.getFollowUp().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("focalDevice")) {
- JsonArray array = json.getAsJsonArray("focalDevice");
+ JsonArray array = getJArray(json, "focalDevice");
for (int i = 0; i < array.size(); i++) {
res.getFocalDevice().add(parseProcedureFocalDeviceComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("used")) {
- JsonArray array = json.getAsJsonArray("used");
+ JsonArray array = getJArray(json, "used");
for (int i = 0; i < array.size(); i++) {
res.getUsed().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("supportingInfo")) {
+ JsonArray array = getJArray(json, "supportingInfo");
+ for (int i = 0; i < array.size(); i++) {
+ res.getSupportingInfo().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
}
protected Procedure.ProcedurePerformerComponent parseProcedurePerformerComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -23952,7 +24438,7 @@ public class JsonParser extends JsonParserBase {
protected void parseProvenanceProperties(JsonObject json, Provenance res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("target")) {
- JsonArray array = json.getAsJsonArray("target");
+ JsonArray array = getJArray(json, "target");
for (int i = 0; i < array.size(); i++) {
res.getTarget().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -23965,7 +24451,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_recorded"))
parseElementProperties(getJObject(json, "_recorded"), res.getRecordedElement());
if (json.has("policy")) {
- JsonArray array = json.getAsJsonArray("policy");
+ JsonArray array = getJArray(json, "policy");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getPolicy().add(new UriType());
@@ -23975,7 +24461,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_policy")) {
- JsonArray array = json.getAsJsonArray("_policy");
+ JsonArray array = getJArray(json, "_policy");
for (int i = 0; i < array.size(); i++) {
if (i == res.getPolicy().size())
res.getPolicy().add(parseUri(null));
@@ -23986,27 +24472,35 @@ public class JsonParser extends JsonParserBase {
if (json.has("location"))
res.setLocation(parseReference(getJObject(json, "location")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("activity"))
res.setActivity(parseCodeableConcept(getJObject(json, "activity")));
+ if (json.has("basedOn")) {
+ JsonArray array = getJArray(json, "basedOn");
+ for (int i = 0; i < array.size(); i++) {
+ res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("encounter"))
+ res.setEncounter(parseReference(getJObject(json, "encounter")));
if (json.has("agent")) {
- JsonArray array = json.getAsJsonArray("agent");
+ JsonArray array = getJArray(json, "agent");
for (int i = 0; i < array.size(); i++) {
res.getAgent().add(parseProvenanceAgentComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("entity")) {
- JsonArray array = json.getAsJsonArray("entity");
+ JsonArray array = getJArray(json, "entity");
for (int i = 0; i < array.size(); i++) {
res.getEntity().add(parseProvenanceEntityComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("signature")) {
- JsonArray array = json.getAsJsonArray("signature");
+ JsonArray array = getJArray(json, "signature");
for (int i = 0; i < array.size(); i++) {
res.getSignature().add(parseSignature(array.get(i).getAsJsonObject()));
}
@@ -24024,7 +24518,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("role")) {
- JsonArray array = json.getAsJsonArray("role");
+ JsonArray array = getJArray(json, "role");
for (int i = 0; i < array.size(); i++) {
res.getRole().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -24050,7 +24544,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("what"))
res.setWhat(parseReference(getJObject(json, "what")));
if (json.has("agent")) {
- JsonArray array = json.getAsJsonArray("agent");
+ JsonArray array = getJArray(json, "agent");
for (int i = 0; i < array.size(); i++) {
res.getAgent().add(parseProvenanceAgentComponent(array.get(i).getAsJsonObject()));
}
@@ -24070,7 +24564,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -24088,7 +24582,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_title"))
parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
if (json.has("derivedFrom")) {
- JsonArray array = json.getAsJsonArray("derivedFrom");
+ JsonArray array = getJArray(json, "derivedFrom");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDerivedFrom().add(new CanonicalType());
@@ -24098,7 +24592,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_derivedFrom")) {
- JsonArray array = json.getAsJsonArray("_derivedFrom");
+ JsonArray array = getJArray(json, "_derivedFrom");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDerivedFrom().size())
res.getDerivedFrom().add(parseCanonical(null));
@@ -24115,7 +24609,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_experimental"))
parseElementProperties(getJObject(json, "_experimental"), res.getExperimentalElement());
if (json.has("subjectType")) {
- JsonArray array = json.getAsJsonArray("subjectType");
+ JsonArray array = getJArray(json, "subjectType");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSubjectType().add(new CodeType());
@@ -24125,7 +24619,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_subjectType")) {
- JsonArray array = json.getAsJsonArray("_subjectType");
+ JsonArray array = getJArray(json, "_subjectType");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSubjectType().size())
res.getSubjectType().add(parseCode(null));
@@ -24142,7 +24636,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -24152,13 +24646,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -24182,13 +24676,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("effectivePeriod"))
res.setEffectivePeriod(parsePeriod(getJObject(json, "effectivePeriod")));
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseCoding(array.get(i).getAsJsonObject()));
}
};
if (json.has("item")) {
- JsonArray array = json.getAsJsonArray("item");
+ JsonArray array = getJArray(json, "item");
for (int i = 0; i < array.size(); i++) {
res.getItem().add(parseQuestionnaireItemComponent(array.get(i).getAsJsonObject()));
}
@@ -24212,7 +24706,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_definition"))
parseElementProperties(getJObject(json, "_definition"), res.getDefinitionElement());
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseCoding(array.get(i).getAsJsonObject()));
}
@@ -24222,7 +24716,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_prefix"))
parseElementProperties(getJObject(json, "_prefix"), res.getPrefixElement());
if (json.has("text"))
- res.setTextElement(parseString(json.get("text").getAsString()));
+ res.setTextElement(parseMarkdown(json.get("text").getAsString()));
if (json.has("_text"))
parseElementProperties(getJObject(json, "_text"), res.getTextElement());
if (json.has("type"))
@@ -24230,7 +24724,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_type"))
parseElementProperties(getJObject(json, "_type"), res.getTypeElement());
if (json.has("enableWhen")) {
- JsonArray array = json.getAsJsonArray("enableWhen");
+ JsonArray array = getJArray(json, "enableWhen");
for (int i = 0; i < array.size(); i++) {
res.getEnableWhen().add(parseQuestionnaireItemEnableWhenComponent(array.get(i).getAsJsonObject()));
}
@@ -24239,6 +24733,10 @@ public class JsonParser extends JsonParserBase {
res.setEnableBehaviorElement(parseEnumeration(json.get("enableBehavior").getAsString(), Questionnaire.EnableWhenBehavior.NULL, new Questionnaire.EnableWhenBehaviorEnumFactory()));
if (json.has("_enableBehavior"))
parseElementProperties(getJObject(json, "_enableBehavior"), res.getEnableBehaviorElement());
+ if (json.has("disabledDisplay"))
+ res.setDisabledDisplayElement(parseEnumeration(json.get("disabledDisplay").getAsString(), Questionnaire.QuestionnaireItemDisabledDisplay.NULL, new Questionnaire.QuestionnaireItemDisabledDisplayEnumFactory()));
+ if (json.has("_disabledDisplay"))
+ parseElementProperties(getJObject(json, "_disabledDisplay"), res.getDisabledDisplayElement());
if (json.has("required"))
res.setRequiredElement(parseBoolean(json.get("required").getAsBoolean()));
if (json.has("_required"))
@@ -24255,24 +24753,28 @@ public class JsonParser extends JsonParserBase {
res.setMaxLengthElement(parseInteger(json.get("maxLength").getAsLong()));
if (json.has("_maxLength"))
parseElementProperties(getJObject(json, "_maxLength"), res.getMaxLengthElement());
+ if (json.has("answerConstraint"))
+ res.setAnswerConstraintElement(parseEnumeration(json.get("answerConstraint").getAsString(), Questionnaire.QuestionnaireAnswerConstraint.NULL, new Questionnaire.QuestionnaireAnswerConstraintEnumFactory()));
+ if (json.has("_answerConstraint"))
+ parseElementProperties(getJObject(json, "_answerConstraint"), res.getAnswerConstraintElement());
if (json.has("answerValueSet"))
res.setAnswerValueSetElement(parseCanonical(json.get("answerValueSet").getAsString()));
if (json.has("_answerValueSet"))
parseElementProperties(getJObject(json, "_answerValueSet"), res.getAnswerValueSetElement());
if (json.has("answerOption")) {
- JsonArray array = json.getAsJsonArray("answerOption");
+ JsonArray array = getJArray(json, "answerOption");
for (int i = 0; i < array.size(); i++) {
res.getAnswerOption().add(parseQuestionnaireItemAnswerOptionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("initial")) {
- JsonArray array = json.getAsJsonArray("initial");
+ JsonArray array = getJArray(json, "initial");
for (int i = 0; i < array.size(); i++) {
res.getInitial().add(parseQuestionnaireItemInitialComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("item")) {
- JsonArray array = json.getAsJsonArray("item");
+ JsonArray array = getJArray(json, "item");
for (int i = 0; i < array.size(); i++) {
res.getItem().add(parseQuestionnaireItemComponent(array.get(i).getAsJsonObject()));
}
@@ -24341,13 +24843,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("identifier"))
res.setIdentifier(parseIdentifier(getJObject(json, "identifier")));
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
res.getPartOf().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -24373,7 +24875,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("source"))
res.setSource(parseReference(getJObject(json, "source")));
if (json.has("item")) {
- JsonArray array = json.getAsJsonArray("item");
+ JsonArray array = getJArray(json, "item");
for (int i = 0; i < array.size(); i++) {
res.getItem().add(parseQuestionnaireResponseItemComponent(array.get(i).getAsJsonObject()));
}
@@ -24401,13 +24903,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_text"))
parseElementProperties(getJObject(json, "_text"), res.getTextElement());
if (json.has("answer")) {
- JsonArray array = json.getAsJsonArray("answer");
+ JsonArray array = getJArray(json, "answer");
for (int i = 0; i < array.size(); i++) {
res.getAnswer().add(parseQuestionnaireResponseItemAnswerComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("item")) {
- JsonArray array = json.getAsJsonArray("item");
+ JsonArray array = getJArray(json, "item");
for (int i = 0; i < array.size(); i++) {
res.getItem().add(parseQuestionnaireResponseItemComponent(array.get(i).getAsJsonObject()));
}
@@ -24426,7 +24928,7 @@ public class JsonParser extends JsonParserBase {
if (value != null)
res.setValue(value);
if (json.has("item")) {
- JsonArray array = json.getAsJsonArray("item");
+ JsonArray array = getJArray(json, "item");
for (int i = 0; i < array.size(); i++) {
res.getItem().add(parseQuestionnaireResponseItemComponent(array.get(i).getAsJsonObject()));
}
@@ -24442,7 +24944,7 @@ public class JsonParser extends JsonParserBase {
protected void parseRegulatedAuthorizationProperties(JsonObject json, RegulatedAuthorization res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -24456,7 +24958,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("region")) {
- JsonArray array = json.getAsJsonArray("region");
+ JsonArray array = getJArray(json, "region");
for (int i = 0; i < array.size(); i++) {
res.getRegion().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -24469,25 +24971,24 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_statusDate"), res.getStatusDateElement());
if (json.has("validityPeriod"))
res.setValidityPeriod(parsePeriod(getJObject(json, "validityPeriod")));
- DataType indication = parseType("indication", json);
- if (indication != null)
- res.setIndication(indication);
+ if (json.has("indication"))
+ res.setIndication(parseCodeableReference(getJObject(json, "indication")));
if (json.has("intendedUse"))
res.setIntendedUse(parseCodeableConcept(getJObject(json, "intendedUse")));
if (json.has("basis")) {
- JsonArray array = json.getAsJsonArray("basis");
+ JsonArray array = getJArray(json, "basis");
for (int i = 0; i < array.size(); i++) {
res.getBasis().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedDate")) {
- JsonArray array = json.getAsJsonArray("relatedDate");
+ JsonArray array = getJArray(json, "relatedDate");
for (int i = 0; i < array.size(); i++) {
res.getRelatedDate().add(parseRegulatedAuthorizationRelatedDateComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdictionalAuthorization")) {
- JsonArray array = json.getAsJsonArray("jurisdictionalAuthorization");
+ JsonArray array = getJArray(json, "jurisdictionalAuthorization");
for (int i = 0; i < array.size(); i++) {
res.getJurisdictionalAuthorization().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -24496,6 +24997,12 @@ public class JsonParser extends JsonParserBase {
res.setHolder(parseReference(getJObject(json, "holder")));
if (json.has("regulator"))
res.setRegulator(parseReference(getJObject(json, "regulator")));
+ if (json.has("attachedDocument")) {
+ JsonArray array = getJArray(json, "attachedDocument");
+ for (int i = 0; i < array.size(); i++) {
+ res.getAttachedDocument().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("case"))
res.setCase(parseRegulatedAuthorizationCaseComponent(getJObject(json, "case")));
}
@@ -24533,7 +25040,7 @@ public class JsonParser extends JsonParserBase {
if (date != null)
res.setDate(date);
if (json.has("application")) {
- JsonArray array = json.getAsJsonArray("application");
+ JsonArray array = getJArray(json, "application");
for (int i = 0; i < array.size(); i++) {
res.getApplication().add(parseRegulatedAuthorizationCaseComponent(array.get(i).getAsJsonObject()));
}
@@ -24549,7 +25056,7 @@ public class JsonParser extends JsonParserBase {
protected void parseRelatedPersonProperties(JsonObject json, RelatedPerson res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -24561,19 +25068,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("patient"))
res.setPatient(parseReference(getJObject(json, "patient")));
if (json.has("relationship")) {
- JsonArray array = json.getAsJsonArray("relationship");
+ JsonArray array = getJArray(json, "relationship");
for (int i = 0; i < array.size(); i++) {
res.getRelationship().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("name")) {
- JsonArray array = json.getAsJsonArray("name");
+ JsonArray array = getJArray(json, "name");
for (int i = 0; i < array.size(); i++) {
res.getName().add(parseHumanName(array.get(i).getAsJsonObject()));
}
};
if (json.has("telecom")) {
- JsonArray array = json.getAsJsonArray("telecom");
+ JsonArray array = getJArray(json, "telecom");
for (int i = 0; i < array.size(); i++) {
res.getTelecom().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
@@ -24587,13 +25094,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_birthDate"))
parseElementProperties(getJObject(json, "_birthDate"), res.getBirthDateElement());
if (json.has("address")) {
- JsonArray array = json.getAsJsonArray("address");
+ JsonArray array = getJArray(json, "address");
for (int i = 0; i < array.size(); i++) {
res.getAddress().add(parseAddress(array.get(i).getAsJsonObject()));
}
};
if (json.has("photo")) {
- JsonArray array = json.getAsJsonArray("photo");
+ JsonArray array = getJArray(json, "photo");
for (int i = 0; i < array.size(); i++) {
res.getPhoto().add(parseAttachment(array.get(i).getAsJsonObject()));
}
@@ -24601,7 +25108,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("period"))
res.setPeriod(parsePeriod(getJObject(json, "period")));
if (json.has("communication")) {
- JsonArray array = json.getAsJsonArray("communication");
+ JsonArray array = getJArray(json, "communication");
for (int i = 0; i < array.size(); i++) {
res.getCommunication().add(parseRelatedPersonCommunicationComponent(array.get(i).getAsJsonObject()));
}
@@ -24633,13 +25140,13 @@ public class JsonParser extends JsonParserBase {
protected void parseRequestGroupProperties(JsonObject json, RequestGroup res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -24649,7 +25156,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -24658,7 +25165,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -24668,7 +25175,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -24677,13 +25184,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("replaces")) {
- JsonArray array = json.getAsJsonArray("replaces");
+ JsonArray array = getJArray(json, "replaces");
for (int i = 0; i < array.size(); i++) {
res.getReplaces().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -24715,19 +25222,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("author"))
res.setAuthor(parseReference(getJObject(json, "author")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("action")) {
- JsonArray array = json.getAsJsonArray("action");
+ JsonArray array = getJArray(json, "action");
for (int i = 0; i < array.size(); i++) {
res.getAction().add(parseRequestGroupActionComponent(array.get(i).getAsJsonObject()));
}
@@ -24763,25 +25270,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("_priority"))
parseElementProperties(getJObject(json, "_priority"), res.getPriorityElement());
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("documentation")) {
- JsonArray array = json.getAsJsonArray("documentation");
+ JsonArray array = getJArray(json, "documentation");
for (int i = 0; i < array.size(); i++) {
res.getDocumentation().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
}
};
if (json.has("condition")) {
- JsonArray array = json.getAsJsonArray("condition");
+ JsonArray array = getJArray(json, "condition");
for (int i = 0; i < array.size(); i++) {
res.getCondition().add(parseRequestGroupActionConditionComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("relatedAction")) {
- JsonArray array = json.getAsJsonArray("relatedAction");
+ JsonArray array = getJArray(json, "relatedAction");
for (int i = 0; i < array.size(); i++) {
res.getRelatedAction().add(parseRequestGroupActionRelatedActionComponent(array.get(i).getAsJsonObject()));
}
@@ -24789,10 +25296,12 @@ public class JsonParser extends JsonParserBase {
DataType timing = parseType("timing", json);
if (timing != null)
res.setTiming(timing);
+ if (json.has("location"))
+ res.setLocation(parseCodeableReference(getJObject(json, "location")));
if (json.has("participant")) {
- JsonArray array = json.getAsJsonArray("participant");
+ JsonArray array = getJArray(json, "participant");
for (int i = 0; i < array.size(); i++) {
- res.getParticipant().add(parseReference(array.get(i).getAsJsonObject()));
+ res.getParticipant().add(parseRequestGroupActionParticipantComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("type"))
@@ -24820,7 +25329,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("resource"))
res.setResource(parseReference(getJObject(json, "resource")));
if (json.has("action")) {
- JsonArray array = json.getAsJsonArray("action");
+ JsonArray array = getJArray(json, "action");
for (int i = 0; i < array.size(); i++) {
res.getAction().add(parseRequestGroupActionComponent(array.get(i).getAsJsonObject()));
}
@@ -24851,10 +25360,10 @@ public class JsonParser extends JsonParserBase {
protected void parseRequestGroupActionRelatedActionComponentProperties(JsonObject json, RequestGroup.RequestGroupActionRelatedActionComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
- if (json.has("actionId"))
- res.setActionIdElement(parseId(json.get("actionId").getAsString()));
- if (json.has("_actionId"))
- parseElementProperties(getJObject(json, "_actionId"), res.getActionIdElement());
+ if (json.has("targetId"))
+ res.setTargetIdElement(parseId(json.get("targetId").getAsString()));
+ if (json.has("_targetId"))
+ parseElementProperties(getJObject(json, "_targetId"), res.getTargetIdElement());
if (json.has("relationship"))
res.setRelationshipElement(parseEnumeration(json.get("relationship").getAsString(), Enumerations.ActionRelationshipType.NULL, new Enumerations.ActionRelationshipTypeEnumFactory()));
if (json.has("_relationship"))
@@ -24864,6 +25373,28 @@ public class JsonParser extends JsonParserBase {
res.setOffset(offset);
}
+ protected RequestGroup.RequestGroupActionParticipantComponent parseRequestGroupActionParticipantComponent(JsonObject json) throws IOException, FHIRFormatError {
+ RequestGroup.RequestGroupActionParticipantComponent res = new RequestGroup.RequestGroupActionParticipantComponent();
+ parseRequestGroupActionParticipantComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseRequestGroupActionParticipantComponentProperties(JsonObject json, RequestGroup.RequestGroupActionParticipantComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setTypeElement(parseEnumeration(json.get("type").getAsString(), Enumerations.ActionParticipantType.NULL, new Enumerations.ActionParticipantTypeEnumFactory()));
+ if (json.has("_type"))
+ parseElementProperties(getJObject(json, "_type"), res.getTypeElement());
+ if (json.has("typeReference"))
+ res.setTypeReference(parseReference(getJObject(json, "typeReference")));
+ if (json.has("role"))
+ res.setRole(parseCodeableConcept(getJObject(json, "role")));
+ if (json.has("function"))
+ res.setFunction(parseCodeableConcept(getJObject(json, "function")));
+ if (json.has("actor"))
+ res.setActor(parseReference(getJObject(json, "actor")));
+ }
+
protected ResearchStudy parseResearchStudy(JsonObject json) throws IOException, FHIRFormatError {
ResearchStudy res = new ResearchStudy();
parseResearchStudyProperties(json, res);
@@ -24872,30 +25403,58 @@ public class JsonParser extends JsonParserBase {
protected void parseResearchStudyProperties(JsonObject json, ResearchStudy res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
+ if (json.has("url"))
+ res.setUrlElement(parseUri(json.get("url").getAsString()));
+ if (json.has("_url"))
+ parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("version"))
+ res.setVersionElement(parseString(json.get("version").getAsString()));
+ if (json.has("_version"))
+ parseElementProperties(getJObject(json, "_version"), res.getVersionElement());
+ if (json.has("name"))
+ res.setNameElement(parseString(json.get("name").getAsString()));
+ if (json.has("_name"))
+ parseElementProperties(getJObject(json, "_name"), res.getNameElement());
if (json.has("title"))
res.setTitleElement(parseString(json.get("title").getAsString()));
if (json.has("_title"))
parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
+ if (json.has("label")) {
+ JsonArray array = getJArray(json, "label");
+ for (int i = 0; i < array.size(); i++) {
+ res.getLabel().add(parseResearchStudyLabelComponent(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("protocol")) {
- JsonArray array = json.getAsJsonArray("protocol");
+ JsonArray array = getJArray(json, "protocol");
for (int i = 0; i < array.size(); i++) {
res.getProtocol().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
res.getPartOf().add(parseReference(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("relatedArtifact")) {
+ JsonArray array = getJArray(json, "relatedArtifact");
+ for (int i = 0; i < array.size(); i++) {
+ res.getRelatedArtifact().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("date"))
+ res.setDateElement(parseDateTime(json.get("date").getAsString()));
+ if (json.has("_date"))
+ parseElementProperties(getJObject(json, "_date"), res.getDateElement());
if (json.has("status"))
- res.setStatusElement(parseEnumeration(json.get("status").getAsString(), ResearchStudy.ResearchStudyStatus.NULL, new ResearchStudy.ResearchStudyStatusEnumFactory()));
+ res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("primaryPurposeType"))
@@ -24903,99 +25462,258 @@ public class JsonParser extends JsonParserBase {
if (json.has("phase"))
res.setPhase(parseCodeableConcept(getJObject(json, "phase")));
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("focus")) {
- JsonArray array = json.getAsJsonArray("focus");
+ JsonArray array = getJArray(json, "focus");
for (int i = 0; i < array.size(); i++) {
- res.getFocus().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ res.getFocus().add(parseResearchStudyFocusComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("condition")) {
- JsonArray array = json.getAsJsonArray("condition");
+ JsonArray array = getJArray(json, "condition");
for (int i = 0; i < array.size(); i++) {
res.getCondition().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
- if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
- for (int i = 0; i < array.size(); i++) {
- res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("relatedArtifact")) {
- JsonArray array = json.getAsJsonArray("relatedArtifact");
- for (int i = 0; i < array.size(); i++) {
- res.getRelatedArtifact().add(parseRelatedArtifact(array.get(i).getAsJsonObject()));
- }
- };
if (json.has("keyword")) {
- JsonArray array = json.getAsJsonArray("keyword");
+ JsonArray array = getJArray(json, "keyword");
for (int i = 0; i < array.size(); i++) {
res.getKeyword().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("location")) {
- JsonArray array = json.getAsJsonArray("location");
+ JsonArray array = getJArray(json, "location");
for (int i = 0; i < array.size(); i++) {
res.getLocation().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("descriptionSummary"))
+ res.setDescriptionSummaryElement(parseMarkdown(json.get("descriptionSummary").getAsString()));
+ if (json.has("_descriptionSummary"))
+ parseElementProperties(getJObject(json, "_descriptionSummary"), res.getDescriptionSummaryElement());
if (json.has("description"))
res.setDescriptionElement(parseMarkdown(json.get("description").getAsString()));
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
- if (json.has("enrollment")) {
- JsonArray array = json.getAsJsonArray("enrollment");
- for (int i = 0; i < array.size(); i++) {
- res.getEnrollment().add(parseReference(array.get(i).getAsJsonObject()));
- }
- };
if (json.has("period"))
res.setPeriod(parsePeriod(getJObject(json, "period")));
+ if (json.has("contact")) {
+ JsonArray array = getJArray(json, "contact");
+ for (int i = 0; i < array.size(); i++) {
+ res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("sponsor"))
res.setSponsor(parseReference(getJObject(json, "sponsor")));
if (json.has("principalInvestigator"))
res.setPrincipalInvestigator(parseReference(getJObject(json, "principalInvestigator")));
if (json.has("site")) {
- JsonArray array = json.getAsJsonArray("site");
+ JsonArray array = getJArray(json, "site");
for (int i = 0; i < array.size(); i++) {
res.getSite().add(parseReference(array.get(i).getAsJsonObject()));
}
};
- if (json.has("reasonStopped"))
- res.setReasonStopped(parseCodeableConcept(getJObject(json, "reasonStopped")));
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
- if (json.has("arm")) {
- JsonArray array = json.getAsJsonArray("arm");
+ if (json.has("classification")) {
+ JsonArray array = getJArray(json, "classification");
for (int i = 0; i < array.size(); i++) {
- res.getArm().add(parseResearchStudyArmComponent(array.get(i).getAsJsonObject()));
+ res.getClassification().add(parseResearchStudyClassificationComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("associatedParty")) {
+ JsonArray array = getJArray(json, "associatedParty");
+ for (int i = 0; i < array.size(); i++) {
+ res.getAssociatedParty().add(parseResearchStudyAssociatedPartyComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("currentState")) {
+ JsonArray array = getJArray(json, "currentState");
+ for (int i = 0; i < array.size(); i++) {
+ res.getCurrentState().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("statusDate")) {
+ JsonArray array = getJArray(json, "statusDate");
+ for (int i = 0; i < array.size(); i++) {
+ res.getStatusDate().add(parseResearchStudyStatusDateComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("whyStopped"))
+ res.setWhyStopped(parseCodeableConcept(getJObject(json, "whyStopped")));
+ if (json.has("recruitment"))
+ res.setRecruitment(parseResearchStudyRecruitmentComponent(getJObject(json, "recruitment")));
+ if (json.has("comparisonGroup")) {
+ JsonArray array = getJArray(json, "comparisonGroup");
+ for (int i = 0; i < array.size(); i++) {
+ res.getComparisonGroup().add(parseResearchStudyComparisonGroupComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("objective")) {
- JsonArray array = json.getAsJsonArray("objective");
+ JsonArray array = getJArray(json, "objective");
for (int i = 0; i < array.size(); i++) {
res.getObjective().add(parseResearchStudyObjectiveComponent(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("outcomeMeasure")) {
+ JsonArray array = getJArray(json, "outcomeMeasure");
+ for (int i = 0; i < array.size(); i++) {
+ res.getOutcomeMeasure().add(parseResearchStudyOutcomeMeasureComponent(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("result")) {
+ JsonArray array = getJArray(json, "result");
+ for (int i = 0; i < array.size(); i++) {
+ res.getResult().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("webLocation")) {
+ JsonArray array = getJArray(json, "webLocation");
+ for (int i = 0; i < array.size(); i++) {
+ res.getWebLocation().add(parseResearchStudyWebLocationComponent(array.get(i).getAsJsonObject()));
+ }
+ };
}
- protected ResearchStudy.ResearchStudyArmComponent parseResearchStudyArmComponent(JsonObject json) throws IOException, FHIRFormatError {
- ResearchStudy.ResearchStudyArmComponent res = new ResearchStudy.ResearchStudyArmComponent();
- parseResearchStudyArmComponentProperties(json, res);
+ protected ResearchStudy.ResearchStudyLabelComponent parseResearchStudyLabelComponent(JsonObject json) throws IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyLabelComponent res = new ResearchStudy.ResearchStudyLabelComponent();
+ parseResearchStudyLabelComponentProperties(json, res);
return res;
}
- protected void parseResearchStudyArmComponentProperties(JsonObject json, ResearchStudy.ResearchStudyArmComponent res) throws IOException, FHIRFormatError {
+ protected void parseResearchStudyLabelComponentProperties(JsonObject json, ResearchStudy.ResearchStudyLabelComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("value"))
+ res.setValueElement(parseString(json.get("value").getAsString()));
+ if (json.has("_value"))
+ parseElementProperties(getJObject(json, "_value"), res.getValueElement());
+ }
+
+ protected ResearchStudy.ResearchStudyFocusComponent parseResearchStudyFocusComponent(JsonObject json) throws IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyFocusComponent res = new ResearchStudy.ResearchStudyFocusComponent();
+ parseResearchStudyFocusComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseResearchStudyFocusComponentProperties(JsonObject json, ResearchStudy.ResearchStudyFocusComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("productCode"))
+ res.setProductCode(parseCodeableConcept(getJObject(json, "productCode")));
+ if (json.has("focusType")) {
+ JsonArray array = getJArray(json, "focusType");
+ for (int i = 0; i < array.size(); i++) {
+ res.getFocusType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("factor"))
+ res.setFactorElement(parseMarkdown(json.get("factor").getAsString()));
+ if (json.has("_factor"))
+ parseElementProperties(getJObject(json, "_factor"), res.getFactorElement());
+ }
+
+ protected ResearchStudy.ResearchStudyClassificationComponent parseResearchStudyClassificationComponent(JsonObject json) throws IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyClassificationComponent res = new ResearchStudy.ResearchStudyClassificationComponent();
+ parseResearchStudyClassificationComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseResearchStudyClassificationComponentProperties(JsonObject json, ResearchStudy.ResearchStudyClassificationComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("classifier")) {
+ JsonArray array = getJArray(json, "classifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getClassifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ }
+
+ protected ResearchStudy.ResearchStudyAssociatedPartyComponent parseResearchStudyAssociatedPartyComponent(JsonObject json) throws IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyAssociatedPartyComponent res = new ResearchStudy.ResearchStudyAssociatedPartyComponent();
+ parseResearchStudyAssociatedPartyComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseResearchStudyAssociatedPartyComponentProperties(JsonObject json, ResearchStudy.ResearchStudyAssociatedPartyComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("name"))
+ res.setNameElement(parseString(json.get("name").getAsString()));
+ if (json.has("_name"))
+ parseElementProperties(getJObject(json, "_name"), res.getNameElement());
+ if (json.has("role"))
+ res.setRole(parseCodeableConcept(getJObject(json, "role")));
+ if (json.has("classifier")) {
+ JsonArray array = getJArray(json, "classifier");
+ for (int i = 0; i < array.size(); i++) {
+ res.getClassifier().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("party"))
+ res.setParty(parseReference(getJObject(json, "party")));
+ }
+
+ protected ResearchStudy.ResearchStudyStatusDateComponent parseResearchStudyStatusDateComponent(JsonObject json) throws IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyStatusDateComponent res = new ResearchStudy.ResearchStudyStatusDateComponent();
+ parseResearchStudyStatusDateComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseResearchStudyStatusDateComponentProperties(JsonObject json, ResearchStudy.ResearchStudyStatusDateComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("activity"))
+ res.setActivity(parseCodeableConcept(getJObject(json, "activity")));
+ if (json.has("actual"))
+ res.setActualElement(parseBoolean(json.get("actual").getAsBoolean()));
+ if (json.has("_actual"))
+ parseElementProperties(getJObject(json, "_actual"), res.getActualElement());
+ if (json.has("period"))
+ res.setPeriod(parsePeriod(getJObject(json, "period")));
+ }
+
+ protected ResearchStudy.ResearchStudyRecruitmentComponent parseResearchStudyRecruitmentComponent(JsonObject json) throws IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyRecruitmentComponent res = new ResearchStudy.ResearchStudyRecruitmentComponent();
+ parseResearchStudyRecruitmentComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseResearchStudyRecruitmentComponentProperties(JsonObject json, ResearchStudy.ResearchStudyRecruitmentComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("targetNumber"))
+ res.setTargetNumberElement(parseUnsignedInt(json.get("targetNumber").getAsString()));
+ if (json.has("_targetNumber"))
+ parseElementProperties(getJObject(json, "_targetNumber"), res.getTargetNumberElement());
+ if (json.has("actualNumber"))
+ res.setActualNumberElement(parseUnsignedInt(json.get("actualNumber").getAsString()));
+ if (json.has("_actualNumber"))
+ parseElementProperties(getJObject(json, "_actualNumber"), res.getActualNumberElement());
+ if (json.has("eligibility"))
+ res.setEligibility(parseReference(getJObject(json, "eligibility")));
+ if (json.has("actualGroup"))
+ res.setActualGroup(parseReference(getJObject(json, "actualGroup")));
+ }
+
+ protected ResearchStudy.ResearchStudyComparisonGroupComponent parseResearchStudyComparisonGroupComponent(JsonObject json) throws IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyComparisonGroupComponent res = new ResearchStudy.ResearchStudyComparisonGroupComponent();
+ parseResearchStudyComparisonGroupComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseResearchStudyComparisonGroupComponentProperties(JsonObject json, ResearchStudy.ResearchStudyComparisonGroupComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ DataType identifier = parseType("identifier", json);
+ if (identifier != null)
+ res.setIdentifier(identifier);
if (json.has("name"))
res.setNameElement(parseString(json.get("name").getAsString()));
if (json.has("_name"))
@@ -25003,9 +25721,17 @@ public class JsonParser extends JsonParserBase {
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
if (json.has("description"))
- res.setDescriptionElement(parseString(json.get("description").getAsString()));
+ res.setDescriptionElement(parseMarkdown(json.get("description").getAsString()));
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
+ if (json.has("intendedExposure")) {
+ JsonArray array = getJArray(json, "intendedExposure");
+ for (int i = 0; i < array.size(); i++) {
+ res.getIntendedExposure().add(parseReference(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("observedGroup"))
+ res.setObservedGroup(parseReference(getJObject(json, "observedGroup")));
}
protected ResearchStudy.ResearchStudyObjectiveComponent parseResearchStudyObjectiveComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -25022,6 +25748,52 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_name"), res.getNameElement());
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("description"))
+ res.setDescriptionElement(parseMarkdown(json.get("description").getAsString()));
+ if (json.has("_description"))
+ parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
+ }
+
+ protected ResearchStudy.ResearchStudyOutcomeMeasureComponent parseResearchStudyOutcomeMeasureComponent(JsonObject json) throws IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyOutcomeMeasureComponent res = new ResearchStudy.ResearchStudyOutcomeMeasureComponent();
+ parseResearchStudyOutcomeMeasureComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseResearchStudyOutcomeMeasureComponentProperties(JsonObject json, ResearchStudy.ResearchStudyOutcomeMeasureComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("name"))
+ res.setNameElement(parseString(json.get("name").getAsString()));
+ if (json.has("_name"))
+ parseElementProperties(getJObject(json, "_name"), res.getNameElement());
+ if (json.has("type")) {
+ JsonArray array = getJArray(json, "type");
+ for (int i = 0; i < array.size(); i++) {
+ res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ if (json.has("description"))
+ res.setDescriptionElement(parseMarkdown(json.get("description").getAsString()));
+ if (json.has("_description"))
+ parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
+ if (json.has("reference"))
+ res.setReference(parseReference(getJObject(json, "reference")));
+ }
+
+ protected ResearchStudy.ResearchStudyWebLocationComponent parseResearchStudyWebLocationComponent(JsonObject json) throws IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyWebLocationComponent res = new ResearchStudy.ResearchStudyWebLocationComponent();
+ parseResearchStudyWebLocationComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseResearchStudyWebLocationComponentProperties(JsonObject json, ResearchStudy.ResearchStudyWebLocationComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("url"))
+ res.setUrlElement(parseUri(json.get("url").getAsString()));
+ if (json.has("_url"))
+ parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
}
protected ResearchSubject parseResearchSubject(JsonObject json) throws IOException, FHIRFormatError {
@@ -25033,17 +25805,17 @@ public class JsonParser extends JsonParserBase {
protected void parseResearchSubjectProperties(JsonObject json, ResearchSubject res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("status"))
- res.setStatusElement(parseEnumeration(json.get("status").getAsString(), ResearchSubject.ResearchSubjectStatus.NULL, new ResearchSubject.ResearchSubjectStatusEnumFactory()));
+ res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("progress")) {
- JsonArray array = json.getAsJsonArray("progress");
+ JsonArray array = getJArray(json, "progress");
for (int i = 0; i < array.size(); i++) {
res.getProgress().add(parseResearchSubjectProgressComponent(array.get(i).getAsJsonObject()));
}
@@ -25052,8 +25824,8 @@ public class JsonParser extends JsonParserBase {
res.setPeriod(parsePeriod(getJObject(json, "period")));
if (json.has("study"))
res.setStudy(parseReference(getJObject(json, "study")));
- if (json.has("individual"))
- res.setIndividual(parseReference(getJObject(json, "individual")));
+ if (json.has("subject"))
+ res.setSubject(parseReference(getJObject(json, "subject")));
if (json.has("assignedArm"))
res.setAssignedArmElement(parseString(json.get("assignedArm").getAsString()));
if (json.has("_assignedArm"))
@@ -25076,8 +25848,8 @@ public class JsonParser extends JsonParserBase {
parseBackboneElementProperties(json, res);
if (json.has("type"))
res.setType(parseCodeableConcept(getJObject(json, "type")));
- if (json.has("state"))
- res.setState(parseCodeableConcept(getJObject(json, "state")));
+ if (json.has("subjectState"))
+ res.setSubjectState(parseCodeableConcept(getJObject(json, "subjectState")));
if (json.has("milestone"))
res.setMilestone(parseCodeableConcept(getJObject(json, "milestone")));
if (json.has("reason"))
@@ -25086,6 +25858,10 @@ public class JsonParser extends JsonParserBase {
res.setStartDateElement(parseDateTime(json.get("startDate").getAsString()));
if (json.has("_startDate"))
parseElementProperties(getJObject(json, "_startDate"), res.getStartDateElement());
+ if (json.has("endDate"))
+ res.setEndDateElement(parseDateTime(json.get("endDate").getAsString()));
+ if (json.has("_endDate"))
+ parseElementProperties(getJObject(json, "_endDate"), res.getEndDateElement());
}
protected RiskAssessment parseRiskAssessment(JsonObject json) throws IOException, FHIRFormatError {
@@ -25097,7 +25873,7 @@ public class JsonParser extends JsonParserBase {
protected void parseRiskAssessmentProperties(JsonObject json, RiskAssessment res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -25126,19 +25902,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("performer"))
res.setPerformer(parseReference(getJObject(json, "performer")));
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("basis")) {
- JsonArray array = json.getAsJsonArray("basis");
+ JsonArray array = getJArray(json, "basis");
for (int i = 0; i < array.size(); i++) {
res.getBasis().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("prediction")) {
- JsonArray array = json.getAsJsonArray("prediction");
+ JsonArray array = getJArray(json, "prediction");
for (int i = 0; i < array.size(); i++) {
res.getPrediction().add(parseRiskAssessmentPredictionComponent(array.get(i).getAsJsonObject()));
}
@@ -25148,7 +25924,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_mitigation"))
parseElementProperties(getJObject(json, "_mitigation"), res.getMitigationElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -25192,7 +25968,7 @@ public class JsonParser extends JsonParserBase {
protected void parseScheduleProperties(JsonObject json, Schedule res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -25202,25 +25978,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("_active"))
parseElementProperties(getJObject(json, "_active"), res.getActiveElement());
if (json.has("serviceCategory")) {
- JsonArray array = json.getAsJsonArray("serviceCategory");
+ JsonArray array = getJArray(json, "serviceCategory");
for (int i = 0; i < array.size(); i++) {
res.getServiceCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("serviceType")) {
- JsonArray array = json.getAsJsonArray("serviceType");
+ JsonArray array = getJArray(json, "serviceType");
for (int i = 0; i < array.size(); i++) {
res.getServiceType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("specialty")) {
- JsonArray array = json.getAsJsonArray("specialty");
+ JsonArray array = getJArray(json, "specialty");
for (int i = 0; i < array.size(); i++) {
res.getSpecialty().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("actor")) {
- JsonArray array = json.getAsJsonArray("actor");
+ JsonArray array = getJArray(json, "actor");
for (int i = 0; i < array.size(); i++) {
res.getActor().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -25274,7 +26050,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -25284,13 +26060,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -25304,7 +26080,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_code"))
parseElementProperties(getJObject(json, "_code"), res.getCodeElement());
if (json.has("base")) {
- JsonArray array = json.getAsJsonArray("base");
+ JsonArray array = getJArray(json, "base");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getBase().add(new CodeType());
@@ -25314,7 +26090,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_base")) {
- JsonArray array = json.getAsJsonArray("_base");
+ JsonArray array = getJArray(json, "_base");
for (int i = 0; i < array.size(); i++) {
if (i == res.getBase().size())
res.getBase().add(parseCode(null));
@@ -25339,7 +26115,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_xpathUsage"))
parseElementProperties(getJObject(json, "_xpathUsage"), res.getXpathUsageElement());
if (json.has("target")) {
- JsonArray array = json.getAsJsonArray("target");
+ JsonArray array = getJArray(json, "target");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getTarget().add(new CodeType());
@@ -25349,7 +26125,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_target")) {
- JsonArray array = json.getAsJsonArray("_target");
+ JsonArray array = getJArray(json, "_target");
for (int i = 0; i < array.size(); i++) {
if (i == res.getTarget().size())
res.getTarget().add(parseCode(null));
@@ -25366,7 +26142,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_multipleAnd"))
parseElementProperties(getJObject(json, "_multipleAnd"), res.getMultipleAndElement());
if (json.has("comparator")) {
- JsonArray array = json.getAsJsonArray("comparator");
+ JsonArray array = getJArray(json, "comparator");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getComparator().add(new Enumeration(new SearchParameter.SearchComparatorEnumFactory(), SearchParameter.SearchComparator.NULL));
@@ -25376,7 +26152,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_comparator")) {
- JsonArray array = json.getAsJsonArray("_comparator");
+ JsonArray array = getJArray(json, "_comparator");
for (int i = 0; i < array.size(); i++) {
if (i == res.getComparator().size())
res.getComparator().add(parseEnumeration(null, SearchParameter.SearchComparator.NULL, new SearchParameter.SearchComparatorEnumFactory()));
@@ -25385,7 +26161,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("modifier")) {
- JsonArray array = json.getAsJsonArray("modifier");
+ JsonArray array = getJArray(json, "modifier");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getModifier().add(new Enumeration(new SearchParameter.SearchModifierCodeEnumFactory(), SearchParameter.SearchModifierCode.NULL));
@@ -25395,7 +26171,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_modifier")) {
- JsonArray array = json.getAsJsonArray("_modifier");
+ JsonArray array = getJArray(json, "_modifier");
for (int i = 0; i < array.size(); i++) {
if (i == res.getModifier().size())
res.getModifier().add(parseEnumeration(null, SearchParameter.SearchModifierCode.NULL, new SearchParameter.SearchModifierCodeEnumFactory()));
@@ -25404,7 +26180,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("chain")) {
- JsonArray array = json.getAsJsonArray("chain");
+ JsonArray array = getJArray(json, "chain");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getChain().add(new StringType());
@@ -25414,7 +26190,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_chain")) {
- JsonArray array = json.getAsJsonArray("_chain");
+ JsonArray array = getJArray(json, "_chain");
for (int i = 0; i < array.size(); i++) {
if (i == res.getChain().size())
res.getChain().add(parseString(null));
@@ -25423,7 +26199,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("component")) {
- JsonArray array = json.getAsJsonArray("component");
+ JsonArray array = getJArray(json, "component");
for (int i = 0; i < array.size(); i++) {
res.getComponent().add(parseSearchParameterComponentComponent(array.get(i).getAsJsonObject()));
}
@@ -25457,13 +26233,13 @@ public class JsonParser extends JsonParserBase {
protected void parseServiceRequestProperties(JsonObject json, ServiceRequest res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("instantiatesCanonical");
+ JsonArray array = getJArray(json, "instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesCanonical().add(new CanonicalType());
@@ -25473,7 +26249,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesCanonical")) {
- JsonArray array = json.getAsJsonArray("_instantiatesCanonical");
+ JsonArray array = getJArray(json, "_instantiatesCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesCanonical().size())
res.getInstantiatesCanonical().add(parseCanonical(null));
@@ -25482,7 +26258,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("instantiatesUri");
+ JsonArray array = getJArray(json, "instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getInstantiatesUri().add(new UriType());
@@ -25492,7 +26268,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_instantiatesUri")) {
- JsonArray array = json.getAsJsonArray("_instantiatesUri");
+ JsonArray array = getJArray(json, "_instantiatesUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getInstantiatesUri().size())
res.getInstantiatesUri().add(parseUri(null));
@@ -25501,13 +26277,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("replaces")) {
- JsonArray array = json.getAsJsonArray("replaces");
+ JsonArray array = getJArray(json, "replaces");
for (int i = 0; i < array.size(); i++) {
res.getReplaces().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -25523,7 +26299,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_intent"))
parseElementProperties(getJObject(json, "_intent"), res.getIntentElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -25539,7 +26315,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("code"))
res.setCode(parseCodeableConcept(getJObject(json, "code")));
if (json.has("orderDetail")) {
- JsonArray array = json.getAsJsonArray("orderDetail");
+ JsonArray array = getJArray(json, "orderDetail");
for (int i = 0; i < array.size(); i++) {
res.getOrderDetail().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -25566,49 +26342,49 @@ public class JsonParser extends JsonParserBase {
if (json.has("performerType"))
res.setPerformerType(parseCodeableConcept(getJObject(json, "performerType")));
if (json.has("performer")) {
- JsonArray array = json.getAsJsonArray("performer");
+ JsonArray array = getJArray(json, "performer");
for (int i = 0; i < array.size(); i++) {
res.getPerformer().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("location")) {
- JsonArray array = json.getAsJsonArray("location");
+ JsonArray array = getJArray(json, "location");
for (int i = 0; i < array.size(); i++) {
res.getLocation().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("insurance")) {
- JsonArray array = json.getAsJsonArray("insurance");
+ JsonArray array = getJArray(json, "insurance");
for (int i = 0; i < array.size(); i++) {
res.getInsurance().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("supportingInfo")) {
- JsonArray array = json.getAsJsonArray("supportingInfo");
+ JsonArray array = getJArray(json, "supportingInfo");
for (int i = 0; i < array.size(); i++) {
res.getSupportingInfo().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("specimen")) {
- JsonArray array = json.getAsJsonArray("specimen");
+ JsonArray array = getJArray(json, "specimen");
for (int i = 0; i < array.size(); i++) {
res.getSpecimen().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("bodySite")) {
- JsonArray array = json.getAsJsonArray("bodySite");
+ JsonArray array = getJArray(json, "bodySite");
for (int i = 0; i < array.size(); i++) {
res.getBodySite().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -25618,7 +26394,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_patientInstruction"))
parseElementProperties(getJObject(json, "_patientInstruction"), res.getPatientInstructionElement());
if (json.has("relevantHistory")) {
- JsonArray array = json.getAsJsonArray("relevantHistory");
+ JsonArray array = getJArray(json, "relevantHistory");
for (int i = 0; i < array.size(); i++) {
res.getRelevantHistory().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -25634,25 +26410,25 @@ public class JsonParser extends JsonParserBase {
protected void parseSlotProperties(JsonObject json, Slot res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("serviceCategory")) {
- JsonArray array = json.getAsJsonArray("serviceCategory");
+ JsonArray array = getJArray(json, "serviceCategory");
for (int i = 0; i < array.size(); i++) {
res.getServiceCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("serviceType")) {
- JsonArray array = json.getAsJsonArray("serviceType");
+ JsonArray array = getJArray(json, "serviceType");
for (int i = 0; i < array.size(); i++) {
res.getServiceType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("specialty")) {
- JsonArray array = json.getAsJsonArray("specialty");
+ JsonArray array = getJArray(json, "specialty");
for (int i = 0; i < array.size(); i++) {
res.getSpecialty().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -25692,7 +26468,7 @@ public class JsonParser extends JsonParserBase {
protected void parseSpecimenProperties(JsonObject json, Specimen res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -25712,13 +26488,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_receivedTime"))
parseElementProperties(getJObject(json, "_receivedTime"), res.getReceivedTimeElement());
if (json.has("parent")) {
- JsonArray array = json.getAsJsonArray("parent");
+ JsonArray array = getJArray(json, "parent");
for (int i = 0; i < array.size(); i++) {
res.getParent().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("request")) {
- JsonArray array = json.getAsJsonArray("request");
+ JsonArray array = getJArray(json, "request");
for (int i = 0; i < array.size(); i++) {
res.getRequest().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -25726,25 +26502,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("collection"))
res.setCollection(parseSpecimenCollectionComponent(getJObject(json, "collection")));
if (json.has("processing")) {
- JsonArray array = json.getAsJsonArray("processing");
+ JsonArray array = getJArray(json, "processing");
for (int i = 0; i < array.size(); i++) {
res.getProcessing().add(parseSpecimenProcessingComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("container")) {
- JsonArray array = json.getAsJsonArray("container");
+ JsonArray array = getJArray(json, "container");
for (int i = 0; i < array.size(); i++) {
res.getContainer().add(parseSpecimenContainerComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("condition")) {
- JsonArray array = json.getAsJsonArray("condition");
+ JsonArray array = getJArray(json, "condition");
for (int i = 0; i < array.size(); i++) {
res.getCondition().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -25792,7 +26568,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("procedure"))
res.setProcedure(parseCodeableConcept(getJObject(json, "procedure")));
if (json.has("additive")) {
- JsonArray array = json.getAsJsonArray("additive");
+ JsonArray array = getJArray(json, "additive");
for (int i = 0; i < array.size(); i++) {
res.getAdditive().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -25811,7 +26587,7 @@ public class JsonParser extends JsonParserBase {
protected void parseSpecimenContainerComponentProperties(JsonObject json, Specimen.SpecimenContainerComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -25854,7 +26630,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_title"))
parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
if (json.has("derivedFromCanonical")) {
- JsonArray array = json.getAsJsonArray("derivedFromCanonical");
+ JsonArray array = getJArray(json, "derivedFromCanonical");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDerivedFromCanonical().add(new CanonicalType());
@@ -25864,7 +26640,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_derivedFromCanonical")) {
- JsonArray array = json.getAsJsonArray("_derivedFromCanonical");
+ JsonArray array = getJArray(json, "_derivedFromCanonical");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDerivedFromCanonical().size())
res.getDerivedFromCanonical().add(parseCanonical(null));
@@ -25873,7 +26649,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("derivedFromUri")) {
- JsonArray array = json.getAsJsonArray("derivedFromUri");
+ JsonArray array = getJArray(json, "derivedFromUri");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDerivedFromUri().add(new UriType());
@@ -25883,7 +26659,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_derivedFromUri")) {
- JsonArray array = json.getAsJsonArray("_derivedFromUri");
+ JsonArray array = getJArray(json, "_derivedFromUri");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDerivedFromUri().size())
res.getDerivedFromUri().add(parseUri(null));
@@ -25909,7 +26685,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("publisher"))
res.setPublisher(parseReference(getJObject(json, "publisher")));
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -25919,13 +26695,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -25951,7 +26727,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("typeCollected"))
res.setTypeCollected(parseCodeableConcept(getJObject(json, "typeCollected")));
if (json.has("patientPreparation")) {
- JsonArray array = json.getAsJsonArray("patientPreparation");
+ JsonArray array = getJArray(json, "patientPreparation");
for (int i = 0; i < array.size(); i++) {
res.getPatientPreparation().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -25961,13 +26737,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_timeAspect"))
parseElementProperties(getJObject(json, "_timeAspect"), res.getTimeAspectElement());
if (json.has("collection")) {
- JsonArray array = json.getAsJsonArray("collection");
+ JsonArray array = getJArray(json, "collection");
for (int i = 0; i < array.size(); i++) {
res.getCollection().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("typeTested")) {
- JsonArray array = json.getAsJsonArray("typeTested");
+ JsonArray array = getJArray(json, "typeTested");
for (int i = 0; i < array.size(); i++) {
res.getTypeTested().add(parseSpecimenDefinitionTypeTestedComponent(array.get(i).getAsJsonObject()));
}
@@ -26005,19 +26781,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_singleUse"))
parseElementProperties(getJObject(json, "_singleUse"), res.getSingleUseElement());
if (json.has("rejectionCriterion")) {
- JsonArray array = json.getAsJsonArray("rejectionCriterion");
+ JsonArray array = getJArray(json, "rejectionCriterion");
for (int i = 0; i < array.size(); i++) {
res.getRejectionCriterion().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("handling")) {
- JsonArray array = json.getAsJsonArray("handling");
+ JsonArray array = getJArray(json, "handling");
for (int i = 0; i < array.size(); i++) {
res.getHandling().add(parseSpecimenDefinitionTypeTestedHandlingComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("testingDestination")) {
- JsonArray array = json.getAsJsonArray("testingDestination");
+ JsonArray array = getJArray(json, "testingDestination");
for (int i = 0; i < array.size(); i++) {
res.getTestingDestination().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -26048,7 +26824,7 @@ public class JsonParser extends JsonParserBase {
if (minimumVolume != null)
res.setMinimumVolume(minimumVolume);
if (json.has("additive")) {
- JsonArray array = json.getAsJsonArray("additive");
+ JsonArray array = getJArray(json, "additive");
for (int i = 0; i < array.size(); i++) {
res.getAdditive().add(parseSpecimenDefinitionTypeTestedContainerAdditiveComponent(array.get(i).getAsJsonObject()));
}
@@ -26105,7 +26881,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -26139,7 +26915,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -26149,13 +26925,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -26169,7 +26945,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_copyright"))
parseElementProperties(getJObject(json, "_copyright"), res.getCopyrightElement());
if (json.has("keyword")) {
- JsonArray array = json.getAsJsonArray("keyword");
+ JsonArray array = getJArray(json, "keyword");
for (int i = 0; i < array.size(); i++) {
res.getKeyword().add(parseCoding(array.get(i).getAsJsonObject()));
}
@@ -26179,7 +26955,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_fhirVersion"))
parseElementProperties(getJObject(json, "_fhirVersion"), res.getFhirVersionElement());
if (json.has("mapping")) {
- JsonArray array = json.getAsJsonArray("mapping");
+ JsonArray array = getJArray(json, "mapping");
for (int i = 0; i < array.size(); i++) {
res.getMapping().add(parseStructureDefinitionMappingComponent(array.get(i).getAsJsonObject()));
}
@@ -26193,13 +26969,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_abstract"))
parseElementProperties(getJObject(json, "_abstract"), res.getAbstractElement());
if (json.has("context")) {
- JsonArray array = json.getAsJsonArray("context");
+ JsonArray array = getJArray(json, "context");
for (int i = 0; i < array.size(); i++) {
res.getContext().add(parseStructureDefinitionContextComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("contextInvariant")) {
- JsonArray array = json.getAsJsonArray("contextInvariant");
+ JsonArray array = getJArray(json, "contextInvariant");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getContextInvariant().add(new StringType());
@@ -26209,7 +26985,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_contextInvariant")) {
- JsonArray array = json.getAsJsonArray("_contextInvariant");
+ JsonArray array = getJArray(json, "_contextInvariant");
for (int i = 0; i < array.size(); i++) {
if (i == res.getContextInvariant().size())
res.getContextInvariant().add(parseString(null));
@@ -26288,7 +27064,7 @@ public class JsonParser extends JsonParserBase {
protected void parseStructureDefinitionSnapshotComponentProperties(JsonObject json, StructureDefinition.StructureDefinitionSnapshotComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("element")) {
- JsonArray array = json.getAsJsonArray("element");
+ JsonArray array = getJArray(json, "element");
for (int i = 0; i < array.size(); i++) {
res.getElement().add(parseElementDefinition(array.get(i).getAsJsonObject()));
}
@@ -26304,7 +27080,7 @@ public class JsonParser extends JsonParserBase {
protected void parseStructureDefinitionDifferentialComponentProperties(JsonObject json, StructureDefinition.StructureDefinitionDifferentialComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("element")) {
- JsonArray array = json.getAsJsonArray("element");
+ JsonArray array = getJArray(json, "element");
for (int i = 0; i < array.size(); i++) {
res.getElement().add(parseElementDefinition(array.get(i).getAsJsonObject()));
}
@@ -26324,7 +27100,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -26358,7 +27134,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -26368,13 +27144,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -26388,13 +27164,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_copyright"))
parseElementProperties(getJObject(json, "_copyright"), res.getCopyrightElement());
if (json.has("structure")) {
- JsonArray array = json.getAsJsonArray("structure");
+ JsonArray array = getJArray(json, "structure");
for (int i = 0; i < array.size(); i++) {
res.getStructure().add(parseStructureMapStructureComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("import")) {
- JsonArray array = json.getAsJsonArray("import");
+ JsonArray array = getJArray(json, "import");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getImport().add(new CanonicalType());
@@ -26404,7 +27180,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_import")) {
- JsonArray array = json.getAsJsonArray("_import");
+ JsonArray array = getJArray(json, "_import");
for (int i = 0; i < array.size(); i++) {
if (i == res.getImport().size())
res.getImport().add(parseCanonical(null));
@@ -26413,7 +27189,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("group")) {
- JsonArray array = json.getAsJsonArray("group");
+ JsonArray array = getJArray(json, "group");
for (int i = 0; i < array.size(); i++) {
res.getGroup().add(parseStructureMapGroupComponent(array.get(i).getAsJsonObject()));
}
@@ -26471,13 +27247,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_documentation"))
parseElementProperties(getJObject(json, "_documentation"), res.getDocumentationElement());
if (json.has("input")) {
- JsonArray array = json.getAsJsonArray("input");
+ JsonArray array = getJArray(json, "input");
for (int i = 0; i < array.size(); i++) {
res.getInput().add(parseStructureMapGroupInputComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("rule")) {
- JsonArray array = json.getAsJsonArray("rule");
+ JsonArray array = getJArray(json, "rule");
for (int i = 0; i < array.size(); i++) {
res.getRule().add(parseStructureMapGroupRuleComponent(array.get(i).getAsJsonObject()));
}
@@ -26523,25 +27299,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("_name"))
parseElementProperties(getJObject(json, "_name"), res.getNameElement());
if (json.has("source")) {
- JsonArray array = json.getAsJsonArray("source");
+ JsonArray array = getJArray(json, "source");
for (int i = 0; i < array.size(); i++) {
res.getSource().add(parseStructureMapGroupRuleSourceComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("target")) {
- JsonArray array = json.getAsJsonArray("target");
+ JsonArray array = getJArray(json, "target");
for (int i = 0; i < array.size(); i++) {
res.getTarget().add(parseStructureMapGroupRuleTargetComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("rule")) {
- JsonArray array = json.getAsJsonArray("rule");
+ JsonArray array = getJArray(json, "rule");
for (int i = 0; i < array.size(); i++) {
res.getRule().add(parseStructureMapGroupRuleComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("dependent")) {
- JsonArray array = json.getAsJsonArray("dependent");
+ JsonArray array = getJArray(json, "dependent");
for (int i = 0; i < array.size(); i++) {
res.getDependent().add(parseStructureMapGroupRuleDependentComponent(array.get(i).getAsJsonObject()));
}
@@ -26617,10 +27393,6 @@ public class JsonParser extends JsonParserBase {
res.setContextElement(parseId(json.get("context").getAsString()));
if (json.has("_context"))
parseElementProperties(getJObject(json, "_context"), res.getContextElement());
- if (json.has("contextType"))
- res.setContextTypeElement(parseEnumeration(json.get("contextType").getAsString(), StructureMap.StructureMapContextType.NULL, new StructureMap.StructureMapContextTypeEnumFactory()));
- if (json.has("_contextType"))
- parseElementProperties(getJObject(json, "_contextType"), res.getContextTypeElement());
if (json.has("element"))
res.setElementElement(parseString(json.get("element").getAsString()));
if (json.has("_element"))
@@ -26630,7 +27402,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_variable"))
parseElementProperties(getJObject(json, "_variable"), res.getVariableElement());
if (json.has("listMode")) {
- JsonArray array = json.getAsJsonArray("listMode");
+ JsonArray array = getJArray(json, "listMode");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getListMode().add(new Enumeration(new StructureMap.StructureMapTargetListModeEnumFactory(), StructureMap.StructureMapTargetListMode.NULL));
@@ -26640,7 +27412,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_listMode")) {
- JsonArray array = json.getAsJsonArray("_listMode");
+ JsonArray array = getJArray(json, "_listMode");
for (int i = 0; i < array.size(); i++) {
if (i == res.getListMode().size())
res.getListMode().add(parseEnumeration(null, StructureMap.StructureMapTargetListMode.NULL, new StructureMap.StructureMapTargetListModeEnumFactory()));
@@ -26657,7 +27429,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_transform"))
parseElementProperties(getJObject(json, "_transform"), res.getTransformElement());
if (json.has("parameter")) {
- JsonArray array = json.getAsJsonArray("parameter");
+ JsonArray array = getJArray(json, "parameter");
for (int i = 0; i < array.size(); i++) {
res.getParameter().add(parseStructureMapGroupRuleTargetParameterComponent(array.get(i).getAsJsonObject()));
}
@@ -26690,7 +27462,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_name"))
parseElementProperties(getJObject(json, "_name"), res.getNameElement());
if (json.has("variable")) {
- JsonArray array = json.getAsJsonArray("variable");
+ JsonArray array = getJArray(json, "variable");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getVariable().add(new StringType());
@@ -26700,7 +27472,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_variable")) {
- JsonArray array = json.getAsJsonArray("_variable");
+ JsonArray array = getJArray(json, "_variable");
for (int i = 0; i < array.size(); i++) {
if (i == res.getVariable().size())
res.getVariable().add(parseString(null));
@@ -26719,7 +27491,7 @@ public class JsonParser extends JsonParserBase {
protected void parseSubscriptionProperties(JsonObject json, Subscription res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -26733,9 +27505,11 @@ public class JsonParser extends JsonParserBase {
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("topic"))
- res.setTopic(parseReference(getJObject(json, "topic")));
+ res.setTopicElement(parseCanonical(json.get("topic").getAsString()));
+ if (json.has("_topic"))
+ parseElementProperties(getJObject(json, "_topic"), res.getTopicElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactPoint(array.get(i).getAsJsonObject()));
}
@@ -26749,7 +27523,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_reason"))
parseElementProperties(getJObject(json, "_reason"), res.getReasonElement());
if (json.has("filterBy")) {
- JsonArray array = json.getAsJsonArray("filterBy");
+ JsonArray array = getJArray(json, "filterBy");
for (int i = 0; i < array.size(); i++) {
res.getFilterBy().add(parseSubscriptionFilterByComponent(array.get(i).getAsJsonObject()));
}
@@ -26761,7 +27535,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_endpoint"))
parseElementProperties(getJObject(json, "_endpoint"), res.getEndpointElement());
if (json.has("header")) {
- JsonArray array = json.getAsJsonArray("header");
+ JsonArray array = getJArray(json, "header");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getHeader().add(new StringType());
@@ -26771,7 +27545,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_header")) {
- JsonArray array = json.getAsJsonArray("_header");
+ JsonArray array = getJArray(json, "_header");
for (int i = 0; i < array.size(); i++) {
if (i == res.getHeader().size())
res.getHeader().add(parseString(null));
@@ -26795,6 +27569,14 @@ public class JsonParser extends JsonParserBase {
res.setContentElement(parseEnumeration(json.get("content").getAsString(), Subscription.SubscriptionPayloadContent.NULL, new Subscription.SubscriptionPayloadContentEnumFactory()));
if (json.has("_content"))
parseElementProperties(getJObject(json, "_content"), res.getContentElement());
+ if (json.has("notificationUrlLocation"))
+ res.setNotificationUrlLocationElement(parseEnumeration(json.get("notificationUrlLocation").getAsString(), Subscription.SubscriptionUrlLocation.NULL, new Subscription.SubscriptionUrlLocationEnumFactory()));
+ if (json.has("_notificationUrlLocation"))
+ parseElementProperties(getJObject(json, "_notificationUrlLocation"), res.getNotificationUrlLocationElement());
+ if (json.has("maxCount"))
+ res.setMaxCountElement(parsePositiveInt(json.get("maxCount").getAsString()));
+ if (json.has("_maxCount"))
+ parseElementProperties(getJObject(json, "_maxCount"), res.getMaxCountElement());
}
protected Subscription.SubscriptionFilterByComponent parseSubscriptionFilterByComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -26805,6 +27587,10 @@ public class JsonParser extends JsonParserBase {
protected void parseSubscriptionFilterByComponentProperties(JsonObject json, Subscription.SubscriptionFilterByComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
+ if (json.has("resourceType"))
+ res.setResourceTypeElement(parseUri(json.get("resourceType").getAsString()));
+ if (json.has("_resourceType"))
+ parseElementProperties(getJObject(json, "_resourceType"), res.getResourceTypeElement());
if (json.has("searchParamName"))
res.setSearchParamNameElement(parseString(json.get("searchParamName").getAsString()));
if (json.has("_searchParamName"))
@@ -26827,6 +27613,10 @@ public class JsonParser extends JsonParserBase {
protected void parseSubscriptionStatusProperties(JsonObject json, SubscriptionStatus res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
+ if (json.has("status"))
+ res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Enumerations.SubscriptionState.NULL, new Enumerations.SubscriptionStateEnumFactory()));
+ if (json.has("_status"))
+ parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("type"))
res.setTypeElement(parseEnumeration(json.get("type").getAsString(), SubscriptionStatus.SubscriptionNotificationType.NULL, new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory()));
if (json.has("_type"))
@@ -26841,16 +27631,12 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_eventsInNotification"), res.getEventsInNotificationElement());
if (json.has("subscription"))
res.setSubscription(parseReference(getJObject(json, "subscription")));
- if (json.has("status"))
- res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Enumerations.SubscriptionState.NULL, new Enumerations.SubscriptionStateEnumFactory()));
- if (json.has("_status"))
- parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("topic"))
res.setTopicElement(parseCanonical(json.get("topic").getAsString()));
if (json.has("_topic"))
parseElementProperties(getJObject(json, "_topic"), res.getTopicElement());
if (json.has("error")) {
- JsonArray array = json.getAsJsonArray("error");
+ JsonArray array = getJArray(json, "error");
for (int i = 0; i < array.size(); i++) {
res.getError().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -26870,7 +27656,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -26884,7 +27670,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_title"))
parseElementProperties(getJObject(json, "_title"), res.getTitleElement());
if (json.has("derivedFrom")) {
- JsonArray array = json.getAsJsonArray("derivedFrom");
+ JsonArray array = getJArray(json, "derivedFrom");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDerivedFrom().add(new CanonicalType());
@@ -26894,7 +27680,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_derivedFrom")) {
- JsonArray array = json.getAsJsonArray("_derivedFrom");
+ JsonArray array = getJArray(json, "_derivedFrom");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDerivedFrom().size())
res.getDerivedFrom().add(parseCanonical(null));
@@ -26917,7 +27703,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("publisher"))
res.setPublisher(parseReference(getJObject(json, "publisher")));
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -26927,13 +27713,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -26956,12 +27742,10 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_lastReviewDate"), res.getLastReviewDateElement());
if (json.has("effectivePeriod"))
res.setEffectivePeriod(parsePeriod(getJObject(json, "effectivePeriod")));
- if (json.has("resourceTrigger"))
- res.setResourceTrigger(parseSubscriptionTopicResourceTriggerComponent(getJObject(json, "resourceTrigger")));
- if (json.has("canFilterBy")) {
- JsonArray array = json.getAsJsonArray("canFilterBy");
+ if (json.has("resourceTrigger")) {
+ JsonArray array = getJArray(json, "resourceTrigger");
for (int i = 0; i < array.size(); i++) {
- res.getCanFilterBy().add(parseSubscriptionTopicCanFilterByComponent(array.get(i).getAsJsonObject()));
+ res.getResourceTrigger().add(parseSubscriptionTopicResourceTriggerComponent(array.get(i).getAsJsonObject()));
}
};
}
@@ -26978,27 +27762,12 @@ public class JsonParser extends JsonParserBase {
res.setDescriptionElement(parseString(json.get("description").getAsString()));
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
- if (json.has("resourceType")) {
- JsonArray array = json.getAsJsonArray("resourceType");
- for (int i = 0; i < array.size(); i++) {
- if (array.get(i).isJsonNull()) {
- res.getResourceType().add(new CodeType());
- } else {;
- res.getResourceType().add(parseCode(array.get(i).getAsString()));
- }
- }
- };
- if (json.has("_resourceType")) {
- JsonArray array = json.getAsJsonArray("_resourceType");
- for (int i = 0; i < array.size(); i++) {
- if (i == res.getResourceType().size())
- res.getResourceType().add(parseCode(null));
- if (array.get(i) instanceof JsonObject)
- parseElementProperties(array.get(i).getAsJsonObject(), res.getResourceType().get(i));
- }
- };
+ if (json.has("resourceType"))
+ res.setResourceTypeElement(parseUri(json.get("resourceType").getAsString()));
+ if (json.has("_resourceType"))
+ parseElementProperties(getJObject(json, "_resourceType"), res.getResourceTypeElement());
if (json.has("methodCriteria")) {
- JsonArray array = json.getAsJsonArray("methodCriteria");
+ JsonArray array = getJArray(json, "methodCriteria");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getMethodCriteria().add(new Enumeration(new SubscriptionTopic.InteractionTriggerEnumFactory(), SubscriptionTopic.InteractionTrigger.NULL));
@@ -27008,7 +27777,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_methodCriteria")) {
- JsonArray array = json.getAsJsonArray("_methodCriteria");
+ JsonArray array = getJArray(json, "_methodCriteria");
for (int i = 0; i < array.size(); i++) {
if (i == res.getMethodCriteria().size())
res.getMethodCriteria().add(parseEnumeration(null, SubscriptionTopic.InteractionTrigger.NULL, new SubscriptionTopic.InteractionTriggerEnumFactory()));
@@ -27019,7 +27788,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("queryCriteria"))
res.setQueryCriteria(parseSubscriptionTopicResourceTriggerQueryCriteriaComponent(getJObject(json, "queryCriteria")));
if (json.has("fhirPathCriteria")) {
- JsonArray array = json.getAsJsonArray("fhirPathCriteria");
+ JsonArray array = getJArray(json, "fhirPathCriteria");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getFhirPathCriteria().add(new StringType());
@@ -27029,7 +27798,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_fhirPathCriteria")) {
- JsonArray array = json.getAsJsonArray("_fhirPathCriteria");
+ JsonArray array = getJArray(json, "_fhirPathCriteria");
for (int i = 0; i < array.size(); i++) {
if (i == res.getFhirPathCriteria().size())
res.getFhirPathCriteria().add(parseString(null));
@@ -27037,6 +27806,12 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(array.get(i).getAsJsonObject(), res.getFhirPathCriteria().get(i));
}
};
+ if (json.has("canFilterBy")) {
+ JsonArray array = getJArray(json, "canFilterBy");
+ for (int i = 0; i < array.size(); i++) {
+ res.getCanFilterBy().add(parseSubscriptionTopicResourceTriggerCanFilterByComponent(array.get(i).getAsJsonObject()));
+ }
+ };
}
protected SubscriptionTopic.SubscriptionTopicResourceTriggerQueryCriteriaComponent parseSubscriptionTopicResourceTriggerQueryCriteriaComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -27051,30 +27826,38 @@ public class JsonParser extends JsonParserBase {
res.setPreviousElement(parseString(json.get("previous").getAsString()));
if (json.has("_previous"))
parseElementProperties(getJObject(json, "_previous"), res.getPreviousElement());
+ if (json.has("resultForCreate"))
+ res.setResultForCreateElement(parseEnumeration(json.get("resultForCreate").getAsString(), SubscriptionTopic.CriteriaNotExistsBehavior.NULL, new SubscriptionTopic.CriteriaNotExistsBehaviorEnumFactory()));
+ if (json.has("_resultForCreate"))
+ parseElementProperties(getJObject(json, "_resultForCreate"), res.getResultForCreateElement());
if (json.has("current"))
res.setCurrentElement(parseString(json.get("current").getAsString()));
if (json.has("_current"))
parseElementProperties(getJObject(json, "_current"), res.getCurrentElement());
+ if (json.has("resultForDelete"))
+ res.setResultForDeleteElement(parseEnumeration(json.get("resultForDelete").getAsString(), SubscriptionTopic.CriteriaNotExistsBehavior.NULL, new SubscriptionTopic.CriteriaNotExistsBehaviorEnumFactory()));
+ if (json.has("_resultForDelete"))
+ parseElementProperties(getJObject(json, "_resultForDelete"), res.getResultForDeleteElement());
if (json.has("requireBoth"))
res.setRequireBothElement(parseBoolean(json.get("requireBoth").getAsBoolean()));
if (json.has("_requireBoth"))
parseElementProperties(getJObject(json, "_requireBoth"), res.getRequireBothElement());
}
- protected SubscriptionTopic.SubscriptionTopicCanFilterByComponent parseSubscriptionTopicCanFilterByComponent(JsonObject json) throws IOException, FHIRFormatError {
- SubscriptionTopic.SubscriptionTopicCanFilterByComponent res = new SubscriptionTopic.SubscriptionTopicCanFilterByComponent();
- parseSubscriptionTopicCanFilterByComponentProperties(json, res);
+ protected SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent parseSubscriptionTopicResourceTriggerCanFilterByComponent(JsonObject json) throws IOException, FHIRFormatError {
+ SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent res = new SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent();
+ parseSubscriptionTopicResourceTriggerCanFilterByComponentProperties(json, res);
return res;
}
- protected void parseSubscriptionTopicCanFilterByComponentProperties(JsonObject json, SubscriptionTopic.SubscriptionTopicCanFilterByComponent res) throws IOException, FHIRFormatError {
+ protected void parseSubscriptionTopicResourceTriggerCanFilterByComponentProperties(JsonObject json, SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("searchParamName"))
res.setSearchParamNameElement(parseString(json.get("searchParamName").getAsString()));
if (json.has("_searchParamName"))
parseElementProperties(getJObject(json, "_searchParamName"), res.getSearchParamNameElement());
if (json.has("searchModifier")) {
- JsonArray array = json.getAsJsonArray("searchModifier");
+ JsonArray array = getJArray(json, "searchModifier");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getSearchModifier().add(new Enumeration(new Enumerations.SubscriptionSearchModifierEnumFactory(), Enumerations.SubscriptionSearchModifier.NULL));
@@ -27084,7 +27867,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_searchModifier")) {
- JsonArray array = json.getAsJsonArray("_searchModifier");
+ JsonArray array = getJArray(json, "_searchModifier");
for (int i = 0; i < array.size(); i++) {
if (i == res.getSearchModifier().size())
res.getSearchModifier().add(parseEnumeration(null, Enumerations.SubscriptionSearchModifier.NULL, new Enumerations.SubscriptionSearchModifierEnumFactory()));
@@ -27107,57 +27890,43 @@ public class JsonParser extends JsonParserBase {
protected void parseSubstanceProperties(JsonObject json, Substance res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
+ if (json.has("instance"))
+ res.setInstanceElement(parseBoolean(json.get("instance").getAsBoolean()));
+ if (json.has("_instance"))
+ parseElementProperties(getJObject(json, "_instance"), res.getInstanceElement());
if (json.has("status"))
res.setStatusElement(parseEnumeration(json.get("status").getAsString(), Substance.FHIRSubstanceStatus.NULL, new Substance.FHIRSubstanceStatusEnumFactory()));
if (json.has("_status"))
parseElementProperties(getJObject(json, "_status"), res.getStatusElement());
if (json.has("category")) {
- JsonArray array = json.getAsJsonArray("category");
+ JsonArray array = getJArray(json, "category");
for (int i = 0; i < array.size(); i++) {
res.getCategory().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("code"))
- res.setCode(parseCodeableConcept(getJObject(json, "code")));
+ res.setCode(parseCodeableReference(getJObject(json, "code")));
if (json.has("description"))
res.setDescriptionElement(parseString(json.get("description").getAsString()));
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
- if (json.has("instance")) {
- JsonArray array = json.getAsJsonArray("instance");
- for (int i = 0; i < array.size(); i++) {
- res.getInstance().add(parseSubstanceInstanceComponent(array.get(i).getAsJsonObject()));
- }
- };
- if (json.has("ingredient")) {
- JsonArray array = json.getAsJsonArray("ingredient");
- for (int i = 0; i < array.size(); i++) {
- res.getIngredient().add(parseSubstanceIngredientComponent(array.get(i).getAsJsonObject()));
- }
- };
- }
-
- protected Substance.SubstanceInstanceComponent parseSubstanceInstanceComponent(JsonObject json) throws IOException, FHIRFormatError {
- Substance.SubstanceInstanceComponent res = new Substance.SubstanceInstanceComponent();
- parseSubstanceInstanceComponentProperties(json, res);
- return res;
- }
-
- protected void parseSubstanceInstanceComponentProperties(JsonObject json, Substance.SubstanceInstanceComponent res) throws IOException, FHIRFormatError {
- parseBackboneElementProperties(json, res);
- if (json.has("identifier"))
- res.setIdentifier(parseIdentifier(getJObject(json, "identifier")));
if (json.has("expiry"))
res.setExpiryElement(parseDateTime(json.get("expiry").getAsString()));
if (json.has("_expiry"))
parseElementProperties(getJObject(json, "_expiry"), res.getExpiryElement());
if (json.has("quantity"))
res.setQuantity(parseQuantity(getJObject(json, "quantity")));
+ if (json.has("ingredient")) {
+ JsonArray array = getJArray(json, "ingredient");
+ for (int i = 0; i < array.size(); i++) {
+ res.getIngredient().add(parseSubstanceIngredientComponent(array.get(i).getAsJsonObject()));
+ }
+ };
}
protected Substance.SubstanceIngredientComponent parseSubstanceIngredientComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -27194,49 +27963,55 @@ public class JsonParser extends JsonParserBase {
if (json.has("category"))
res.setCategory(parseCodeableConcept(getJObject(json, "category")));
if (json.has("classification")) {
- JsonArray array = json.getAsJsonArray("classification");
+ JsonArray array = getJArray(json, "classification");
for (int i = 0; i < array.size(); i++) {
res.getClassification().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("domain"))
res.setDomain(parseCodeableConcept(getJObject(json, "domain")));
+ if (json.has("grade")) {
+ JsonArray array = getJArray(json, "grade");
+ for (int i = 0; i < array.size(); i++) {
+ res.getGrade().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("description"))
res.setDescriptionElement(parseMarkdown(json.get("description").getAsString()));
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("source")) {
- JsonArray array = json.getAsJsonArray("source");
+ JsonArray array = getJArray(json, "source");
for (int i = 0; i < array.size(); i++) {
res.getSource().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("manufacturer")) {
- JsonArray array = json.getAsJsonArray("manufacturer");
+ JsonArray array = getJArray(json, "manufacturer");
for (int i = 0; i < array.size(); i++) {
res.getManufacturer().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("supplier")) {
- JsonArray array = json.getAsJsonArray("supplier");
+ JsonArray array = getJArray(json, "supplier");
for (int i = 0; i < array.size(); i++) {
res.getSupplier().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("moiety")) {
- JsonArray array = json.getAsJsonArray("moiety");
+ JsonArray array = getJArray(json, "moiety");
for (int i = 0; i < array.size(); i++) {
res.getMoiety().add(parseSubstanceDefinitionMoietyComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("property")) {
- JsonArray array = json.getAsJsonArray("property");
+ JsonArray array = getJArray(json, "property");
for (int i = 0; i < array.size(); i++) {
res.getProperty().add(parseSubstanceDefinitionPropertyComponent(array.get(i).getAsJsonObject()));
}
@@ -27246,25 +28021,25 @@ public class JsonParser extends JsonParserBase {
if (json.has("structure"))
res.setStructure(parseSubstanceDefinitionStructureComponent(getJObject(json, "structure")));
if (json.has("code")) {
- JsonArray array = json.getAsJsonArray("code");
+ JsonArray array = getJArray(json, "code");
for (int i = 0; i < array.size(); i++) {
res.getCode().add(parseSubstanceDefinitionCodeComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("name")) {
- JsonArray array = json.getAsJsonArray("name");
+ JsonArray array = getJArray(json, "name");
for (int i = 0; i < array.size(); i++) {
res.getName().add(parseSubstanceDefinitionNameComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("molecularWeight")) {
- JsonArray array = json.getAsJsonArray("molecularWeight");
+ JsonArray array = getJArray(json, "molecularWeight");
for (int i = 0; i < array.size(); i++) {
res.getMolecularWeight().add(parseSubstanceDefinitionStructureIsotopeMolecularWeightComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("relationship")) {
- JsonArray array = json.getAsJsonArray("relationship");
+ JsonArray array = getJArray(json, "relationship");
for (int i = 0; i < array.size(); i++) {
res.getRelationship().add(parseSubstanceDefinitionRelationshipComponent(array.get(i).getAsJsonObject()));
}
@@ -27276,7 +28051,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("protein"))
res.setProtein(parseReference(getJObject(json, "protein")));
if (json.has("sourceMaterial"))
- res.setSourceMaterial(parseReference(getJObject(json, "sourceMaterial")));
+ res.setSourceMaterial(parseSubstanceDefinitionSourceMaterialComponent(getJObject(json, "sourceMaterial")));
}
protected SubstanceDefinition.SubstanceDefinitionMoietyComponent parseSubstanceDefinitionMoietyComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -27334,7 +28109,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("referenceRange"))
res.setReferenceRange(parseRange(getJObject(json, "referenceRange")));
if (json.has("source")) {
- JsonArray array = json.getAsJsonArray("source");
+ JsonArray array = getJArray(json, "source");
for (int i = 0; i < array.size(); i++) {
res.getSource().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -27362,7 +28137,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_molecularFormulaByMoiety"))
parseElementProperties(getJObject(json, "_molecularFormulaByMoiety"), res.getMolecularFormulaByMoietyElement());
if (json.has("isotope")) {
- JsonArray array = json.getAsJsonArray("isotope");
+ JsonArray array = getJArray(json, "isotope");
for (int i = 0; i < array.size(); i++) {
res.getIsotope().add(parseSubstanceDefinitionStructureIsotopeComponent(array.get(i).getAsJsonObject()));
}
@@ -27370,19 +28145,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("molecularWeight"))
res.setMolecularWeight(parseSubstanceDefinitionStructureIsotopeMolecularWeightComponent(getJObject(json, "molecularWeight")));
if (json.has("technique")) {
- JsonArray array = json.getAsJsonArray("technique");
+ JsonArray array = getJArray(json, "technique");
for (int i = 0; i < array.size(); i++) {
res.getTechnique().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("sourceDocument")) {
- JsonArray array = json.getAsJsonArray("sourceDocument");
+ JsonArray array = getJArray(json, "sourceDocument");
for (int i = 0; i < array.size(); i++) {
res.getSourceDocument().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("representation")) {
- JsonArray array = json.getAsJsonArray("representation");
+ JsonArray array = getJArray(json, "representation");
for (int i = 0; i < array.size(); i++) {
res.getRepresentation().add(parseSubstanceDefinitionStructureRepresentationComponent(array.get(i).getAsJsonObject()));
}
@@ -27462,13 +28237,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_statusDate"))
parseElementProperties(getJObject(json, "_statusDate"), res.getStatusDateElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("source")) {
- JsonArray array = json.getAsJsonArray("source");
+ JsonArray array = getJArray(json, "source");
for (int i = 0; i < array.size(); i++) {
res.getSource().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -27496,43 +28271,43 @@ public class JsonParser extends JsonParserBase {
if (json.has("_preferred"))
parseElementProperties(getJObject(json, "_preferred"), res.getPreferredElement());
if (json.has("language")) {
- JsonArray array = json.getAsJsonArray("language");
+ JsonArray array = getJArray(json, "language");
for (int i = 0; i < array.size(); i++) {
res.getLanguage().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("domain")) {
- JsonArray array = json.getAsJsonArray("domain");
+ JsonArray array = getJArray(json, "domain");
for (int i = 0; i < array.size(); i++) {
res.getDomain().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("synonym")) {
- JsonArray array = json.getAsJsonArray("synonym");
+ JsonArray array = getJArray(json, "synonym");
for (int i = 0; i < array.size(); i++) {
res.getSynonym().add(parseSubstanceDefinitionNameComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("translation")) {
- JsonArray array = json.getAsJsonArray("translation");
+ JsonArray array = getJArray(json, "translation");
for (int i = 0; i < array.size(); i++) {
res.getTranslation().add(parseSubstanceDefinitionNameComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("official")) {
- JsonArray array = json.getAsJsonArray("official");
+ JsonArray array = getJArray(json, "official");
for (int i = 0; i < array.size(); i++) {
res.getOfficial().add(parseSubstanceDefinitionNameOfficialComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("source")) {
- JsonArray array = json.getAsJsonArray("source");
+ JsonArray array = getJArray(json, "source");
for (int i = 0; i < array.size(); i++) {
res.getSource().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -27582,13 +28357,37 @@ public class JsonParser extends JsonParserBase {
if (json.has("amountType"))
res.setAmountType(parseCodeableConcept(getJObject(json, "amountType")));
if (json.has("source")) {
- JsonArray array = json.getAsJsonArray("source");
+ JsonArray array = getJArray(json, "source");
for (int i = 0; i < array.size(); i++) {
res.getSource().add(parseReference(array.get(i).getAsJsonObject()));
}
};
}
+ protected SubstanceDefinition.SubstanceDefinitionSourceMaterialComponent parseSubstanceDefinitionSourceMaterialComponent(JsonObject json) throws IOException, FHIRFormatError {
+ SubstanceDefinition.SubstanceDefinitionSourceMaterialComponent res = new SubstanceDefinition.SubstanceDefinitionSourceMaterialComponent();
+ parseSubstanceDefinitionSourceMaterialComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseSubstanceDefinitionSourceMaterialComponentProperties(JsonObject json, SubstanceDefinition.SubstanceDefinitionSourceMaterialComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("type"))
+ res.setType(parseCodeableConcept(getJObject(json, "type")));
+ if (json.has("genus"))
+ res.setGenus(parseCodeableConcept(getJObject(json, "genus")));
+ if (json.has("species"))
+ res.setSpecies(parseCodeableConcept(getJObject(json, "species")));
+ if (json.has("part"))
+ res.setPart(parseCodeableConcept(getJObject(json, "part")));
+ if (json.has("countryOfOrigin")) {
+ JsonArray array = getJArray(json, "countryOfOrigin");
+ for (int i = 0; i < array.size(); i++) {
+ res.getCountryOfOrigin().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
+ }
+ };
+ }
+
protected SubstanceNucleicAcid parseSubstanceNucleicAcid(JsonObject json) throws IOException, FHIRFormatError {
SubstanceNucleicAcid res = new SubstanceNucleicAcid();
parseSubstanceNucleicAcidProperties(json, res);
@@ -27610,7 +28409,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("oligoNucleotideType"))
res.setOligoNucleotideType(parseCodeableConcept(getJObject(json, "oligoNucleotideType")));
if (json.has("subunit")) {
- JsonArray array = json.getAsJsonArray("subunit");
+ JsonArray array = getJArray(json, "subunit");
for (int i = 0; i < array.size(); i++) {
res.getSubunit().add(parseSubstanceNucleicAcidSubunitComponent(array.get(i).getAsJsonObject()));
}
@@ -27644,13 +28443,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("threePrime"))
res.setThreePrime(parseCodeableConcept(getJObject(json, "threePrime")));
if (json.has("linkage")) {
- JsonArray array = json.getAsJsonArray("linkage");
+ JsonArray array = getJArray(json, "linkage");
for (int i = 0; i < array.size(); i++) {
res.getLinkage().add(parseSubstanceNucleicAcidSubunitLinkageComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("sugar")) {
- JsonArray array = json.getAsJsonArray("sugar");
+ JsonArray array = getJArray(json, "sugar");
for (int i = 0; i < array.size(); i++) {
res.getSugar().add(parseSubstanceNucleicAcidSubunitSugarComponent(array.get(i).getAsJsonObject()));
}
@@ -27716,7 +28515,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("geometry"))
res.setGeometry(parseCodeableConcept(getJObject(json, "geometry")));
if (json.has("copolymerConnectivity")) {
- JsonArray array = json.getAsJsonArray("copolymerConnectivity");
+ JsonArray array = getJArray(json, "copolymerConnectivity");
for (int i = 0; i < array.size(); i++) {
res.getCopolymerConnectivity().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -27726,13 +28525,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_modification"))
parseElementProperties(getJObject(json, "_modification"), res.getModificationElement());
if (json.has("monomerSet")) {
- JsonArray array = json.getAsJsonArray("monomerSet");
+ JsonArray array = getJArray(json, "monomerSet");
for (int i = 0; i < array.size(); i++) {
res.getMonomerSet().add(parseSubstancePolymerMonomerSetComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("repeat")) {
- JsonArray array = json.getAsJsonArray("repeat");
+ JsonArray array = getJArray(json, "repeat");
for (int i = 0; i < array.size(); i++) {
res.getRepeat().add(parseSubstancePolymerRepeatComponent(array.get(i).getAsJsonObject()));
}
@@ -27750,7 +28549,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("ratioType"))
res.setRatioType(parseCodeableConcept(getJObject(json, "ratioType")));
if (json.has("startingMaterial")) {
- JsonArray array = json.getAsJsonArray("startingMaterial");
+ JsonArray array = getJArray(json, "startingMaterial");
for (int i = 0; i < array.size(); i++) {
res.getStartingMaterial().add(parseSubstancePolymerMonomerSetStartingMaterialComponent(array.get(i).getAsJsonObject()));
}
@@ -27792,7 +28591,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("repeatUnitAmountType"))
res.setRepeatUnitAmountType(parseCodeableConcept(getJObject(json, "repeatUnitAmountType")));
if (json.has("repeatUnit")) {
- JsonArray array = json.getAsJsonArray("repeatUnit");
+ JsonArray array = getJArray(json, "repeatUnit");
for (int i = 0; i < array.size(); i++) {
res.getRepeatUnit().add(parseSubstancePolymerRepeatRepeatUnitComponent(array.get(i).getAsJsonObject()));
}
@@ -27818,13 +28617,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_amount"))
parseElementProperties(getJObject(json, "_amount"), res.getAmountElement());
if (json.has("degreeOfPolymerisation")) {
- JsonArray array = json.getAsJsonArray("degreeOfPolymerisation");
+ JsonArray array = getJArray(json, "degreeOfPolymerisation");
for (int i = 0; i < array.size(); i++) {
res.getDegreeOfPolymerisation().add(parseSubstancePolymerRepeatRepeatUnitDegreeOfPolymerisationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("structuralRepresentation")) {
- JsonArray array = json.getAsJsonArray("structuralRepresentation");
+ JsonArray array = getJArray(json, "structuralRepresentation");
for (int i = 0; i < array.size(); i++) {
res.getStructuralRepresentation().add(parseSubstancePolymerRepeatRepeatUnitStructuralRepresentationComponent(array.get(i).getAsJsonObject()));
}
@@ -27890,7 +28689,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_numberOfSubunits"))
parseElementProperties(getJObject(json, "_numberOfSubunits"), res.getNumberOfSubunitsElement());
if (json.has("disulfideLinkage")) {
- JsonArray array = json.getAsJsonArray("disulfideLinkage");
+ JsonArray array = getJArray(json, "disulfideLinkage");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getDisulfideLinkage().add(new StringType());
@@ -27900,7 +28699,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_disulfideLinkage")) {
- JsonArray array = json.getAsJsonArray("_disulfideLinkage");
+ JsonArray array = getJArray(json, "_disulfideLinkage");
for (int i = 0; i < array.size(); i++) {
if (i == res.getDisulfideLinkage().size())
res.getDisulfideLinkage().add(parseString(null));
@@ -27909,7 +28708,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("subunit")) {
- JsonArray array = json.getAsJsonArray("subunit");
+ JsonArray array = getJArray(json, "subunit");
for (int i = 0; i < array.size(); i++) {
res.getSubunit().add(parseSubstanceProteinSubunitComponent(array.get(i).getAsJsonObject()));
}
@@ -27965,19 +28764,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_comment"))
parseElementProperties(getJObject(json, "_comment"), res.getCommentElement());
if (json.has("gene")) {
- JsonArray array = json.getAsJsonArray("gene");
+ JsonArray array = getJArray(json, "gene");
for (int i = 0; i < array.size(); i++) {
res.getGene().add(parseSubstanceReferenceInformationGeneComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("geneElement")) {
- JsonArray array = json.getAsJsonArray("geneElement");
+ JsonArray array = getJArray(json, "geneElement");
for (int i = 0; i < array.size(); i++) {
res.getGeneElement().add(parseSubstanceReferenceInformationGeneElementComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("target")) {
- JsonArray array = json.getAsJsonArray("target");
+ JsonArray array = getJArray(json, "target");
for (int i = 0; i < array.size(); i++) {
res.getTarget().add(parseSubstanceReferenceInformationTargetComponent(array.get(i).getAsJsonObject()));
}
@@ -27997,7 +28796,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("gene"))
res.setGene(parseCodeableConcept(getJObject(json, "gene")));
if (json.has("source")) {
- JsonArray array = json.getAsJsonArray("source");
+ JsonArray array = getJArray(json, "source");
for (int i = 0; i < array.size(); i++) {
res.getSource().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -28017,7 +28816,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("element"))
res.setElement(parseIdentifier(getJObject(json, "element")));
if (json.has("source")) {
- JsonArray array = json.getAsJsonArray("source");
+ JsonArray array = getJArray(json, "source");
for (int i = 0; i < array.size(); i++) {
res.getSource().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -28048,7 +28847,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("amountType"))
res.setAmountType(parseCodeableConcept(getJObject(json, "amountType")));
if (json.has("source")) {
- JsonArray array = json.getAsJsonArray("source");
+ JsonArray array = getJArray(json, "source");
for (int i = 0; i < array.size(); i++) {
res.getSource().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -28076,13 +28875,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_organismName"))
parseElementProperties(getJObject(json, "_organismName"), res.getOrganismNameElement());
if (json.has("parentSubstanceId")) {
- JsonArray array = json.getAsJsonArray("parentSubstanceId");
+ JsonArray array = getJArray(json, "parentSubstanceId");
for (int i = 0; i < array.size(); i++) {
res.getParentSubstanceId().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("parentSubstanceName")) {
- JsonArray array = json.getAsJsonArray("parentSubstanceName");
+ JsonArray array = getJArray(json, "parentSubstanceName");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getParentSubstanceName().add(new StringType());
@@ -28092,7 +28891,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_parentSubstanceName")) {
- JsonArray array = json.getAsJsonArray("_parentSubstanceName");
+ JsonArray array = getJArray(json, "_parentSubstanceName");
for (int i = 0; i < array.size(); i++) {
if (i == res.getParentSubstanceName().size())
res.getParentSubstanceName().add(parseString(null));
@@ -28101,13 +28900,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("countryOfOrigin")) {
- JsonArray array = json.getAsJsonArray("countryOfOrigin");
+ JsonArray array = getJArray(json, "countryOfOrigin");
for (int i = 0; i < array.size(); i++) {
res.getCountryOfOrigin().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("geographicalLocation")) {
- JsonArray array = json.getAsJsonArray("geographicalLocation");
+ JsonArray array = getJArray(json, "geographicalLocation");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getGeographicalLocation().add(new StringType());
@@ -28117,7 +28916,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_geographicalLocation")) {
- JsonArray array = json.getAsJsonArray("_geographicalLocation");
+ JsonArray array = getJArray(json, "_geographicalLocation");
for (int i = 0; i < array.size(); i++) {
if (i == res.getGeographicalLocation().size())
res.getGeographicalLocation().add(parseString(null));
@@ -28128,7 +28927,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("developmentStage"))
res.setDevelopmentStage(parseCodeableConcept(getJObject(json, "developmentStage")));
if (json.has("fractionDescription")) {
- JsonArray array = json.getAsJsonArray("fractionDescription");
+ JsonArray array = getJArray(json, "fractionDescription");
for (int i = 0; i < array.size(); i++) {
res.getFractionDescription().add(parseSubstanceSourceMaterialFractionDescriptionComponent(array.get(i).getAsJsonObject()));
}
@@ -28136,7 +28935,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("organism"))
res.setOrganism(parseSubstanceSourceMaterialOrganismComponent(getJObject(json, "organism")));
if (json.has("partDescription")) {
- JsonArray array = json.getAsJsonArray("partDescription");
+ JsonArray array = getJArray(json, "partDescription");
for (int i = 0; i < array.size(); i++) {
res.getPartDescription().add(parseSubstanceSourceMaterialPartDescriptionComponent(array.get(i).getAsJsonObject()));
}
@@ -28180,7 +28979,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_intraspecificDescription"))
parseElementProperties(getJObject(json, "_intraspecificDescription"), res.getIntraspecificDescriptionElement());
if (json.has("author")) {
- JsonArray array = json.getAsJsonArray("author");
+ JsonArray array = getJArray(json, "author");
for (int i = 0; i < array.size(); i++) {
res.getAuthor().add(parseSubstanceSourceMaterialOrganismAuthorComponent(array.get(i).getAsJsonObject()));
}
@@ -28276,19 +29075,19 @@ public class JsonParser extends JsonParserBase {
protected void parseSupplyDeliveryProperties(JsonObject json, SupplyDelivery res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
};
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
res.getPartOf().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -28311,7 +29110,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("destination"))
res.setDestination(parseReference(getJObject(json, "destination")));
if (json.has("receiver")) {
- JsonArray array = json.getAsJsonArray("receiver");
+ JsonArray array = getJArray(json, "receiver");
for (int i = 0; i < array.size(); i++) {
res.getReceiver().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -28342,7 +29141,7 @@ public class JsonParser extends JsonParserBase {
protected void parseSupplyRequestProperties(JsonObject json, SupplyRequest res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -28362,7 +29161,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("quantity"))
res.setQuantity(parseQuantity(getJObject(json, "quantity")));
if (json.has("parameter")) {
- JsonArray array = json.getAsJsonArray("parameter");
+ JsonArray array = getJArray(json, "parameter");
for (int i = 0; i < array.size(); i++) {
res.getParameter().add(parseSupplyRequestParameterComponent(array.get(i).getAsJsonObject()));
}
@@ -28377,13 +29176,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("requester"))
res.setRequester(parseReference(getJObject(json, "requester")));
if (json.has("supplier")) {
- JsonArray array = json.getAsJsonArray("supplier");
+ JsonArray array = getJArray(json, "supplier");
for (int i = 0; i < array.size(); i++) {
res.getSupplier().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("reason")) {
- JsonArray array = json.getAsJsonArray("reason");
+ JsonArray array = getJArray(json, "reason");
for (int i = 0; i < array.size(); i++) {
res.getReason().add(parseCodeableReference(array.get(i).getAsJsonObject()));
}
@@ -28418,7 +29217,7 @@ public class JsonParser extends JsonParserBase {
protected void parseTaskProperties(JsonObject json, Task res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -28432,7 +29231,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_instantiatesUri"))
parseElementProperties(getJObject(json, "_instantiatesUri"), res.getInstantiatesUriElement());
if (json.has("basedOn")) {
- JsonArray array = json.getAsJsonArray("basedOn");
+ JsonArray array = getJArray(json, "basedOn");
for (int i = 0; i < array.size(); i++) {
res.getBasedOn().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -28440,7 +29239,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("groupIdentifier"))
res.setGroupIdentifier(parseIdentifier(getJObject(json, "groupIdentifier")));
if (json.has("partOf")) {
- JsonArray array = json.getAsJsonArray("partOf");
+ JsonArray array = getJArray(json, "partOf");
for (int i = 0; i < array.size(); i++) {
res.getPartOf().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -28486,7 +29285,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("requester"))
res.setRequester(parseReference(getJObject(json, "requester")));
if (json.has("performerType")) {
- JsonArray array = json.getAsJsonArray("performerType");
+ JsonArray array = getJArray(json, "performerType");
for (int i = 0; i < array.size(); i++) {
res.getPerformerType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -28500,19 +29299,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("reasonReference"))
res.setReasonReference(parseReference(getJObject(json, "reasonReference")));
if (json.has("insurance")) {
- JsonArray array = json.getAsJsonArray("insurance");
+ JsonArray array = getJArray(json, "insurance");
for (int i = 0; i < array.size(); i++) {
res.getInsurance().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
};
if (json.has("relevantHistory")) {
- JsonArray array = json.getAsJsonArray("relevantHistory");
+ JsonArray array = getJArray(json, "relevantHistory");
for (int i = 0; i < array.size(); i++) {
res.getRelevantHistory().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -28520,13 +29319,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("restriction"))
res.setRestriction(parseTaskRestrictionComponent(getJObject(json, "restriction")));
if (json.has("input")) {
- JsonArray array = json.getAsJsonArray("input");
+ JsonArray array = getJArray(json, "input");
for (int i = 0; i < array.size(); i++) {
res.getInput().add(parseTaskParameterComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("output")) {
- JsonArray array = json.getAsJsonArray("output");
+ JsonArray array = getJArray(json, "output");
for (int i = 0; i < array.size(); i++) {
res.getOutput().add(parseTaskOutputComponent(array.get(i).getAsJsonObject()));
}
@@ -28548,7 +29347,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("period"))
res.setPeriod(parsePeriod(getJObject(json, "period")));
if (json.has("recipient")) {
- JsonArray array = json.getAsJsonArray("recipient");
+ JsonArray array = getJArray(json, "recipient");
for (int i = 0; i < array.size(); i++) {
res.getRecipient().add(parseReference(array.get(i).getAsJsonObject()));
}
@@ -28598,7 +29397,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -28632,7 +29431,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -28642,13 +29441,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -28674,7 +29473,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_lockedDate"))
parseElementProperties(getJObject(json, "_lockedDate"), res.getLockedDateElement());
if (json.has("codeSystem")) {
- JsonArray array = json.getAsJsonArray("codeSystem");
+ JsonArray array = getJArray(json, "codeSystem");
for (int i = 0; i < array.size(); i++) {
res.getCodeSystem().add(parseTerminologyCapabilitiesCodeSystemComponent(array.get(i).getAsJsonObject()));
}
@@ -28742,7 +29541,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_uri"))
parseElementProperties(getJObject(json, "_uri"), res.getUriElement());
if (json.has("version")) {
- JsonArray array = json.getAsJsonArray("version");
+ JsonArray array = getJArray(json, "version");
for (int i = 0; i < array.size(); i++) {
res.getVersion().add(parseTerminologyCapabilitiesCodeSystemVersionComponent(array.get(i).getAsJsonObject()));
}
@@ -28774,7 +29573,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_compositional"))
parseElementProperties(getJObject(json, "_compositional"), res.getCompositionalElement());
if (json.has("language")) {
- JsonArray array = json.getAsJsonArray("language");
+ JsonArray array = getJArray(json, "language");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getLanguage().add(new CodeType());
@@ -28784,7 +29583,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_language")) {
- JsonArray array = json.getAsJsonArray("_language");
+ JsonArray array = getJArray(json, "_language");
for (int i = 0; i < array.size(); i++) {
if (i == res.getLanguage().size())
res.getLanguage().add(parseCode(null));
@@ -28793,13 +29592,13 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("filter")) {
- JsonArray array = json.getAsJsonArray("filter");
+ JsonArray array = getJArray(json, "filter");
for (int i = 0; i < array.size(); i++) {
res.getFilter().add(parseTerminologyCapabilitiesCodeSystemVersionFilterComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("property")) {
- JsonArray array = json.getAsJsonArray("property");
+ JsonArray array = getJArray(json, "property");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getProperty().add(new CodeType());
@@ -28809,7 +29608,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_property")) {
- JsonArray array = json.getAsJsonArray("_property");
+ JsonArray array = getJArray(json, "_property");
for (int i = 0; i < array.size(); i++) {
if (i == res.getProperty().size())
res.getProperty().add(parseCode(null));
@@ -28832,7 +29631,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_code"))
parseElementProperties(getJObject(json, "_code"), res.getCodeElement());
if (json.has("op")) {
- JsonArray array = json.getAsJsonArray("op");
+ JsonArray array = getJArray(json, "op");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getOp().add(new CodeType());
@@ -28842,7 +29641,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_op")) {
- JsonArray array = json.getAsJsonArray("_op");
+ JsonArray array = getJArray(json, "_op");
for (int i = 0; i < array.size(); i++) {
if (i == res.getOp().size())
res.getOp().add(parseCode(null));
@@ -28873,7 +29672,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_incomplete"))
parseElementProperties(getJObject(json, "_incomplete"), res.getIncompleteElement());
if (json.has("parameter")) {
- JsonArray array = json.getAsJsonArray("parameter");
+ JsonArray array = getJArray(json, "parameter");
for (int i = 0; i < array.size(); i++) {
res.getParameter().add(parseTerminologyCapabilitiesExpansionParameterComponent(array.get(i).getAsJsonObject()));
}
@@ -28981,7 +29780,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_issued"))
parseElementProperties(getJObject(json, "_issued"), res.getIssuedElement());
if (json.has("participant")) {
- JsonArray array = json.getAsJsonArray("participant");
+ JsonArray array = getJArray(json, "participant");
for (int i = 0; i < array.size(); i++) {
res.getParticipant().add(parseTestReportParticipantComponent(array.get(i).getAsJsonObject()));
}
@@ -28989,7 +29788,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("setup"))
res.setSetup(parseTestReportSetupComponent(getJObject(json, "setup")));
if (json.has("test")) {
- JsonArray array = json.getAsJsonArray("test");
+ JsonArray array = getJArray(json, "test");
for (int i = 0; i < array.size(); i++) {
res.getTest().add(parseTestReportTestComponent(array.get(i).getAsJsonObject()));
}
@@ -29029,7 +29828,7 @@ public class JsonParser extends JsonParserBase {
protected void parseTestReportSetupComponentProperties(JsonObject json, TestReport.TestReportSetupComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("action")) {
- JsonArray array = json.getAsJsonArray("action");
+ JsonArray array = getJArray(json, "action");
for (int i = 0; i < array.size(); i++) {
res.getAction().add(parseTestReportSetupActionComponent(array.get(i).getAsJsonObject()));
}
@@ -29111,7 +29910,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("action")) {
- JsonArray array = json.getAsJsonArray("action");
+ JsonArray array = getJArray(json, "action");
for (int i = 0; i < array.size(); i++) {
res.getAction().add(parseTestReportTestActionComponent(array.get(i).getAsJsonObject()));
}
@@ -29141,7 +29940,7 @@ public class JsonParser extends JsonParserBase {
protected void parseTestReportTeardownComponentProperties(JsonObject json, TestReport.TestReportTeardownComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("action")) {
- JsonArray array = json.getAsJsonArray("action");
+ JsonArray array = getJArray(json, "action");
for (int i = 0; i < array.size(); i++) {
res.getAction().add(parseTestReportTeardownActionComponent(array.get(i).getAsJsonObject()));
}
@@ -29203,7 +30002,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -29213,13 +30012,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -29233,33 +30032,39 @@ public class JsonParser extends JsonParserBase {
if (json.has("_copyright"))
parseElementProperties(getJObject(json, "_copyright"), res.getCopyrightElement());
if (json.has("origin")) {
- JsonArray array = json.getAsJsonArray("origin");
+ JsonArray array = getJArray(json, "origin");
for (int i = 0; i < array.size(); i++) {
res.getOrigin().add(parseTestScriptOriginComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("destination")) {
- JsonArray array = json.getAsJsonArray("destination");
+ JsonArray array = getJArray(json, "destination");
for (int i = 0; i < array.size(); i++) {
res.getDestination().add(parseTestScriptDestinationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("metadata"))
res.setMetadata(parseTestScriptMetadataComponent(getJObject(json, "metadata")));
+ if (json.has("scope")) {
+ JsonArray array = getJArray(json, "scope");
+ for (int i = 0; i < array.size(); i++) {
+ res.getScope().add(parseTestScriptScopeComponent(array.get(i).getAsJsonObject()));
+ }
+ };
if (json.has("fixture")) {
- JsonArray array = json.getAsJsonArray("fixture");
+ JsonArray array = getJArray(json, "fixture");
for (int i = 0; i < array.size(); i++) {
res.getFixture().add(parseTestScriptFixtureComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("profile")) {
- JsonArray array = json.getAsJsonArray("profile");
+ JsonArray array = getJArray(json, "profile");
for (int i = 0; i < array.size(); i++) {
res.getProfile().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("variable")) {
- JsonArray array = json.getAsJsonArray("variable");
+ JsonArray array = getJArray(json, "variable");
for (int i = 0; i < array.size(); i++) {
res.getVariable().add(parseTestScriptVariableComponent(array.get(i).getAsJsonObject()));
}
@@ -29267,7 +30072,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("setup"))
res.setSetup(parseTestScriptSetupComponent(getJObject(json, "setup")));
if (json.has("test")) {
- JsonArray array = json.getAsJsonArray("test");
+ JsonArray array = getJArray(json, "test");
for (int i = 0; i < array.size(); i++) {
res.getTest().add(parseTestScriptTestComponent(array.get(i).getAsJsonObject()));
}
@@ -29317,13 +30122,13 @@ public class JsonParser extends JsonParserBase {
protected void parseTestScriptMetadataComponentProperties(JsonObject json, TestScript.TestScriptMetadataComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("link")) {
- JsonArray array = json.getAsJsonArray("link");
+ JsonArray array = getJArray(json, "link");
for (int i = 0; i < array.size(); i++) {
res.getLink().add(parseTestScriptMetadataLinkComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("capability")) {
- JsonArray array = json.getAsJsonArray("capability");
+ JsonArray array = getJArray(json, "capability");
for (int i = 0; i < array.size(); i++) {
res.getCapability().add(parseTestScriptMetadataCapabilityComponent(array.get(i).getAsJsonObject()));
}
@@ -29369,7 +30174,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("origin")) {
- JsonArray array = json.getAsJsonArray("origin");
+ JsonArray array = getJArray(json, "origin");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getOrigin().add(new IntegerType());
@@ -29379,7 +30184,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_origin")) {
- JsonArray array = json.getAsJsonArray("_origin");
+ JsonArray array = getJArray(json, "_origin");
for (int i = 0; i < array.size(); i++) {
if (i == res.getOrigin().size())
res.getOrigin().add(parseInteger(null));
@@ -29392,7 +30197,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_destination"))
parseElementProperties(getJObject(json, "_destination"), res.getDestinationElement());
if (json.has("link")) {
- JsonArray array = json.getAsJsonArray("link");
+ JsonArray array = getJArray(json, "link");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getLink().add(new UriType());
@@ -29402,7 +30207,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_link")) {
- JsonArray array = json.getAsJsonArray("_link");
+ JsonArray array = getJArray(json, "_link");
for (int i = 0; i < array.size(); i++) {
if (i == res.getLink().size())
res.getLink().add(parseUri(null));
@@ -29416,6 +30221,24 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(getJObject(json, "_capabilities"), res.getCapabilitiesElement());
}
+ protected TestScript.TestScriptScopeComponent parseTestScriptScopeComponent(JsonObject json) throws IOException, FHIRFormatError {
+ TestScript.TestScriptScopeComponent res = new TestScript.TestScriptScopeComponent();
+ parseTestScriptScopeComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseTestScriptScopeComponentProperties(JsonObject json, TestScript.TestScriptScopeComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("artifact"))
+ res.setArtifactElement(parseCanonical(json.get("artifact").getAsString()));
+ if (json.has("_artifact"))
+ parseElementProperties(getJObject(json, "_artifact"), res.getArtifactElement());
+ if (json.has("conformance"))
+ res.setConformance(parseCodeableConcept(getJObject(json, "conformance")));
+ if (json.has("phase"))
+ res.setPhase(parseCodeableConcept(getJObject(json, "phase")));
+ }
+
protected TestScript.TestScriptFixtureComponent parseTestScriptFixtureComponent(JsonObject json) throws IOException, FHIRFormatError {
TestScript.TestScriptFixtureComponent res = new TestScript.TestScriptFixtureComponent();
parseTestScriptFixtureComponentProperties(json, res);
@@ -29487,7 +30310,7 @@ public class JsonParser extends JsonParserBase {
protected void parseTestScriptSetupComponentProperties(JsonObject json, TestScript.TestScriptSetupComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("action")) {
- JsonArray array = json.getAsJsonArray("action");
+ JsonArray array = getJArray(json, "action");
for (int i = 0; i < array.size(); i++) {
res.getAction().add(parseTestScriptSetupActionComponent(array.get(i).getAsJsonObject()));
}
@@ -29559,7 +30382,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_params"))
parseElementProperties(getJObject(json, "_params"), res.getParamsElement());
if (json.has("requestHeader")) {
- JsonArray array = json.getAsJsonArray("requestHeader");
+ JsonArray array = getJArray(json, "requestHeader");
for (int i = 0; i < array.size(); i++) {
res.getRequestHeader().add(parseTestScriptSetupActionOperationRequestHeaderComponent(array.get(i).getAsJsonObject()));
}
@@ -29688,6 +30511,10 @@ public class JsonParser extends JsonParserBase {
res.setSourceIdElement(parseId(json.get("sourceId").getAsString()));
if (json.has("_sourceId"))
parseElementProperties(getJObject(json, "_sourceId"), res.getSourceIdElement());
+ if (json.has("stopTestOnFail"))
+ res.setStopTestOnFailElement(parseBoolean(json.get("stopTestOnFail").getAsBoolean()));
+ if (json.has("_stopTestOnFail"))
+ parseElementProperties(getJObject(json, "_stopTestOnFail"), res.getStopTestOnFailElement());
if (json.has("validateProfileId"))
res.setValidateProfileIdElement(parseId(json.get("validateProfileId").getAsString()));
if (json.has("_validateProfileId"))
@@ -29719,7 +30546,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("action")) {
- JsonArray array = json.getAsJsonArray("action");
+ JsonArray array = getJArray(json, "action");
for (int i = 0; i < array.size(); i++) {
res.getAction().add(parseTestScriptTestActionComponent(array.get(i).getAsJsonObject()));
}
@@ -29749,7 +30576,7 @@ public class JsonParser extends JsonParserBase {
protected void parseTestScriptTeardownComponentProperties(JsonObject json, TestScript.TestScriptTeardownComponent res) throws IOException, FHIRFormatError {
parseBackboneElementProperties(json, res);
if (json.has("action")) {
- JsonArray array = json.getAsJsonArray("action");
+ JsonArray array = getJArray(json, "action");
for (int i = 0; i < array.size(); i++) {
res.getAction().add(parseTestScriptTeardownActionComponent(array.get(i).getAsJsonObject()));
}
@@ -29781,7 +30608,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_url"))
parseElementProperties(getJObject(json, "_url"), res.getUrlElement());
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -29815,7 +30642,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_publisher"))
parseElementProperties(getJObject(json, "_publisher"), res.getPublisherElement());
if (json.has("contact")) {
- JsonArray array = json.getAsJsonArray("contact");
+ JsonArray array = getJArray(json, "contact");
for (int i = 0; i < array.size(); i++) {
res.getContact().add(parseContactDetail(array.get(i).getAsJsonObject()));
}
@@ -29825,13 +30652,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("_description"))
parseElementProperties(getJObject(json, "_description"), res.getDescriptionElement());
if (json.has("useContext")) {
- JsonArray array = json.getAsJsonArray("useContext");
+ JsonArray array = getJArray(json, "useContext");
for (int i = 0; i < array.size(); i++) {
res.getUseContext().add(parseUsageContext(array.get(i).getAsJsonObject()));
}
};
if (json.has("jurisdiction")) {
- JsonArray array = json.getAsJsonArray("jurisdiction");
+ JsonArray array = getJArray(json, "jurisdiction");
for (int i = 0; i < array.size(); i++) {
res.getJurisdiction().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -29852,6 +30679,8 @@ public class JsonParser extends JsonParserBase {
res.setCompose(parseValueSetComposeComponent(getJObject(json, "compose")));
if (json.has("expansion"))
res.setExpansion(parseValueSetExpansionComponent(getJObject(json, "expansion")));
+ if (json.has("scope"))
+ res.setScope(parseValueSetScopeComponent(getJObject(json, "scope")));
}
protected ValueSet.ValueSetComposeComponent parseValueSetComposeComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -29871,19 +30700,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_inactive"))
parseElementProperties(getJObject(json, "_inactive"), res.getInactiveElement());
if (json.has("include")) {
- JsonArray array = json.getAsJsonArray("include");
+ JsonArray array = getJArray(json, "include");
for (int i = 0; i < array.size(); i++) {
res.getInclude().add(parseValueSetConceptSetComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("exclude")) {
- JsonArray array = json.getAsJsonArray("exclude");
+ JsonArray array = getJArray(json, "exclude");
for (int i = 0; i < array.size(); i++) {
res.getExclude().add(parseValueSetConceptSetComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("property")) {
- JsonArray array = json.getAsJsonArray("property");
+ JsonArray array = getJArray(json, "property");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getProperty().add(new StringType());
@@ -29893,7 +30722,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_property")) {
- JsonArray array = json.getAsJsonArray("_property");
+ JsonArray array = getJArray(json, "_property");
for (int i = 0; i < array.size(); i++) {
if (i == res.getProperty().size())
res.getProperty().add(parseString(null));
@@ -29920,19 +30749,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_version"))
parseElementProperties(getJObject(json, "_version"), res.getVersionElement());
if (json.has("concept")) {
- JsonArray array = json.getAsJsonArray("concept");
+ JsonArray array = getJArray(json, "concept");
for (int i = 0; i < array.size(); i++) {
res.getConcept().add(parseValueSetConceptReferenceComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("filter")) {
- JsonArray array = json.getAsJsonArray("filter");
+ JsonArray array = getJArray(json, "filter");
for (int i = 0; i < array.size(); i++) {
res.getFilter().add(parseValueSetConceptSetFilterComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("valueSet")) {
- JsonArray array = json.getAsJsonArray("valueSet");
+ JsonArray array = getJArray(json, "valueSet");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getValueSet().add(new CanonicalType());
@@ -29942,7 +30771,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_valueSet")) {
- JsonArray array = json.getAsJsonArray("_valueSet");
+ JsonArray array = getJArray(json, "_valueSet");
for (int i = 0; i < array.size(); i++) {
if (i == res.getValueSet().size())
res.getValueSet().add(parseCanonical(null));
@@ -29950,6 +30779,10 @@ public class JsonParser extends JsonParserBase {
parseElementProperties(array.get(i).getAsJsonObject(), res.getValueSet().get(i));
}
};
+ if (json.has("copyright"))
+ res.setCopyrightElement(parseString(json.get("copyright").getAsString()));
+ if (json.has("_copyright"))
+ parseElementProperties(getJObject(json, "_copyright"), res.getCopyrightElement());
}
protected ValueSet.ConceptReferenceComponent parseValueSetConceptReferenceComponent(JsonObject json) throws IOException, FHIRFormatError {
@@ -29969,7 +30802,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_display"))
parseElementProperties(getJObject(json, "_display"), res.getDisplayElement());
if (json.has("designation")) {
- JsonArray array = json.getAsJsonArray("designation");
+ JsonArray array = getJArray(json, "designation");
for (int i = 0; i < array.size(); i++) {
res.getDesignation().add(parseValueSetConceptReferenceDesignationComponent(array.get(i).getAsJsonObject()));
}
@@ -30043,19 +30876,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_offset"))
parseElementProperties(getJObject(json, "_offset"), res.getOffsetElement());
if (json.has("parameter")) {
- JsonArray array = json.getAsJsonArray("parameter");
+ JsonArray array = getJArray(json, "parameter");
for (int i = 0; i < array.size(); i++) {
res.getParameter().add(parseValueSetExpansionParameterComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("property")) {
- JsonArray array = json.getAsJsonArray("property");
+ JsonArray array = getJArray(json, "property");
for (int i = 0; i < array.size(); i++) {
res.getProperty().add(parseValueSetExpansionPropertyComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("contains")) {
- JsonArray array = json.getAsJsonArray("contains");
+ JsonArray array = getJArray(json, "contains");
for (int i = 0; i < array.size(); i++) {
res.getContains().add(parseValueSetExpansionContainsComponent(array.get(i).getAsJsonObject()));
}
@@ -30130,19 +30963,19 @@ public class JsonParser extends JsonParserBase {
if (json.has("_display"))
parseElementProperties(getJObject(json, "_display"), res.getDisplayElement());
if (json.has("designation")) {
- JsonArray array = json.getAsJsonArray("designation");
+ JsonArray array = getJArray(json, "designation");
for (int i = 0; i < array.size(); i++) {
res.getDesignation().add(parseValueSetConceptReferenceDesignationComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("property")) {
- JsonArray array = json.getAsJsonArray("property");
+ JsonArray array = getJArray(json, "property");
for (int i = 0; i < array.size(); i++) {
res.getProperty().add(parseValueSetConceptPropertyComponent(array.get(i).getAsJsonObject()));
}
};
if (json.has("contains")) {
- JsonArray array = json.getAsJsonArray("contains");
+ JsonArray array = getJArray(json, "contains");
for (int i = 0; i < array.size(); i++) {
res.getContains().add(parseValueSetExpansionContainsComponent(array.get(i).getAsJsonObject()));
}
@@ -30166,6 +30999,28 @@ public class JsonParser extends JsonParserBase {
res.setValue(value);
}
+ protected ValueSet.ValueSetScopeComponent parseValueSetScopeComponent(JsonObject json) throws IOException, FHIRFormatError {
+ ValueSet.ValueSetScopeComponent res = new ValueSet.ValueSetScopeComponent();
+ parseValueSetScopeComponentProperties(json, res);
+ return res;
+ }
+
+ protected void parseValueSetScopeComponentProperties(JsonObject json, ValueSet.ValueSetScopeComponent res) throws IOException, FHIRFormatError {
+ parseBackboneElementProperties(json, res);
+ if (json.has("focus"))
+ res.setFocusElement(parseString(json.get("focus").getAsString()));
+ if (json.has("_focus"))
+ parseElementProperties(getJObject(json, "_focus"), res.getFocusElement());
+ if (json.has("inclusionCriteria"))
+ res.setInclusionCriteriaElement(parseString(json.get("inclusionCriteria").getAsString()));
+ if (json.has("_inclusionCriteria"))
+ parseElementProperties(getJObject(json, "_inclusionCriteria"), res.getInclusionCriteriaElement());
+ if (json.has("exclusionCriteria"))
+ res.setExclusionCriteriaElement(parseString(json.get("exclusionCriteria").getAsString()));
+ if (json.has("_exclusionCriteria"))
+ parseElementProperties(getJObject(json, "_exclusionCriteria"), res.getExclusionCriteriaElement());
+ }
+
protected VerificationResult parseVerificationResult(JsonObject json) throws IOException, FHIRFormatError {
VerificationResult res = new VerificationResult();
parseVerificationResultProperties(json, res);
@@ -30175,13 +31030,13 @@ public class JsonParser extends JsonParserBase {
protected void parseVerificationResultProperties(JsonObject json, VerificationResult res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("target")) {
- JsonArray array = json.getAsJsonArray("target");
+ JsonArray array = getJArray(json, "target");
for (int i = 0; i < array.size(); i++) {
res.getTarget().add(parseReference(array.get(i).getAsJsonObject()));
}
};
if (json.has("targetLocation")) {
- JsonArray array = json.getAsJsonArray("targetLocation");
+ JsonArray array = getJArray(json, "targetLocation");
for (int i = 0; i < array.size(); i++) {
if (array.get(i).isJsonNull()) {
res.getTargetLocation().add(new StringType());
@@ -30191,7 +31046,7 @@ public class JsonParser extends JsonParserBase {
}
};
if (json.has("_targetLocation")) {
- JsonArray array = json.getAsJsonArray("_targetLocation");
+ JsonArray array = getJArray(json, "_targetLocation");
for (int i = 0; i < array.size(); i++) {
if (i == res.getTargetLocation().size())
res.getTargetLocation().add(parseString(null));
@@ -30212,7 +31067,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("validationType"))
res.setValidationType(parseCodeableConcept(getJObject(json, "validationType")));
if (json.has("validationProcess")) {
- JsonArray array = json.getAsJsonArray("validationProcess");
+ JsonArray array = getJArray(json, "validationProcess");
for (int i = 0; i < array.size(); i++) {
res.getValidationProcess().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -30230,7 +31085,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("failureAction"))
res.setFailureAction(parseCodeableConcept(getJObject(json, "failureAction")));
if (json.has("primarySource")) {
- JsonArray array = json.getAsJsonArray("primarySource");
+ JsonArray array = getJArray(json, "primarySource");
for (int i = 0; i < array.size(); i++) {
res.getPrimarySource().add(parseVerificationResultPrimarySourceComponent(array.get(i).getAsJsonObject()));
}
@@ -30238,7 +31093,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("attestation"))
res.setAttestation(parseVerificationResultAttestationComponent(getJObject(json, "attestation")));
if (json.has("validator")) {
- JsonArray array = json.getAsJsonArray("validator");
+ JsonArray array = getJArray(json, "validator");
for (int i = 0; i < array.size(); i++) {
res.getValidator().add(parseVerificationResultValidatorComponent(array.get(i).getAsJsonObject()));
}
@@ -30256,13 +31111,13 @@ public class JsonParser extends JsonParserBase {
if (json.has("who"))
res.setWho(parseReference(getJObject(json, "who")));
if (json.has("type")) {
- JsonArray array = json.getAsJsonArray("type");
+ JsonArray array = getJArray(json, "type");
for (int i = 0; i < array.size(); i++) {
res.getType().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
};
if (json.has("communicationMethod")) {
- JsonArray array = json.getAsJsonArray("communicationMethod");
+ JsonArray array = getJArray(json, "communicationMethod");
for (int i = 0; i < array.size(); i++) {
res.getCommunicationMethod().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -30276,7 +31131,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("canPushUpdates"))
res.setCanPushUpdates(parseCodeableConcept(getJObject(json, "canPushUpdates")));
if (json.has("pushTypeAvailable")) {
- JsonArray array = json.getAsJsonArray("pushTypeAvailable");
+ JsonArray array = getJArray(json, "pushTypeAvailable");
for (int i = 0; i < array.size(); i++) {
res.getPushTypeAvailable().add(parseCodeableConcept(array.get(i).getAsJsonObject()));
}
@@ -30342,7 +31197,7 @@ public class JsonParser extends JsonParserBase {
protected void parseVisionPrescriptionProperties(JsonObject json, VisionPrescription res) throws IOException, FHIRFormatError {
parseDomainResourceProperties(json, res);
if (json.has("identifier")) {
- JsonArray array = json.getAsJsonArray("identifier");
+ JsonArray array = getJArray(json, "identifier");
for (int i = 0; i < array.size(); i++) {
res.getIdentifier().add(parseIdentifier(array.get(i).getAsJsonObject()));
}
@@ -30366,7 +31221,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("prescriber"))
res.setPrescriber(parseReference(getJObject(json, "prescriber")));
if (json.has("lensSpecification")) {
- JsonArray array = json.getAsJsonArray("lensSpecification");
+ JsonArray array = getJArray(json, "lensSpecification");
for (int i = 0; i < array.size(); i++) {
res.getLensSpecification().add(parseVisionPrescriptionLensSpecificationComponent(array.get(i).getAsJsonObject()));
}
@@ -30400,7 +31255,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_axis"))
parseElementProperties(getJObject(json, "_axis"), res.getAxisElement());
if (json.has("prism")) {
- JsonArray array = json.getAsJsonArray("prism");
+ JsonArray array = getJArray(json, "prism");
for (int i = 0; i < array.size(); i++) {
res.getPrism().add(parseVisionPrescriptionPrismComponent(array.get(i).getAsJsonObject()));
}
@@ -30432,7 +31287,7 @@ public class JsonParser extends JsonParserBase {
if (json.has("_brand"))
parseElementProperties(getJObject(json, "_brand"), res.getBrandElement());
if (json.has("note")) {
- JsonArray array = json.getAsJsonArray("note");
+ JsonArray array = getJArray(json, "note");
for (int i = 0; i < array.size(); i++) {
res.getNote().add(parseAnnotation(array.get(i).getAsJsonObject()));
}
@@ -30553,8 +31408,8 @@ public class JsonParser extends JsonParserBase {
return parseDeviceMetric(json);
} else if (t.equals("DeviceRequest")) {
return parseDeviceRequest(json);
- } else if (t.equals("DeviceUseStatement")) {
- return parseDeviceUseStatement(json);
+ } else if (t.equals("DeviceUsage")) {
+ return parseDeviceUsage(json);
} else if (t.equals("DiagnosticReport")) {
return parseDiagnosticReport(json);
} else if (t.equals("DocumentManifest")) {
@@ -30611,6 +31466,8 @@ public class JsonParser extends JsonParserBase {
return parseIngredient(json);
} else if (t.equals("InsurancePlan")) {
return parseInsurancePlan(json);
+ } else if (t.equals("InventoryReport")) {
+ return parseInventoryReport(json);
} else if (t.equals("Invoice")) {
return parseInvoice(json);
} else if (t.equals("Library")) {
@@ -30953,6 +31810,8 @@ public class JsonParser extends JsonParserBase {
return parseRange(getJObject(json, prefix+"Range"));
} else if (json.has(prefix+"Ratio")) {
return parseRatio(getJObject(json, prefix+"Ratio"));
+ } else if (json.has(prefix+"RatioRange")) {
+ return parseRatioRange(getJObject(json, prefix+"RatioRange"));
} else if (json.has(prefix+"Reference")) {
return parseReference(getJObject(json, prefix+"Reference"));
} else if (json.has(prefix+"RelatedArtifact")) {
@@ -31048,6 +31907,8 @@ public class JsonParser extends JsonParserBase {
return parseRange(json);
} else if (type.equals("Ratio")) {
return parseRatio(json);
+ } else if (type.equals("RatioRange")) {
+ return parseRatioRange(json);
} else if (type.equals("Reference")) {
return parseReference(json);
} else if (type.equals("RelatedArtifact")) {
@@ -31170,6 +32031,9 @@ public class JsonParser extends JsonParserBase {
if (json.has(prefix+"Ratio")) {
return true;
};
+ if (json.has(prefix+"RatioRange")) {
+ return true;
+ };
if (json.has(prefix+"Reference")) {
return true;
};
@@ -31323,7 +32187,7 @@ public class JsonParser extends JsonParserBase {
if (json.has(prefix+"DeviceRequest")) {
return true;
};
- if (json.has(prefix+"DeviceUseStatement")) {
+ if (json.has(prefix+"DeviceUsage")) {
return true;
};
if (json.has(prefix+"DiagnosticReport")) {
@@ -31410,6 +32274,9 @@ public class JsonParser extends JsonParserBase {
if (json.has(prefix+"InsurancePlan")) {
return true;
};
+ if (json.has(prefix+"InventoryReport")) {
+ return true;
+ };
if (json.has(prefix+"Invoice")) {
return true;
};
@@ -32123,10 +32990,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasLine()) {
if (anyHasValue(element.getLine())) {
- openArray("line");
- for (StringType e : element.getLine())
+ openArray("line");
+ for (StringType e : element.getLine())
composeStringCore(null, e, e != element.getLine().get(element.getLine().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getLine())) {
openArray("_line");
@@ -32438,10 +33305,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasProfile()) {
if (anyHasValue(element.getProfile())) {
- openArray("profile");
- for (CanonicalType e : element.getProfile())
+ openArray("profile");
+ for (CanonicalType e : element.getProfile())
composeCanonicalCore(null, e, e != element.getProfile().get(element.getProfile().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getProfile())) {
openArray("_profile");
@@ -32455,10 +33322,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasMustSupport()) {
if (anyHasValue(element.getMustSupport())) {
- openArray("mustSupport");
- for (StringType e : element.getMustSupport())
+ openArray("mustSupport");
+ for (StringType e : element.getMustSupport())
composeStringCore(null, e, e != element.getMustSupport().get(element.getMustSupport().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getMustSupport())) {
openArray("_mustSupport");
@@ -32734,10 +33601,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasAlias()) {
if (anyHasValue(element.getAlias())) {
- openArray("alias");
- for (StringType e : element.getAlias())
+ openArray("alias");
+ for (StringType e : element.getAlias())
composeStringCore(null, e, e != element.getAlias().get(element.getAlias().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getAlias())) {
openArray("_alias");
@@ -32802,10 +33669,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasCondition()) {
if (anyHasValue(element.getCondition())) {
- openArray("condition");
- for (IdType e : element.getCondition())
+ openArray("condition");
+ for (IdType e : element.getCondition())
composeIdCore(null, e, e != element.getCondition().get(element.getCondition().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getCondition())) {
openArray("_condition");
@@ -32937,10 +33804,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasProfile()) {
if (anyHasValue(element.getProfile())) {
- openArray("profile");
- for (CanonicalType e : element.getProfile())
+ openArray("profile");
+ for (CanonicalType e : element.getProfile())
composeCanonicalCore(null, e, e != element.getProfile().get(element.getProfile().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getProfile())) {
openArray("_profile");
@@ -32951,10 +33818,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasTargetProfile()) {
if (anyHasValue(element.getTargetProfile())) {
- openArray("targetProfile");
- for (CanonicalType e : element.getTargetProfile())
+ openArray("targetProfile");
+ for (CanonicalType e : element.getTargetProfile())
composeCanonicalCore(null, e, e != element.getTargetProfile().get(element.getTargetProfile().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getTargetProfile())) {
openArray("_targetProfile");
@@ -33167,10 +34034,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasGiven()) {
if (anyHasValue(element.getGiven())) {
- openArray("given");
- for (StringType e : element.getGiven())
+ openArray("given");
+ for (StringType e : element.getGiven())
composeStringCore(null, e, e != element.getGiven().get(element.getGiven().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getGiven())) {
openArray("_given");
@@ -33181,10 +34048,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasPrefix()) {
if (anyHasValue(element.getPrefix())) {
- openArray("prefix");
- for (StringType e : element.getPrefix())
+ openArray("prefix");
+ for (StringType e : element.getPrefix())
composeStringCore(null, e, e != element.getPrefix().get(element.getPrefix().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getPrefix())) {
openArray("_prefix");
@@ -33195,10 +34062,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasSuffix()) {
if (anyHasValue(element.getSuffix())) {
- openArray("suffix");
- for (StringType e : element.getSuffix())
+ openArray("suffix");
+ for (StringType e : element.getSuffix())
composeStringCore(null, e, e != element.getSuffix().get(element.getSuffix().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSuffix())) {
openArray("_suffix");
@@ -33297,10 +34164,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasProfile()) {
if (anyHasValue(element.getProfile())) {
- openArray("profile");
- for (CanonicalType e : element.getProfile())
+ openArray("profile");
+ for (CanonicalType e : element.getProfile())
composeCanonicalCore(null, e, e != element.getProfile().get(element.getProfile().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getProfile())) {
openArray("_profile");
@@ -33544,10 +34411,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasColor()) {
if (anyHasValue(element.getColor())) {
- openArray("color");
- for (StringType e : element.getColor())
+ openArray("color");
+ for (StringType e : element.getColor())
composeStringCore(null, e, e != element.getColor().get(element.getColor().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getColor())) {
openArray("_color");
@@ -33558,10 +34425,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasImprint()) {
if (anyHasValue(element.getImprint())) {
- openArray("imprint");
- for (StringType e : element.getImprint())
+ openArray("imprint");
+ for (StringType e : element.getImprint())
composeStringCore(null, e, e != element.getImprint().get(element.getImprint().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getImprint())) {
openArray("_imprint");
@@ -33673,6 +34540,27 @@ public class JsonParser extends JsonParserBase {
}
}
+ protected void composeRatioRange(String name, RatioRange element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeRatioRangeProperties(element);
+ close();
+ }
+ }
+
+ protected void composeRatioRangeProperties(RatioRange element) throws IOException {
+ composeDataTypeProperties(element);
+ if (element.hasLowNumerator()) {
+ composeQuantity("lowNumerator", element.getLowNumerator());
+ }
+ if (element.hasHighNumerator()) {
+ composeQuantity("highNumerator", element.getHighNumerator());
+ }
+ if (element.hasDenominator()) {
+ composeQuantity("denominator", element.getDenominator());
+ }
+ }
+
protected void composeReference(String name, Reference element) throws IOException {
if (element != null) {
open(name);
@@ -33841,12 +34729,19 @@ public class JsonParser extends JsonParserBase {
if (element.hasStatisticType()) {
composeCodeableConcept("statisticType", element.getStatisticType());
}
+ if (element.hasCategory()) {
+ composeCodeableConcept("category", element.getCategory());
+ }
if (element.hasQuantity()) {
composeQuantity("quantity", element.getQuantity());
}
if (element.hasNumberOfEventsElement()) {
- composeIntegerCore("numberOfEvents", element.getNumberOfEventsElement(), false);
- composeIntegerExtras("numberOfEvents", element.getNumberOfEventsElement(), false);
+ composeUnsignedIntCore("numberOfEvents", element.getNumberOfEventsElement(), false);
+ composeUnsignedIntExtras("numberOfEvents", element.getNumberOfEventsElement(), false);
+ }
+ if (element.hasNumberAffectedElement()) {
+ composeUnsignedIntCore("numberAffected", element.getNumberAffectedElement(), false);
+ composeUnsignedIntExtras("numberAffected", element.getNumberAffectedElement(), false);
}
if (element.hasSampleSize()) {
composeStatisticSampleSizeComponent("sampleSize", element.getSampleSize());
@@ -33886,16 +34781,16 @@ public class JsonParser extends JsonParserBase {
closeArray();
};
if (element.hasNumberOfStudiesElement()) {
- composeIntegerCore("numberOfStudies", element.getNumberOfStudiesElement(), false);
- composeIntegerExtras("numberOfStudies", element.getNumberOfStudiesElement(), false);
+ composeUnsignedIntCore("numberOfStudies", element.getNumberOfStudiesElement(), false);
+ composeUnsignedIntExtras("numberOfStudies", element.getNumberOfStudiesElement(), false);
}
if (element.hasNumberOfParticipantsElement()) {
- composeIntegerCore("numberOfParticipants", element.getNumberOfParticipantsElement(), false);
- composeIntegerExtras("numberOfParticipants", element.getNumberOfParticipantsElement(), false);
+ composeUnsignedIntCore("numberOfParticipants", element.getNumberOfParticipantsElement(), false);
+ composeUnsignedIntExtras("numberOfParticipants", element.getNumberOfParticipantsElement(), false);
}
if (element.hasKnownDataCountElement()) {
- composeIntegerCore("knownDataCount", element.getKnownDataCountElement(), false);
- composeIntegerExtras("knownDataCount", element.getKnownDataCountElement(), false);
+ composeUnsignedIntCore("knownDataCount", element.getKnownDataCountElement(), false);
+ composeUnsignedIntExtras("knownDataCount", element.getKnownDataCountElement(), false);
}
}
@@ -33989,7 +34884,7 @@ public class JsonParser extends JsonParserBase {
composeCodeableConcept("code", element.getCode());
}
if (element.hasValue()) {
- composeType("value", element.getValue());
+ composeQuantity("value", element.getValue());
}
if (element.hasVariable()) {
openArray("variable");
@@ -34135,10 +35030,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasTimeOfDay()) {
if (anyHasValue(element.getTimeOfDay())) {
- openArray("timeOfDay");
- for (TimeType e : element.getTimeOfDay())
+ openArray("timeOfDay");
+ for (TimeType e : element.getTimeOfDay())
composeTimeCore(null, e, e != element.getTimeOfDay().get(element.getTimeOfDay().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getTimeOfDay())) {
openArray("_timeOfDay");
@@ -34507,10 +35402,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasLibrary()) {
if (anyHasValue(element.getLibrary())) {
- openArray("library");
- for (CanonicalType e : element.getLibrary())
+ openArray("library");
+ for (CanonicalType e : element.getLibrary())
composeCanonicalCore(null, e, e != element.getLibrary().get(element.getLibrary().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getLibrary())) {
openArray("_library");
@@ -34546,7 +35441,7 @@ public class JsonParser extends JsonParserBase {
composeType("timing", element.getTiming());
}
if (element.hasLocation()) {
- composeReference("location", element.getLocation());
+ composeCodeableReference("location", element.getLocation());
}
if (element.hasParticipant()) {
openArray("participant");
@@ -34616,9 +35511,15 @@ public class JsonParser extends JsonParserBase {
composeEnumerationCore("type", element.getTypeElement(), new Enumerations.ActionParticipantTypeEnumFactory(), false);
composeEnumerationExtras("type", element.getTypeElement(), new Enumerations.ActionParticipantTypeEnumFactory(), false);
}
+ if (element.hasTypeReference()) {
+ composeReference("typeReference", element.getTypeReference());
+ }
if (element.hasRole()) {
composeCodeableConcept("role", element.getRole());
}
+ if (element.hasFunction()) {
+ composeCodeableConcept("function", element.getFunction());
+ }
}
protected void composeActivityDefinitionDynamicValueComponent(String name, ActivityDefinition.ActivityDefinitionDynamicValueComponent element) throws IOException {
@@ -34861,8 +35762,11 @@ public class JsonParser extends JsonParserBase {
composeCodeableConcept("seriousness", element.getSeriousness());
}
if (element.hasOutcome()) {
- composeCodeableConcept("outcome", element.getOutcome());
- }
+ openArray("outcome");
+ for (CodeableConcept e : element.getOutcome())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
if (element.hasRecorder()) {
composeReference("recorder", element.getRecorder());
}
@@ -35123,8 +36027,8 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasManifestation()) {
openArray("manifestation");
- for (CodeableConcept e : element.getManifestation())
- composeCodeableConcept(null, e);
+ for (CodeableReference e : element.getManifestation())
+ composeCodeableReference(null, e);
closeArray();
};
if (element.hasDescriptionElement()) {
@@ -35199,9 +36103,8 @@ public class JsonParser extends JsonParserBase {
composeCodeableReference(null, e);
closeArray();
};
- if (element.hasPriorityElement()) {
- composeUnsignedIntCore("priority", element.getPriorityElement(), false);
- composeUnsignedIntExtras("priority", element.getPriorityElement(), false);
+ if (element.hasPriority()) {
+ composeCodeableConcept("priority", element.getPriority());
}
if (element.hasDescriptionElement()) {
composeStringCore("description", element.getDescriptionElement(), false);
@@ -35382,6 +36285,15 @@ public class JsonParser extends JsonParserBase {
composeCodeableConcept(null, e);
closeArray();
};
+ if (element.hasBasedOn()) {
+ openArray("basedOn");
+ for (Reference e : element.getBasedOn())
+ composeReference(null, e);
+ closeArray();
+ };
+ if (element.hasEncounter()) {
+ composeReference("encounter", element.getEncounter());
+ }
if (element.hasAgent()) {
openArray("agent");
for (AuditEvent.AuditEventAgentComponent e : element.getAgent())
@@ -35438,10 +36350,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasPolicy()) {
if (anyHasValue(element.getPolicy())) {
- openArray("policy");
- for (UriType e : element.getPolicy())
+ openArray("policy");
+ for (UriType e : element.getPolicy())
composeUriCore(null, e, e != element.getPolicy().get(element.getPolicy().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getPolicy())) {
openArray("_policy");
@@ -36087,10 +36999,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasInstantiates()) {
if (anyHasValue(element.getInstantiates())) {
- openArray("instantiates");
- for (CanonicalType e : element.getInstantiates())
+ openArray("instantiates");
+ for (CanonicalType e : element.getInstantiates())
composeCanonicalCore(null, e, e != element.getInstantiates().get(element.getInstantiates().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiates())) {
openArray("_instantiates");
@@ -36101,10 +37013,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasImports()) {
if (anyHasValue(element.getImports())) {
- openArray("imports");
- for (CanonicalType e : element.getImports())
+ openArray("imports");
+ for (CanonicalType e : element.getImports())
composeCanonicalCore(null, e, e != element.getImports().get(element.getImports().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getImports())) {
openArray("_imports");
@@ -36125,10 +37037,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasFormat()) {
if (anyHasValue(element.getFormat())) {
- openArray("format");
- for (CodeType e : element.getFormat())
+ openArray("format");
+ for (CodeType e : element.getFormat())
composeCodeCore(null, e, e != element.getFormat().get(element.getFormat().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getFormat())) {
openArray("_format");
@@ -36139,10 +37051,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasPatchFormat()) {
if (anyHasValue(element.getPatchFormat())) {
- openArray("patchFormat");
- for (CodeType e : element.getPatchFormat())
+ openArray("patchFormat");
+ for (CodeType e : element.getPatchFormat())
composeCodeCore(null, e, e != element.getPatchFormat().get(element.getPatchFormat().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getPatchFormat())) {
openArray("_patchFormat");
@@ -36153,10 +37065,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasImplementationGuide()) {
if (anyHasValue(element.getImplementationGuide())) {
- openArray("implementationGuide");
- for (CanonicalType e : element.getImplementationGuide())
+ openArray("implementationGuide");
+ for (CanonicalType e : element.getImplementationGuide())
composeCanonicalCore(null, e, e != element.getImplementationGuide().get(element.getImplementationGuide().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getImplementationGuide())) {
openArray("_implementationGuide");
@@ -36279,10 +37191,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasCompartment()) {
if (anyHasValue(element.getCompartment())) {
- openArray("compartment");
- for (CanonicalType e : element.getCompartment())
+ openArray("compartment");
+ for (CanonicalType e : element.getCompartment())
composeCanonicalCore(null, e, e != element.getCompartment().get(element.getCompartment().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getCompartment())) {
openArray("_compartment");
@@ -36339,10 +37251,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasSupportedProfile()) {
if (anyHasValue(element.getSupportedProfile())) {
- openArray("supportedProfile");
- for (CanonicalType e : element.getSupportedProfile())
+ openArray("supportedProfile");
+ for (CanonicalType e : element.getSupportedProfile())
composeCanonicalCore(null, e, e != element.getSupportedProfile().get(element.getSupportedProfile().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSupportedProfile())) {
openArray("_supportedProfile");
@@ -36403,10 +37315,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasSearchInclude()) {
if (anyHasValue(element.getSearchInclude())) {
- openArray("searchInclude");
- for (StringType e : element.getSearchInclude())
+ openArray("searchInclude");
+ for (StringType e : element.getSearchInclude())
composeStringCore(null, e, e != element.getSearchInclude().get(element.getSearchInclude().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSearchInclude())) {
openArray("_searchInclude");
@@ -36417,10 +37329,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasSearchRevInclude()) {
if (anyHasValue(element.getSearchRevInclude())) {
- openArray("searchRevInclude");
- for (StringType e : element.getSearchRevInclude())
+ openArray("searchRevInclude");
+ for (StringType e : element.getSearchRevInclude())
composeStringCore(null, e, e != element.getSearchRevInclude().get(element.getSearchRevInclude().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSearchRevInclude())) {
openArray("_searchRevInclude");
@@ -36707,10 +37619,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasInstantiates()) {
if (anyHasValue(element.getInstantiates())) {
- openArray("instantiates");
- for (CanonicalType e : element.getInstantiates())
+ openArray("instantiates");
+ for (CanonicalType e : element.getInstantiates())
composeCanonicalCore(null, e, e != element.getInstantiates().get(element.getInstantiates().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiates())) {
openArray("_instantiates");
@@ -36721,10 +37633,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasImports()) {
if (anyHasValue(element.getImports())) {
- openArray("imports");
- for (CanonicalType e : element.getImports())
+ openArray("imports");
+ for (CanonicalType e : element.getImports())
composeCanonicalCore(null, e, e != element.getImports().get(element.getImports().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getImports())) {
openArray("_imports");
@@ -36745,10 +37657,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasFormat()) {
if (anyHasValue(element.getFormat())) {
- openArray("format");
- for (CodeType e : element.getFormat())
+ openArray("format");
+ for (CodeType e : element.getFormat())
composeCodeCore(null, e, e != element.getFormat().get(element.getFormat().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getFormat())) {
openArray("_format");
@@ -36759,10 +37671,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasPatchFormat()) {
if (anyHasValue(element.getPatchFormat())) {
- openArray("patchFormat");
- for (CodeType e : element.getPatchFormat())
+ openArray("patchFormat");
+ for (CodeType e : element.getPatchFormat())
composeCodeCore(null, e, e != element.getPatchFormat().get(element.getPatchFormat().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getPatchFormat())) {
openArray("_patchFormat");
@@ -36773,10 +37685,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasImplementationGuide()) {
if (anyHasValue(element.getImplementationGuide())) {
- openArray("implementationGuide");
- for (CanonicalType e : element.getImplementationGuide())
+ openArray("implementationGuide");
+ for (CanonicalType e : element.getImplementationGuide())
composeCanonicalCore(null, e, e != element.getImplementationGuide().get(element.getImplementationGuide().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getImplementationGuide())) {
openArray("_implementationGuide");
@@ -36858,6 +37770,12 @@ public class JsonParser extends JsonParserBase {
composeMarkdownCore("documentation", element.getDocumentationElement(), false);
composeMarkdownExtras("documentation", element.getDocumentationElement(), false);
}
+ if (element.hasFeature()) {
+ openArray("feature");
+ for (CapabilityStatement2.CapabilityStatement2RestFeatureComponent e : element.getFeature())
+ composeCapabilityStatement2RestFeatureComponent(null, e);
+ closeArray();
+ };
if (element.hasResource()) {
openArray("resource");
for (CapabilityStatement2.CapabilityStatement2RestResourceComponent e : element.getResource())
@@ -36884,10 +37802,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasCompartment()) {
if (anyHasValue(element.getCompartment())) {
- openArray("compartment");
- for (CanonicalType e : element.getCompartment())
+ openArray("compartment");
+ for (CanonicalType e : element.getCompartment())
composeCanonicalCore(null, e, e != element.getCompartment().get(element.getCompartment().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getCompartment())) {
openArray("_compartment");
@@ -36898,6 +37816,26 @@ public class JsonParser extends JsonParserBase {
};
}
+ protected void composeCapabilityStatement2RestFeatureComponent(String name, CapabilityStatement2.CapabilityStatement2RestFeatureComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCapabilityStatement2RestFeatureComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCapabilityStatement2RestFeatureComponentProperties(CapabilityStatement2.CapabilityStatement2RestFeatureComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasCodeElement()) {
+ composeEnumerationCore("code", element.getCodeElement(), new CapabilityStatement2.CapabilityFeatureEnumFactory(), false);
+ composeEnumerationExtras("code", element.getCodeElement(), new CapabilityStatement2.CapabilityFeatureEnumFactory(), false);
+ }
+ if (element.hasValueElement()) {
+ composeEnumerationCore("value", element.getValueElement(), new CapabilityStatement2.CapabilityFeatureValueEnumFactory(), false);
+ composeEnumerationExtras("value", element.getValueElement(), new CapabilityStatement2.CapabilityFeatureValueEnumFactory(), false);
+ }
+ }
+
protected void composeCapabilityStatement2RestResourceComponent(String name, CapabilityStatement2.CapabilityStatement2RestResourceComponent element) throws IOException {
if (element != null) {
open(name);
@@ -36918,10 +37856,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasSupportedProfile()) {
if (anyHasValue(element.getSupportedProfile())) {
- openArray("supportedProfile");
- for (CanonicalType e : element.getSupportedProfile())
+ openArray("supportedProfile");
+ for (CanonicalType e : element.getSupportedProfile())
composeCanonicalCore(null, e, e != element.getSupportedProfile().get(element.getSupportedProfile().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSupportedProfile())) {
openArray("_supportedProfile");
@@ -36934,6 +37872,12 @@ public class JsonParser extends JsonParserBase {
composeMarkdownCore("documentation", element.getDocumentationElement(), false);
composeMarkdownExtras("documentation", element.getDocumentationElement(), false);
}
+ if (element.hasFeature()) {
+ openArray("feature");
+ for (CapabilityStatement2.CapabilityStatement2RestFeatureComponent e : element.getFeature())
+ composeCapabilityStatement2RestFeatureComponent(null, e);
+ closeArray();
+ };
if (element.hasInteraction()) {
openArray("interaction");
for (CapabilityStatement2.ResourceInteractionComponent e : element.getInteraction())
@@ -36972,6 +37916,12 @@ public class JsonParser extends JsonParserBase {
composeMarkdownCore("documentation", element.getDocumentationElement(), false);
composeMarkdownExtras("documentation", element.getDocumentationElement(), false);
}
+ if (element.hasFeature()) {
+ openArray("feature");
+ for (CapabilityStatement2.CapabilityStatement2RestFeatureComponent e : element.getFeature())
+ composeCapabilityStatement2RestFeatureComponent(null, e);
+ closeArray();
+ };
}
protected void composeCapabilityStatement2RestResourceSearchParamComponent(String name, CapabilityStatement2.CapabilityStatement2RestResourceSearchParamComponent element) throws IOException {
@@ -37000,6 +37950,12 @@ public class JsonParser extends JsonParserBase {
composeMarkdownCore("documentation", element.getDocumentationElement(), false);
composeMarkdownExtras("documentation", element.getDocumentationElement(), false);
}
+ if (element.hasFeature()) {
+ openArray("feature");
+ for (CapabilityStatement2.CapabilityStatement2RestFeatureComponent e : element.getFeature())
+ composeCapabilityStatement2RestFeatureComponent(null, e);
+ closeArray();
+ };
}
protected void composeCapabilityStatement2RestResourceOperationComponent(String name, CapabilityStatement2.CapabilityStatement2RestResourceOperationComponent element) throws IOException {
@@ -37024,6 +37980,12 @@ public class JsonParser extends JsonParserBase {
composeMarkdownCore("documentation", element.getDocumentationElement(), false);
composeMarkdownExtras("documentation", element.getDocumentationElement(), false);
}
+ if (element.hasFeature()) {
+ openArray("feature");
+ for (CapabilityStatement2.CapabilityStatement2RestFeatureComponent e : element.getFeature())
+ composeCapabilityStatement2RestFeatureComponent(null, e);
+ closeArray();
+ };
}
protected void composeSystemInteractionComponent(String name, CapabilityStatement2.SystemInteractionComponent element) throws IOException {
@@ -37044,6 +38006,12 @@ public class JsonParser extends JsonParserBase {
composeMarkdownCore("documentation", element.getDocumentationElement(), false);
composeMarkdownExtras("documentation", element.getDocumentationElement(), false);
}
+ if (element.hasFeature()) {
+ openArray("feature");
+ for (CapabilityStatement2.CapabilityStatement2RestFeatureComponent e : element.getFeature())
+ composeCapabilityStatement2RestFeatureComponent(null, e);
+ closeArray();
+ };
}
protected void composeCarePlan(String name, CarePlan element) throws IOException {
@@ -37063,10 +38031,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -37077,10 +38045,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -37199,9 +38167,9 @@ public class JsonParser extends JsonParserBase {
protected void composeCarePlanActivityComponentProperties(CarePlan.CarePlanActivityComponent element) throws IOException {
composeBackboneElementProperties(element);
- if (element.hasOutcome()) {
- openArray("outcome");
- for (CodeableReference e : element.getOutcome())
+ if (element.hasPerformedActivity()) {
+ openArray("performedActivity");
+ for (CodeableReference e : element.getPerformedActivity())
composeCodeableReference(null, e);
closeArray();
};
@@ -37211,23 +38179,23 @@ public class JsonParser extends JsonParserBase {
composeAnnotation(null, e);
closeArray();
};
- if (element.hasReference()) {
- composeReference("reference", element.getReference());
+ if (element.hasPlannedActivityReference()) {
+ composeReference("plannedActivityReference", element.getPlannedActivityReference());
}
- if (element.hasDetail()) {
- composeCarePlanActivityDetailComponent("detail", element.getDetail());
+ if (element.hasPlannedActivityDetail()) {
+ composeCarePlanActivityPlannedActivityDetailComponent("plannedActivityDetail", element.getPlannedActivityDetail());
}
}
- protected void composeCarePlanActivityDetailComponent(String name, CarePlan.CarePlanActivityDetailComponent element) throws IOException {
+ protected void composeCarePlanActivityPlannedActivityDetailComponent(String name, CarePlan.CarePlanActivityPlannedActivityDetailComponent element) throws IOException {
if (element != null) {
open(name);
- composeCarePlanActivityDetailComponentProperties(element);
+ composeCarePlanActivityPlannedActivityDetailComponentProperties(element);
close();
}
}
- protected void composeCarePlanActivityDetailComponentProperties(CarePlan.CarePlanActivityDetailComponent element) throws IOException {
+ protected void composeCarePlanActivityPlannedActivityDetailComponentProperties(CarePlan.CarePlanActivityPlannedActivityDetailComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasKindElement()) {
composeEnumerationCore("kind", element.getKindElement(), new CarePlan.CarePlanActivityKindEnumFactory(), false);
@@ -37235,10 +38203,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -37249,10 +38217,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -37523,10 +38491,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasDefinitionUri()) {
if (anyHasValue(element.getDefinitionUri())) {
- openArray("definitionUri");
- for (UriType e : element.getDefinitionUri())
+ openArray("definitionUri");
+ for (UriType e : element.getDefinitionUri())
composeUriCore(null, e, e != element.getDefinitionUri().get(element.getDefinitionUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDefinitionUri())) {
openArray("_definitionUri");
@@ -37537,10 +38505,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasDefinitionCanonical()) {
if (anyHasValue(element.getDefinitionCanonical())) {
- openArray("definitionCanonical");
- for (CanonicalType e : element.getDefinitionCanonical())
+ openArray("definitionCanonical");
+ for (CanonicalType e : element.getDefinitionCanonical())
composeCanonicalCore(null, e, e != element.getDefinitionCanonical().get(element.getDefinitionCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDefinitionCanonical())) {
openArray("_definitionCanonical");
@@ -37695,10 +38663,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasDerivedFromUri()) {
if (anyHasValue(element.getDerivedFromUri())) {
- openArray("derivedFromUri");
- for (UriType e : element.getDerivedFromUri())
+ openArray("derivedFromUri");
+ for (UriType e : element.getDerivedFromUri())
composeUriCore(null, e, e != element.getDerivedFromUri().get(element.getDerivedFromUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDerivedFromUri())) {
openArray("_derivedFromUri");
@@ -37709,10 +38677,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasPartOf()) {
if (anyHasValue(element.getPartOf())) {
- openArray("partOf");
- for (CanonicalType e : element.getPartOf())
+ openArray("partOf");
+ for (CanonicalType e : element.getPartOf())
composeCanonicalCore(null, e, e != element.getPartOf().get(element.getPartOf().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getPartOf())) {
openArray("_partOf");
@@ -37723,10 +38691,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasReplaces()) {
if (anyHasValue(element.getReplaces())) {
- openArray("replaces");
- for (CanonicalType e : element.getReplaces())
+ openArray("replaces");
+ for (CanonicalType e : element.getReplaces())
composeCanonicalCore(null, e, e != element.getReplaces().get(element.getReplaces().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getReplaces())) {
openArray("_replaces");
@@ -37898,16 +38866,223 @@ public class JsonParser extends JsonParserBase {
composeUriCore("url", element.getUrlElement(), false);
composeUriExtras("url", element.getUrlElement(), false);
}
+ if (element.hasIdentifier()) {
+ openArray("identifier");
+ for (Identifier e : element.getIdentifier())
+ composeIdentifier(null, e);
+ closeArray();
+ };
+ if (element.hasVersionElement()) {
+ composeStringCore("version", element.getVersionElement(), false);
+ composeStringExtras("version", element.getVersionElement(), false);
+ }
+ if (element.hasNameElement()) {
+ composeStringCore("name", element.getNameElement(), false);
+ composeStringExtras("name", element.getNameElement(), false);
+ }
+ if (element.hasTitleElement()) {
+ composeStringCore("title", element.getTitleElement(), false);
+ composeStringExtras("title", element.getTitleElement(), false);
+ }
if (element.hasStatusElement()) {
composeEnumerationCore("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
}
+ if (element.hasExperimentalElement()) {
+ composeBooleanCore("experimental", element.getExperimentalElement(), false);
+ composeBooleanExtras("experimental", element.getExperimentalElement(), false);
+ }
+ if (element.hasDateElement()) {
+ composeDateTimeCore("date", element.getDateElement(), false);
+ composeDateTimeExtras("date", element.getDateElement(), false);
+ }
+ if (element.hasPublisherElement()) {
+ composeStringCore("publisher", element.getPublisherElement(), false);
+ composeStringExtras("publisher", element.getPublisherElement(), false);
+ }
+ if (element.hasContact()) {
+ openArray("contact");
+ for (ContactDetail e : element.getContact())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasDescriptionElement()) {
+ composeMarkdownCore("description", element.getDescriptionElement(), false);
+ composeMarkdownExtras("description", element.getDescriptionElement(), false);
+ }
if (element.hasUseContext()) {
openArray("useContext");
for (UsageContext e : element.getUseContext())
composeUsageContext(null, e);
closeArray();
};
+ if (element.hasJurisdiction()) {
+ openArray("jurisdiction");
+ for (CodeableConcept e : element.getJurisdiction())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasPurposeElement()) {
+ composeMarkdownCore("purpose", element.getPurposeElement(), false);
+ composeMarkdownExtras("purpose", element.getPurposeElement(), false);
+ }
+ if (element.hasCopyrightElement()) {
+ composeMarkdownCore("copyright", element.getCopyrightElement(), false);
+ composeMarkdownExtras("copyright", element.getCopyrightElement(), false);
+ }
+ if (element.hasApprovalDateElement()) {
+ composeDateCore("approvalDate", element.getApprovalDateElement(), false);
+ composeDateExtras("approvalDate", element.getApprovalDateElement(), false);
+ }
+ if (element.hasLastReviewDateElement()) {
+ composeDateCore("lastReviewDate", element.getLastReviewDateElement(), false);
+ composeDateExtras("lastReviewDate", element.getLastReviewDateElement(), false);
+ }
+ if (element.hasEffectivePeriod()) {
+ composePeriod("effectivePeriod", element.getEffectivePeriod());
+ }
+ if (element.hasAuthor()) {
+ openArray("author");
+ for (ContactDetail e : element.getAuthor())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasEditor()) {
+ openArray("editor");
+ for (ContactDetail e : element.getEditor())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasReviewer()) {
+ openArray("reviewer");
+ for (ContactDetail e : element.getReviewer())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasEndorser()) {
+ openArray("endorser");
+ for (ContactDetail e : element.getEndorser())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasSummary()) {
+ openArray("summary");
+ for (ContactDetail e : element.getSummary())
+ composeContactDetail(null, e);
+ closeArray();
+ };
+ if (element.hasClassification()) {
+ openArray("classification");
+ for (Citation.CitationClassificationComponent e : element.getClassification())
+ composeCitationClassificationComponent(null, e);
+ closeArray();
+ };
+ if (element.hasNote()) {
+ openArray("note");
+ for (Annotation e : element.getNote())
+ composeAnnotation(null, e);
+ closeArray();
+ };
+ if (element.hasCurrentState()) {
+ openArray("currentState");
+ for (CodeableConcept e : element.getCurrentState())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasStatusDate()) {
+ openArray("statusDate");
+ for (Citation.CitationStatusDateComponent e : element.getStatusDate())
+ composeCitationStatusDateComponent(null, e);
+ closeArray();
+ };
+ if (element.hasRelatesTo()) {
+ openArray("relatesTo");
+ for (Citation.CitationRelatesToComponent e : element.getRelatesTo())
+ composeCitationRelatesToComponent(null, e);
+ closeArray();
+ };
+ if (element.hasCitedArtifact()) {
+ composeCitationCitedArtifactComponent("citedArtifact", element.getCitedArtifact());
+ }
+ }
+
+ protected void composeCitationClassificationComponent(String name, Citation.CitationClassificationComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationClassificationComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationClassificationComponentProperties(Citation.CitationClassificationComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasClassifier()) {
+ openArray("classifier");
+ for (CodeableConcept e : element.getClassifier())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ }
+
+ protected void composeCitationStatusDateComponent(String name, Citation.CitationStatusDateComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationStatusDateComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationStatusDateComponentProperties(Citation.CitationStatusDateComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasActivity()) {
+ composeCodeableConcept("activity", element.getActivity());
+ }
+ if (element.hasActualElement()) {
+ composeBooleanCore("actual", element.getActualElement(), false);
+ composeBooleanExtras("actual", element.getActualElement(), false);
+ }
+ if (element.hasPeriod()) {
+ composePeriod("period", element.getPeriod());
+ }
+ }
+
+ protected void composeCitationRelatesToComponent(String name, Citation.CitationRelatesToComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationRelatesToComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationRelatesToComponentProperties(Citation.CitationRelatesToComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasRelationshipType()) {
+ composeCodeableConcept("relationshipType", element.getRelationshipType());
+ }
+ if (element.hasTargetClassifier()) {
+ openArray("targetClassifier");
+ for (CodeableConcept e : element.getTargetClassifier())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasTarget()) {
+ composeType("target", element.getTarget());
+ }
+ }
+
+ protected void composeCitationCitedArtifactComponent(String name, Citation.CitationCitedArtifactComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationCitedArtifactComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationCitedArtifactComponentProperties(Citation.CitationCitedArtifactComponent element) throws IOException {
+ composeBackboneElementProperties(element);
if (element.hasIdentifier()) {
openArray("identifier");
for (Identifier e : element.getIdentifier())
@@ -37920,114 +39095,131 @@ public class JsonParser extends JsonParserBase {
composeIdentifier(null, e);
closeArray();
};
- if (element.hasSummary()) {
- openArray("summary");
- for (Citation.CitationSummaryComponent e : element.getSummary())
- composeCitationSummaryComponent(null, e);
- closeArray();
- };
- if (element.hasDateCitedElement()) {
- composeDateTimeCore("dateCited", element.getDateCitedElement(), false);
- composeDateTimeExtras("dateCited", element.getDateCitedElement(), false);
+ if (element.hasDateAccessedElement()) {
+ composeDateTimeCore("dateAccessed", element.getDateAccessedElement(), false);
+ composeDateTimeExtras("dateAccessed", element.getDateAccessedElement(), false);
}
- if (element.hasVariantCitation()) {
- composeCitationVariantCitationComponent("variantCitation", element.getVariantCitation());
+ if (element.hasVersion()) {
+ composeCitationCitedArtifactVersionComponent("version", element.getVersion());
}
- if (element.hasPublishingModel()) {
- composeCodeableConcept("publishingModel", element.getPublishingModel());
- }
- if (element.hasJournal()) {
- composeCitationJournalComponent("journal", element.getJournal());
- }
- if (element.hasPublicationInfo()) {
- composeCitationPublicationInfoComponent("publicationInfo", element.getPublicationInfo());
- }
- if (element.hasArticleTitleElement()) {
- composeMarkdownCore("articleTitle", element.getArticleTitleElement(), false);
- composeMarkdownExtras("articleTitle", element.getArticleTitleElement(), false);
- }
- if (element.hasAlternativeTitle()) {
- openArray("alternativeTitle");
- for (Citation.CitationAlternativeTitleComponent e : element.getAlternativeTitle())
- composeCitationAlternativeTitleComponent(null, e);
- closeArray();
- };
- if (element.hasPagination()) {
- composeCitationPaginationComponent("pagination", element.getPagination());
- }
- if (element.hasArticleUrl()) {
- openArray("articleUrl");
- for (Citation.CitationArticleUrlComponent e : element.getArticleUrl())
- composeCitationArticleUrlComponent(null, e);
- closeArray();
- };
- if (element.hasAbstractElement()) {
- composeMarkdownCore("abstract", element.getAbstractElement(), false);
- composeMarkdownExtras("abstract", element.getAbstractElement(), false);
- }
- if (element.hasAbstractCopyrightElement()) {
- composeMarkdownCore("abstractCopyright", element.getAbstractCopyrightElement(), false);
- composeMarkdownExtras("abstractCopyright", element.getAbstractCopyrightElement(), false);
- }
- if (element.hasAlternativeAbstract()) {
- openArray("alternativeAbstract");
- for (Citation.CitationAlternativeAbstractComponent e : element.getAlternativeAbstract())
- composeCitationAlternativeAbstractComponent(null, e);
- closeArray();
- };
- if (element.hasContributorship()) {
- composeCitationContributorshipComponent("contributorship", element.getContributorship());
- }
- if (element.hasArticleLanguage()) {
- composeCodeableConcept("articleLanguage", element.getArticleLanguage());
- }
- if (element.hasAlternativeForm()) {
- openArray("alternativeForm");
- for (Citation.CitationAlternativeFormComponent e : element.getAlternativeForm())
- composeCitationAlternativeFormComponent(null, e);
- closeArray();
- };
- if (element.hasClassifier()) {
- openArray("classifier");
- for (CodeableConcept e : element.getClassifier())
+ if (element.hasCurrentState()) {
+ openArray("currentState");
+ for (CodeableConcept e : element.getCurrentState())
composeCodeableConcept(null, e);
closeArray();
};
- if (element.hasKeywordList()) {
- openArray("keywordList");
- for (Citation.CitationKeywordListComponent e : element.getKeywordList())
- composeCitationKeywordListComponent(null, e);
+ if (element.hasStatusDate()) {
+ openArray("statusDate");
+ for (Citation.CitationCitedArtifactStatusDateComponent e : element.getStatusDate())
+ composeCitationCitedArtifactStatusDateComponent(null, e);
closeArray();
};
- if (element.hasRelatedArtifact()) {
- openArray("relatedArtifact");
- for (RelatedArtifact e : element.getRelatedArtifact())
- composeRelatedArtifact(null, e);
+ if (element.hasTitle()) {
+ openArray("title");
+ for (Citation.CitationCitedArtifactTitleComponent e : element.getTitle())
+ composeCitationCitedArtifactTitleComponent(null, e);
closeArray();
};
+ if (element.hasAbstract()) {
+ openArray("abstract");
+ for (Citation.CitationCitedArtifactAbstractComponent e : element.getAbstract())
+ composeCitationCitedArtifactAbstractComponent(null, e);
+ closeArray();
+ };
+ if (element.hasPart()) {
+ composeCitationCitedArtifactPartComponent("part", element.getPart());
+ }
+ if (element.hasRelatesTo()) {
+ openArray("relatesTo");
+ for (Citation.CitationCitedArtifactRelatesToComponent e : element.getRelatesTo())
+ composeCitationCitedArtifactRelatesToComponent(null, e);
+ closeArray();
+ };
+ if (element.hasPublicationForm()) {
+ openArray("publicationForm");
+ for (Citation.CitationCitedArtifactPublicationFormComponent e : element.getPublicationForm())
+ composeCitationCitedArtifactPublicationFormComponent(null, e);
+ closeArray();
+ };
+ if (element.hasWebLocation()) {
+ openArray("webLocation");
+ for (Citation.CitationCitedArtifactWebLocationComponent e : element.getWebLocation())
+ composeCitationCitedArtifactWebLocationComponent(null, e);
+ closeArray();
+ };
+ if (element.hasClassification()) {
+ openArray("classification");
+ for (Citation.CitationCitedArtifactClassificationComponent e : element.getClassification())
+ composeCitationCitedArtifactClassificationComponent(null, e);
+ closeArray();
+ };
+ if (element.hasContributorship()) {
+ composeCitationCitedArtifactContributorshipComponent("contributorship", element.getContributorship());
+ }
if (element.hasNote()) {
openArray("note");
for (Annotation e : element.getNote())
composeAnnotation(null, e);
closeArray();
};
- if (element.hasMedlinePubMed()) {
- composeCitationMedlinePubMedComponent("medlinePubMed", element.getMedlinePubMed());
- }
}
- protected void composeCitationSummaryComponent(String name, Citation.CitationSummaryComponent element) throws IOException {
+ protected void composeCitationCitedArtifactVersionComponent(String name, Citation.CitationCitedArtifactVersionComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationSummaryComponentProperties(element);
+ composeCitationCitedArtifactVersionComponentProperties(element);
close();
}
}
- protected void composeCitationSummaryComponentProperties(Citation.CitationSummaryComponent element) throws IOException {
+ protected void composeCitationCitedArtifactVersionComponentProperties(Citation.CitationCitedArtifactVersionComponent element) throws IOException {
composeBackboneElementProperties(element);
- if (element.hasStyle()) {
- composeCodeableConcept("style", element.getStyle());
+ if (element.hasValueElement()) {
+ composeStringCore("value", element.getValueElement(), false);
+ composeStringExtras("value", element.getValueElement(), false);
+ }
+ if (element.hasBaseCitation()) {
+ composeReference("baseCitation", element.getBaseCitation());
+ }
+ }
+
+ protected void composeCitationCitedArtifactStatusDateComponent(String name, Citation.CitationCitedArtifactStatusDateComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationCitedArtifactStatusDateComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationCitedArtifactStatusDateComponentProperties(Citation.CitationCitedArtifactStatusDateComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasActivity()) {
+ composeCodeableConcept("activity", element.getActivity());
+ }
+ if (element.hasActualElement()) {
+ composeBooleanCore("actual", element.getActualElement(), false);
+ composeBooleanExtras("actual", element.getActualElement(), false);
+ }
+ if (element.hasPeriod()) {
+ composePeriod("period", element.getPeriod());
+ }
+ }
+
+ protected void composeCitationCitedArtifactTitleComponent(String name, Citation.CitationCitedArtifactTitleComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationCitedArtifactTitleComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationCitedArtifactTitleComponentProperties(Citation.CitationCitedArtifactTitleComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasLanguage()) {
+ composeCodeableConcept("language", element.getLanguage());
}
if (element.hasTextElement()) {
composeMarkdownCore("text", element.getTextElement(), false);
@@ -38035,15 +39227,41 @@ public class JsonParser extends JsonParserBase {
}
}
- protected void composeCitationVariantCitationComponent(String name, Citation.CitationVariantCitationComponent element) throws IOException {
+ protected void composeCitationCitedArtifactAbstractComponent(String name, Citation.CitationCitedArtifactAbstractComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationVariantCitationComponentProperties(element);
+ composeCitationCitedArtifactAbstractComponentProperties(element);
close();
}
}
- protected void composeCitationVariantCitationComponentProperties(Citation.CitationVariantCitationComponent element) throws IOException {
+ protected void composeCitationCitedArtifactAbstractComponentProperties(Citation.CitationCitedArtifactAbstractComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasLanguage()) {
+ composeCodeableConcept("language", element.getLanguage());
+ }
+ if (element.hasTextElement()) {
+ composeMarkdownCore("text", element.getTextElement(), false);
+ composeMarkdownExtras("text", element.getTextElement(), false);
+ }
+ if (element.hasCopyrightElement()) {
+ composeMarkdownCore("copyright", element.getCopyrightElement(), false);
+ composeMarkdownExtras("copyright", element.getCopyrightElement(), false);
+ }
+ }
+
+ protected void composeCitationCitedArtifactPartComponent(String name, Citation.CitationCitedArtifactPartComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationCitedArtifactPartComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationCitedArtifactPartComponentProperties(Citation.CitationCitedArtifactPartComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
@@ -38057,44 +39275,127 @@ public class JsonParser extends JsonParserBase {
}
}
- protected void composeCitationJournalComponent(String name, Citation.CitationJournalComponent element) throws IOException {
+ protected void composeCitationCitedArtifactRelatesToComponent(String name, Citation.CitationCitedArtifactRelatesToComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationJournalComponentProperties(element);
+ composeCitationCitedArtifactRelatesToComponentProperties(element);
close();
}
}
- protected void composeCitationJournalComponentProperties(Citation.CitationJournalComponent element) throws IOException {
+ protected void composeCitationCitedArtifactRelatesToComponentProperties(Citation.CitationCitedArtifactRelatesToComponent element) throws IOException {
composeBackboneElementProperties(element);
+ if (element.hasRelationshipType()) {
+ composeCodeableConcept("relationshipType", element.getRelationshipType());
+ }
+ if (element.hasTargetClassifier()) {
+ openArray("targetClassifier");
+ for (CodeableConcept e : element.getTargetClassifier())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasTarget()) {
+ composeType("target", element.getTarget());
+ }
+ }
+
+ protected void composeCitationCitedArtifactPublicationFormComponent(String name, Citation.CitationCitedArtifactPublicationFormComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationCitedArtifactPublicationFormComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationCitedArtifactPublicationFormComponentProperties(Citation.CitationCitedArtifactPublicationFormComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasPublishedIn()) {
+ composeCitationCitedArtifactPublicationFormPublishedInComponent("publishedIn", element.getPublishedIn());
+ }
+ if (element.hasPeriodicRelease()) {
+ composeCitationCitedArtifactPublicationFormPeriodicReleaseComponent("periodicRelease", element.getPeriodicRelease());
+ }
+ if (element.hasArticleDateElement()) {
+ composeDateTimeCore("articleDate", element.getArticleDateElement(), false);
+ composeDateTimeExtras("articleDate", element.getArticleDateElement(), false);
+ }
+ if (element.hasLastRevisionDateElement()) {
+ composeDateTimeCore("lastRevisionDate", element.getLastRevisionDateElement(), false);
+ composeDateTimeExtras("lastRevisionDate", element.getLastRevisionDateElement(), false);
+ }
+ if (element.hasLanguage()) {
+ openArray("language");
+ for (CodeableConcept e : element.getLanguage())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasAccessionNumberElement()) {
+ composeStringCore("accessionNumber", element.getAccessionNumberElement(), false);
+ composeStringExtras("accessionNumber", element.getAccessionNumberElement(), false);
+ }
+ if (element.hasPageStringElement()) {
+ composeStringCore("pageString", element.getPageStringElement(), false);
+ composeStringExtras("pageString", element.getPageStringElement(), false);
+ }
+ if (element.hasFirstPageElement()) {
+ composeStringCore("firstPage", element.getFirstPageElement(), false);
+ composeStringExtras("firstPage", element.getFirstPageElement(), false);
+ }
+ if (element.hasLastPageElement()) {
+ composeStringCore("lastPage", element.getLastPageElement(), false);
+ composeStringExtras("lastPage", element.getLastPageElement(), false);
+ }
+ if (element.hasPageCountElement()) {
+ composeStringCore("pageCount", element.getPageCountElement(), false);
+ composeStringExtras("pageCount", element.getPageCountElement(), false);
+ }
+ if (element.hasCopyrightElement()) {
+ composeMarkdownCore("copyright", element.getCopyrightElement(), false);
+ composeMarkdownExtras("copyright", element.getCopyrightElement(), false);
+ }
+ }
+
+ protected void composeCitationCitedArtifactPublicationFormPublishedInComponent(String name, Citation.CitationCitedArtifactPublicationFormPublishedInComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationCitedArtifactPublicationFormPublishedInComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationCitedArtifactPublicationFormPublishedInComponentProperties(Citation.CitationCitedArtifactPublicationFormPublishedInComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
if (element.hasIdentifier()) {
openArray("identifier");
for (Identifier e : element.getIdentifier())
composeIdentifier(null, e);
closeArray();
};
- if (element.hasCountryElement()) {
- composeStringCore("country", element.getCountryElement(), false);
- composeStringExtras("country", element.getCountryElement(), false);
- }
- if (element.hasJournalIssue()) {
- composeCitationJournalJournalIssueComponent("journalIssue", element.getJournalIssue());
- }
if (element.hasTitleElement()) {
composeStringCore("title", element.getTitleElement(), false);
composeStringExtras("title", element.getTitleElement(), false);
}
+ if (element.hasPublisher()) {
+ composeReference("publisher", element.getPublisher());
+ }
+ if (element.hasPublisherLocationElement()) {
+ composeStringCore("publisherLocation", element.getPublisherLocationElement(), false);
+ composeStringExtras("publisherLocation", element.getPublisherLocationElement(), false);
+ }
}
- protected void composeCitationJournalJournalIssueComponent(String name, Citation.CitationJournalJournalIssueComponent element) throws IOException {
+ protected void composeCitationCitedArtifactPublicationFormPeriodicReleaseComponent(String name, Citation.CitationCitedArtifactPublicationFormPeriodicReleaseComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationJournalJournalIssueComponentProperties(element);
+ composeCitationCitedArtifactPublicationFormPeriodicReleaseComponentProperties(element);
close();
}
}
- protected void composeCitationJournalJournalIssueComponentProperties(Citation.CitationJournalJournalIssueComponent element) throws IOException {
+ protected void composeCitationCitedArtifactPublicationFormPeriodicReleaseComponentProperties(Citation.CitationCitedArtifactPublicationFormPeriodicReleaseComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasCitedMedium()) {
composeCodeableConcept("citedMedium", element.getCitedMedium());
@@ -38107,20 +39408,20 @@ public class JsonParser extends JsonParserBase {
composeStringCore("issue", element.getIssueElement(), false);
composeStringExtras("issue", element.getIssueElement(), false);
}
- if (element.hasPublicationDate()) {
- composeCitationJournalJournalIssuePublicationDateComponent("publicationDate", element.getPublicationDate());
+ if (element.hasDateOfPublication()) {
+ composeCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent("dateOfPublication", element.getDateOfPublication());
}
}
- protected void composeCitationJournalJournalIssuePublicationDateComponent(String name, Citation.CitationJournalJournalIssuePublicationDateComponent element) throws IOException {
+ protected void composeCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent(String name, Citation.CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationJournalJournalIssuePublicationDateComponentProperties(element);
+ composeCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponentProperties(element);
close();
}
}
- protected void composeCitationJournalJournalIssuePublicationDateComponentProperties(Citation.CitationJournalJournalIssuePublicationDateComponent element) throws IOException {
+ protected void composeCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponentProperties(Citation.CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasDateElement()) {
composeDateCore("date", element.getDateElement(), false);
@@ -38148,124 +39449,15 @@ public class JsonParser extends JsonParserBase {
}
}
- protected void composeCitationPublicationInfoComponent(String name, Citation.CitationPublicationInfoComponent element) throws IOException {
+ protected void composeCitationCitedArtifactWebLocationComponent(String name, Citation.CitationCitedArtifactWebLocationComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationPublicationInfoComponentProperties(element);
+ composeCitationCitedArtifactWebLocationComponentProperties(element);
close();
}
}
- protected void composeCitationPublicationInfoComponentProperties(Citation.CitationPublicationInfoComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasPublishedIn()) {
- composeCitationPublicationInfoPublishedInComponent("publishedIn", element.getPublishedIn());
- }
- if (element.hasEntryDateElement()) {
- composeDateTimeCore("entryDate", element.getEntryDateElement(), false);
- composeDateTimeExtras("entryDate", element.getEntryDateElement(), false);
- }
- if (element.hasRevisionDateElement()) {
- composeDateTimeCore("revisionDate", element.getRevisionDateElement(), false);
- composeDateTimeExtras("revisionDate", element.getRevisionDateElement(), false);
- }
- if (element.hasPageCountElement()) {
- composeStringCore("pageCount", element.getPageCountElement(), false);
- composeStringExtras("pageCount", element.getPageCountElement(), false);
- }
- }
-
- protected void composeCitationPublicationInfoPublishedInComponent(String name, Citation.CitationPublicationInfoPublishedInComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationPublicationInfoPublishedInComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationPublicationInfoPublishedInComponentProperties(Citation.CitationPublicationInfoPublishedInComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasType()) {
- composeCodeableConcept("type", element.getType());
- }
- if (element.hasIdentifier()) {
- openArray("identifier");
- for (Identifier e : element.getIdentifier())
- composeIdentifier(null, e);
- closeArray();
- };
- if (element.hasNameElement()) {
- composeStringCore("name", element.getNameElement(), false);
- composeStringExtras("name", element.getNameElement(), false);
- }
- if (element.hasPublisher()) {
- composeReference("publisher", element.getPublisher());
- }
- if (element.hasPublisherLocationElement()) {
- composeStringCore("publisherLocation", element.getPublisherLocationElement(), false);
- composeStringExtras("publisherLocation", element.getPublisherLocationElement(), false);
- }
- if (element.hasStartDateElement()) {
- composeDateCore("startDate", element.getStartDateElement(), false);
- composeDateExtras("startDate", element.getStartDateElement(), false);
- }
- }
-
- protected void composeCitationAlternativeTitleComponent(String name, Citation.CitationAlternativeTitleComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationAlternativeTitleComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationAlternativeTitleComponentProperties(Citation.CitationAlternativeTitleComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasType()) {
- composeCodeableConcept("type", element.getType());
- }
- if (element.hasLanguage()) {
- composeCodeableConcept("language", element.getLanguage());
- }
- if (element.hasTitleElement()) {
- composeMarkdownCore("title", element.getTitleElement(), false);
- composeMarkdownExtras("title", element.getTitleElement(), false);
- }
- }
-
- protected void composeCitationPaginationComponent(String name, Citation.CitationPaginationComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationPaginationComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationPaginationComponentProperties(Citation.CitationPaginationComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasPageStringElement()) {
- composeStringCore("pageString", element.getPageStringElement(), false);
- composeStringExtras("pageString", element.getPageStringElement(), false);
- }
- if (element.hasFirstPageElement()) {
- composeStringCore("firstPage", element.getFirstPageElement(), false);
- composeStringExtras("firstPage", element.getFirstPageElement(), false);
- }
- if (element.hasLastPageElement()) {
- composeStringCore("lastPage", element.getLastPageElement(), false);
- composeStringExtras("lastPage", element.getLastPageElement(), false);
- }
- }
-
- protected void composeCitationArticleUrlComponent(String name, Citation.CitationArticleUrlComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationArticleUrlComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationArticleUrlComponentProperties(Citation.CitationArticleUrlComponent element) throws IOException {
+ protected void composeCitationCitedArtifactWebLocationComponentProperties(Citation.CitationCitedArtifactWebLocationComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
@@ -38276,41 +39468,68 @@ public class JsonParser extends JsonParserBase {
}
}
- protected void composeCitationAlternativeAbstractComponent(String name, Citation.CitationAlternativeAbstractComponent element) throws IOException {
+ protected void composeCitationCitedArtifactClassificationComponent(String name, Citation.CitationCitedArtifactClassificationComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationAlternativeAbstractComponentProperties(element);
+ composeCitationCitedArtifactClassificationComponentProperties(element);
close();
}
}
- protected void composeCitationAlternativeAbstractComponentProperties(Citation.CitationAlternativeAbstractComponent element) throws IOException {
+ protected void composeCitationCitedArtifactClassificationComponentProperties(Citation.CitationCitedArtifactClassificationComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
- if (element.hasLanguage()) {
- composeCodeableConcept("language", element.getLanguage());
- }
- if (element.hasAbstractElement()) {
- composeMarkdownCore("abstract", element.getAbstractElement(), false);
- composeMarkdownExtras("abstract", element.getAbstractElement(), false);
- }
- if (element.hasAbstractCopyrightElement()) {
- composeMarkdownCore("abstractCopyright", element.getAbstractCopyrightElement(), false);
- composeMarkdownExtras("abstractCopyright", element.getAbstractCopyrightElement(), false);
+ if (element.hasClassifier()) {
+ openArray("classifier");
+ for (CodeableConcept e : element.getClassifier())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasWhoClassified()) {
+ composeCitationCitedArtifactClassificationWhoClassifiedComponent("whoClassified", element.getWhoClassified());
}
}
- protected void composeCitationContributorshipComponent(String name, Citation.CitationContributorshipComponent element) throws IOException {
+ protected void composeCitationCitedArtifactClassificationWhoClassifiedComponent(String name, Citation.CitationCitedArtifactClassificationWhoClassifiedComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationContributorshipComponentProperties(element);
+ composeCitationCitedArtifactClassificationWhoClassifiedComponentProperties(element);
close();
}
}
- protected void composeCitationContributorshipComponentProperties(Citation.CitationContributorshipComponent element) throws IOException {
+ protected void composeCitationCitedArtifactClassificationWhoClassifiedComponentProperties(Citation.CitationCitedArtifactClassificationWhoClassifiedComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasPerson()) {
+ composeReference("person", element.getPerson());
+ }
+ if (element.hasOrganization()) {
+ composeReference("organization", element.getOrganization());
+ }
+ if (element.hasPublisher()) {
+ composeReference("publisher", element.getPublisher());
+ }
+ if (element.hasClassifierCopyrightElement()) {
+ composeStringCore("classifierCopyright", element.getClassifierCopyrightElement(), false);
+ composeStringExtras("classifierCopyright", element.getClassifierCopyrightElement(), false);
+ }
+ if (element.hasFreeToShareElement()) {
+ composeBooleanCore("freeToShare", element.getFreeToShareElement(), false);
+ composeBooleanExtras("freeToShare", element.getFreeToShareElement(), false);
+ }
+ }
+
+ protected void composeCitationCitedArtifactContributorshipComponent(String name, Citation.CitationCitedArtifactContributorshipComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationCitedArtifactContributorshipComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationCitedArtifactContributorshipComponentProperties(Citation.CitationCitedArtifactContributorshipComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasCompleteElement()) {
composeBooleanCore("complete", element.getCompleteElement(), false);
@@ -38318,27 +39537,27 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasEntry()) {
openArray("entry");
- for (Citation.CitationContributorshipEntryComponent e : element.getEntry())
- composeCitationContributorshipEntryComponent(null, e);
+ for (Citation.CitationCitedArtifactContributorshipEntryComponent e : element.getEntry())
+ composeCitationCitedArtifactContributorshipEntryComponent(null, e);
closeArray();
};
if (element.hasSummary()) {
openArray("summary");
- for (Citation.CitationContributorshipSummaryComponent e : element.getSummary())
- composeCitationContributorshipSummaryComponent(null, e);
+ for (Citation.CitationCitedArtifactContributorshipSummaryComponent e : element.getSummary())
+ composeCitationCitedArtifactContributorshipSummaryComponent(null, e);
closeArray();
};
}
- protected void composeCitationContributorshipEntryComponent(String name, Citation.CitationContributorshipEntryComponent element) throws IOException {
+ protected void composeCitationCitedArtifactContributorshipEntryComponent(String name, Citation.CitationCitedArtifactContributorshipEntryComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationContributorshipEntryComponentProperties(element);
+ composeCitationCitedArtifactContributorshipEntryComponentProperties(element);
close();
}
}
- protected void composeCitationContributorshipEntryComponentProperties(Citation.CitationContributorshipEntryComponent element) throws IOException {
+ protected void composeCitationCitedArtifactContributorshipEntryComponentProperties(Citation.CitationCitedArtifactContributorshipEntryComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasName()) {
composeHumanName("name", element.getName());
@@ -38359,15 +39578,15 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasAffiliationInfo()) {
openArray("affiliationInfo");
- for (Citation.CitationContributorshipEntryAffiliationInfoComponent e : element.getAffiliationInfo())
- composeCitationContributorshipEntryAffiliationInfoComponent(null, e);
+ for (Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent e : element.getAffiliationInfo())
+ composeCitationCitedArtifactContributorshipEntryAffiliationInfoComponent(null, e);
closeArray();
};
if (element.hasAddress()) {
openArray("address");
for (Address e : element.getAddress())
composeAddress(null, e);
- closeArray();
+ closeArray();
};
if (element.hasTelecom()) {
openArray("telecom");
@@ -38375,19 +39594,24 @@ public class JsonParser extends JsonParserBase {
composeContactPoint(null, e);
closeArray();
};
- if (element.hasContribution()) {
- openArray("contribution");
- for (CodeableConcept e : element.getContribution())
+ if (element.hasContributionType()) {
+ openArray("contributionType");
+ for (CodeableConcept e : element.getContributionType())
composeCodeableConcept(null, e);
closeArray();
};
- if (element.hasNotAnAuthorElement()) {
- composeBooleanCore("notAnAuthor", element.getNotAnAuthorElement(), false);
- composeBooleanExtras("notAnAuthor", element.getNotAnAuthorElement(), false);
+ if (element.hasRole()) {
+ composeCodeableConcept("role", element.getRole());
}
- if (element.hasCorrespondingAuthorElement()) {
- composeBooleanCore("correspondingAuthor", element.getCorrespondingAuthorElement(), false);
- composeBooleanExtras("correspondingAuthor", element.getCorrespondingAuthorElement(), false);
+ if (element.hasContributionInstance()) {
+ openArray("contributionInstance");
+ for (Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent e : element.getContributionInstance())
+ composeCitationCitedArtifactContributorshipEntryContributionInstanceComponent(null, e);
+ closeArray();
+ };
+ if (element.hasCorrespondingContactElement()) {
+ composeBooleanCore("correspondingContact", element.getCorrespondingContactElement(), false);
+ composeBooleanExtras("correspondingContact", element.getCorrespondingContactElement(), false);
}
if (element.hasListOrderElement()) {
composePositiveIntCore("listOrder", element.getListOrderElement(), false);
@@ -38395,15 +39619,15 @@ public class JsonParser extends JsonParserBase {
}
}
- protected void composeCitationContributorshipEntryAffiliationInfoComponent(String name, Citation.CitationContributorshipEntryAffiliationInfoComponent element) throws IOException {
+ protected void composeCitationCitedArtifactContributorshipEntryAffiliationInfoComponent(String name, Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationContributorshipEntryAffiliationInfoComponentProperties(element);
+ composeCitationCitedArtifactContributorshipEntryAffiliationInfoComponentProperties(element);
close();
}
}
- protected void composeCitationContributorshipEntryAffiliationInfoComponentProperties(Citation.CitationContributorshipEntryAffiliationInfoComponent element) throws IOException {
+ protected void composeCitationCitedArtifactContributorshipEntryAffiliationInfoComponentProperties(Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasAffiliationElement()) {
composeStringCore("affiliation", element.getAffiliationElement(), false);
@@ -38421,15 +39645,34 @@ public class JsonParser extends JsonParserBase {
};
}
- protected void composeCitationContributorshipSummaryComponent(String name, Citation.CitationContributorshipSummaryComponent element) throws IOException {
+ protected void composeCitationCitedArtifactContributorshipEntryContributionInstanceComponent(String name, Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent element) throws IOException {
if (element != null) {
open(name);
- composeCitationContributorshipSummaryComponentProperties(element);
+ composeCitationCitedArtifactContributorshipEntryContributionInstanceComponentProperties(element);
close();
}
}
- protected void composeCitationContributorshipSummaryComponentProperties(Citation.CitationContributorshipSummaryComponent element) throws IOException {
+ protected void composeCitationCitedArtifactContributorshipEntryContributionInstanceComponentProperties(Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasTimeElement()) {
+ composeDateTimeCore("time", element.getTimeElement(), false);
+ composeDateTimeExtras("time", element.getTimeElement(), false);
+ }
+ }
+
+ protected void composeCitationCitedArtifactContributorshipSummaryComponent(String name, Citation.CitationCitedArtifactContributorshipSummaryComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeCitationCitedArtifactContributorshipSummaryComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeCitationCitedArtifactContributorshipSummaryComponentProperties(Citation.CitationCitedArtifactContributorshipSummaryComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
@@ -38446,315 +39689,6 @@ public class JsonParser extends JsonParserBase {
}
}
- protected void composeCitationAlternativeFormComponent(String name, Citation.CitationAlternativeFormComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationAlternativeFormComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationAlternativeFormComponentProperties(Citation.CitationAlternativeFormComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasPublishingModel()) {
- composeCodeableConcept("publishingModel", element.getPublishingModel());
- }
- if (element.hasLanguage()) {
- composeCodeableConcept("language", element.getLanguage());
- }
- if (element.hasJournalIssue()) {
- composeCitationAlternativeFormJournalIssueComponent("journalIssue", element.getJournalIssue());
- }
- if (element.hasPagination()) {
- composeCitationAlternativeFormPaginationComponent("pagination", element.getPagination());
- }
- if (element.hasPublicationInfo()) {
- composeCitationAlternativeFormPublicationInfoComponent("publicationInfo", element.getPublicationInfo());
- }
- }
-
- protected void composeCitationAlternativeFormJournalIssueComponent(String name, Citation.CitationAlternativeFormJournalIssueComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationAlternativeFormJournalIssueComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationAlternativeFormJournalIssueComponentProperties(Citation.CitationAlternativeFormJournalIssueComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasCitedMedium()) {
- composeCodeableConcept("citedMedium", element.getCitedMedium());
- }
- if (element.hasVolumeElement()) {
- composeStringCore("volume", element.getVolumeElement(), false);
- composeStringExtras("volume", element.getVolumeElement(), false);
- }
- if (element.hasIssueElement()) {
- composeStringCore("issue", element.getIssueElement(), false);
- composeStringExtras("issue", element.getIssueElement(), false);
- }
- if (element.hasPublicationDate()) {
- composeCitationAlternativeFormJournalIssuePublicationDateComponent("publicationDate", element.getPublicationDate());
- }
- }
-
- protected void composeCitationAlternativeFormJournalIssuePublicationDateComponent(String name, Citation.CitationAlternativeFormJournalIssuePublicationDateComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationAlternativeFormJournalIssuePublicationDateComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationAlternativeFormJournalIssuePublicationDateComponentProperties(Citation.CitationAlternativeFormJournalIssuePublicationDateComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasDateElement()) {
- composeDateCore("date", element.getDateElement(), false);
- composeDateExtras("date", element.getDateElement(), false);
- }
- if (element.hasYearElement()) {
- composeStringCore("year", element.getYearElement(), false);
- composeStringExtras("year", element.getYearElement(), false);
- }
- if (element.hasMonthElement()) {
- composeStringCore("month", element.getMonthElement(), false);
- composeStringExtras("month", element.getMonthElement(), false);
- }
- if (element.hasDayElement()) {
- composeStringCore("day", element.getDayElement(), false);
- composeStringExtras("day", element.getDayElement(), false);
- }
- if (element.hasSeasonElement()) {
- composeStringCore("season", element.getSeasonElement(), false);
- composeStringExtras("season", element.getSeasonElement(), false);
- }
- if (element.hasTextElement()) {
- composeStringCore("text", element.getTextElement(), false);
- composeStringExtras("text", element.getTextElement(), false);
- }
- }
-
- protected void composeCitationAlternativeFormPaginationComponent(String name, Citation.CitationAlternativeFormPaginationComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationAlternativeFormPaginationComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationAlternativeFormPaginationComponentProperties(Citation.CitationAlternativeFormPaginationComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasPageStringElement()) {
- composeStringCore("pageString", element.getPageStringElement(), false);
- composeStringExtras("pageString", element.getPageStringElement(), false);
- }
- if (element.hasFirstPageElement()) {
- composeStringCore("firstPage", element.getFirstPageElement(), false);
- composeStringExtras("firstPage", element.getFirstPageElement(), false);
- }
- if (element.hasLastPageElement()) {
- composeStringCore("lastPage", element.getLastPageElement(), false);
- composeStringExtras("lastPage", element.getLastPageElement(), false);
- }
- }
-
- protected void composeCitationAlternativeFormPublicationInfoComponent(String name, Citation.CitationAlternativeFormPublicationInfoComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationAlternativeFormPublicationInfoComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationAlternativeFormPublicationInfoComponentProperties(Citation.CitationAlternativeFormPublicationInfoComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasPublishedIn()) {
- composeCitationAlternativeFormPublicationInfoPublishedInComponent("publishedIn", element.getPublishedIn());
- }
- if (element.hasEntryDateElement()) {
- composeDateTimeCore("entryDate", element.getEntryDateElement(), false);
- composeDateTimeExtras("entryDate", element.getEntryDateElement(), false);
- }
- if (element.hasRevisionDateElement()) {
- composeDateTimeCore("revisionDate", element.getRevisionDateElement(), false);
- composeDateTimeExtras("revisionDate", element.getRevisionDateElement(), false);
- }
- if (element.hasPageCountElement()) {
- composeStringCore("pageCount", element.getPageCountElement(), false);
- composeStringExtras("pageCount", element.getPageCountElement(), false);
- }
- }
-
- protected void composeCitationAlternativeFormPublicationInfoPublishedInComponent(String name, Citation.CitationAlternativeFormPublicationInfoPublishedInComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationAlternativeFormPublicationInfoPublishedInComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationAlternativeFormPublicationInfoPublishedInComponentProperties(Citation.CitationAlternativeFormPublicationInfoPublishedInComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasType()) {
- composeCodeableConcept("type", element.getType());
- }
- if (element.hasNameElement()) {
- composeStringCore("name", element.getNameElement(), false);
- composeStringExtras("name", element.getNameElement(), false);
- }
- if (element.hasPublisher()) {
- composeReference("publisher", element.getPublisher());
- }
- if (element.hasPublisherLocationElement()) {
- composeStringCore("publisherLocation", element.getPublisherLocationElement(), false);
- composeStringExtras("publisherLocation", element.getPublisherLocationElement(), false);
- }
- if (element.hasStartDateElement()) {
- composeDateCore("startDate", element.getStartDateElement(), false);
- composeDateExtras("startDate", element.getStartDateElement(), false);
- }
- }
-
- protected void composeCitationKeywordListComponent(String name, Citation.CitationKeywordListComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationKeywordListComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationKeywordListComponentProperties(Citation.CitationKeywordListComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasOwnerElement()) {
- composeStringCore("owner", element.getOwnerElement(), false);
- composeStringExtras("owner", element.getOwnerElement(), false);
- }
- if (element.hasKeyword()) {
- openArray("keyword");
- for (Citation.CitationKeywordListKeywordComponent e : element.getKeyword())
- composeCitationKeywordListKeywordComponent(null, e);
- closeArray();
- };
- }
-
- protected void composeCitationKeywordListKeywordComponent(String name, Citation.CitationKeywordListKeywordComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationKeywordListKeywordComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationKeywordListKeywordComponentProperties(Citation.CitationKeywordListKeywordComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasMajorTopicElement()) {
- composeBooleanCore("majorTopic", element.getMajorTopicElement(), false);
- composeBooleanExtras("majorTopic", element.getMajorTopicElement(), false);
- }
- if (element.hasValueElement()) {
- composeStringCore("value", element.getValueElement(), false);
- composeStringExtras("value", element.getValueElement(), false);
- }
- }
-
- protected void composeCitationMedlinePubMedComponent(String name, Citation.CitationMedlinePubMedComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationMedlinePubMedComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationMedlinePubMedComponentProperties(Citation.CitationMedlinePubMedComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasMedlineState()) {
- composeCodeableConcept("medlineState", element.getMedlineState());
- }
- if (element.hasOwner()) {
- composeCodeableConcept("owner", element.getOwner());
- }
- if (element.hasPmidElement()) {
- composePositiveIntCore("pmid", element.getPmidElement(), false);
- composePositiveIntExtras("pmid", element.getPmidElement(), false);
- }
- if (element.hasPmidVersionElement()) {
- composePositiveIntCore("pmidVersion", element.getPmidVersionElement(), false);
- composePositiveIntExtras("pmidVersion", element.getPmidVersionElement(), false);
- }
- if (element.hasDateCreatedElement()) {
- composeDateCore("dateCreated", element.getDateCreatedElement(), false);
- composeDateExtras("dateCreated", element.getDateCreatedElement(), false);
- }
- if (element.hasDateCompletedElement()) {
- composeDateCore("dateCompleted", element.getDateCompletedElement(), false);
- composeDateExtras("dateCompleted", element.getDateCompletedElement(), false);
- }
- if (element.hasDateRevisedElement()) {
- composeDateCore("dateRevised", element.getDateRevisedElement(), false);
- composeDateExtras("dateRevised", element.getDateRevisedElement(), false);
- }
- if (element.hasPubMedPubDate()) {
- openArray("pubMedPubDate");
- for (Citation.CitationMedlinePubMedPubMedPubDateComponent e : element.getPubMedPubDate())
- composeCitationMedlinePubMedPubMedPubDateComponent(null, e);
- closeArray();
- };
- if (element.hasPublicationState()) {
- composeCodeableConcept("publicationState", element.getPublicationState());
- }
- if (element.hasRelatedArticle()) {
- openArray("relatedArticle");
- for (Citation.CitationMedlinePubMedRelatedArticleComponent e : element.getRelatedArticle())
- composeCitationMedlinePubMedRelatedArticleComponent(null, e);
- closeArray();
- };
- }
-
- protected void composeCitationMedlinePubMedPubMedPubDateComponent(String name, Citation.CitationMedlinePubMedPubMedPubDateComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationMedlinePubMedPubMedPubDateComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationMedlinePubMedPubMedPubDateComponentProperties(Citation.CitationMedlinePubMedPubMedPubDateComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasPublicationState()) {
- composeCodeableConcept("publicationState", element.getPublicationState());
- }
- if (element.hasDateElement()) {
- composeDateTimeCore("date", element.getDateElement(), false);
- composeDateTimeExtras("date", element.getDateElement(), false);
- }
- }
-
- protected void composeCitationMedlinePubMedRelatedArticleComponent(String name, Citation.CitationMedlinePubMedRelatedArticleComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeCitationMedlinePubMedRelatedArticleComponentProperties(element);
- close();
- }
- }
-
- protected void composeCitationMedlinePubMedRelatedArticleComponentProperties(Citation.CitationMedlinePubMedRelatedArticleComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasCitationReference()) {
- composeReference("citationReference", element.getCitationReference());
- }
- if (element.hasCitationMarkdownElement()) {
- composeMarkdownCore("citationMarkdown", element.getCitationMarkdownElement(), false);
- composeMarkdownExtras("citationMarkdown", element.getCitationMarkdownElement(), false);
- }
- if (element.hasIdentifier()) {
- openArray("identifier");
- for (Identifier e : element.getIdentifier())
- composeIdentifier(null, e);
- closeArray();
- };
- }
-
protected void composeClaim(String name, Claim element) throws IOException {
if (element != null) {
prop("resourceType", name);
@@ -39069,10 +40003,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasPreAuthRef()) {
if (anyHasValue(element.getPreAuthRef())) {
- openArray("preAuthRef");
- for (StringType e : element.getPreAuthRef())
+ openArray("preAuthRef");
+ for (StringType e : element.getPreAuthRef())
composeStringCore(null, e, e != element.getPreAuthRef().get(element.getPreAuthRef().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getPreAuthRef())) {
openArray("_preAuthRef");
@@ -39124,10 +40058,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasCareTeamSequence()) {
if (anyHasValue(element.getCareTeamSequence())) {
- openArray("careTeamSequence");
- for (PositiveIntType e : element.getCareTeamSequence())
+ openArray("careTeamSequence");
+ for (PositiveIntType e : element.getCareTeamSequence())
composePositiveIntCore(null, e, e != element.getCareTeamSequence().get(element.getCareTeamSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getCareTeamSequence())) {
openArray("_careTeamSequence");
@@ -39138,10 +40072,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasDiagnosisSequence()) {
if (anyHasValue(element.getDiagnosisSequence())) {
- openArray("diagnosisSequence");
- for (PositiveIntType e : element.getDiagnosisSequence())
+ openArray("diagnosisSequence");
+ for (PositiveIntType e : element.getDiagnosisSequence())
composePositiveIntCore(null, e, e != element.getDiagnosisSequence().get(element.getDiagnosisSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDiagnosisSequence())) {
openArray("_diagnosisSequence");
@@ -39152,10 +40086,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasProcedureSequence()) {
if (anyHasValue(element.getProcedureSequence())) {
- openArray("procedureSequence");
- for (PositiveIntType e : element.getProcedureSequence())
+ openArray("procedureSequence");
+ for (PositiveIntType e : element.getProcedureSequence())
composePositiveIntCore(null, e, e != element.getProcedureSequence().get(element.getProcedureSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getProcedureSequence())) {
openArray("_procedureSequence");
@@ -39166,10 +40100,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInformationSequence()) {
if (anyHasValue(element.getInformationSequence())) {
- openArray("informationSequence");
- for (PositiveIntType e : element.getInformationSequence())
+ openArray("informationSequence");
+ for (PositiveIntType e : element.getInformationSequence())
composePositiveIntCore(null, e, e != element.getInformationSequence().get(element.getInformationSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInformationSequence())) {
openArray("_informationSequence");
@@ -39506,10 +40440,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasNoteNumber()) {
if (anyHasValue(element.getNoteNumber())) {
- openArray("noteNumber");
- for (PositiveIntType e : element.getNoteNumber())
+ openArray("noteNumber");
+ for (PositiveIntType e : element.getNoteNumber())
composePositiveIntCore(null, e, e != element.getNoteNumber().get(element.getNoteNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNoteNumber())) {
openArray("_noteNumber");
@@ -39573,10 +40507,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasNoteNumber()) {
if (anyHasValue(element.getNoteNumber())) {
- openArray("noteNumber");
- for (PositiveIntType e : element.getNoteNumber())
+ openArray("noteNumber");
+ for (PositiveIntType e : element.getNoteNumber())
composePositiveIntCore(null, e, e != element.getNoteNumber().get(element.getNoteNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNoteNumber())) {
openArray("_noteNumber");
@@ -39615,10 +40549,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasNoteNumber()) {
if (anyHasValue(element.getNoteNumber())) {
- openArray("noteNumber");
- for (PositiveIntType e : element.getNoteNumber())
+ openArray("noteNumber");
+ for (PositiveIntType e : element.getNoteNumber())
composePositiveIntCore(null, e, e != element.getNoteNumber().get(element.getNoteNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNoteNumber())) {
openArray("_noteNumber");
@@ -39647,10 +40581,10 @@ public class JsonParser extends JsonParserBase {
composeBackboneElementProperties(element);
if (element.hasItemSequence()) {
if (anyHasValue(element.getItemSequence())) {
- openArray("itemSequence");
- for (PositiveIntType e : element.getItemSequence())
+ openArray("itemSequence");
+ for (PositiveIntType e : element.getItemSequence())
composePositiveIntCore(null, e, e != element.getItemSequence().get(element.getItemSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getItemSequence())) {
openArray("_itemSequence");
@@ -39661,10 +40595,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasDetailSequence()) {
if (anyHasValue(element.getDetailSequence())) {
- openArray("detailSequence");
- for (PositiveIntType e : element.getDetailSequence())
+ openArray("detailSequence");
+ for (PositiveIntType e : element.getDetailSequence())
composePositiveIntCore(null, e, e != element.getDetailSequence().get(element.getDetailSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDetailSequence())) {
openArray("_detailSequence");
@@ -39675,10 +40609,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasSubdetailSequence()) {
if (anyHasValue(element.getSubdetailSequence())) {
- openArray("subdetailSequence");
- for (PositiveIntType e : element.getSubdetailSequence())
+ openArray("subdetailSequence");
+ for (PositiveIntType e : element.getSubdetailSequence())
composePositiveIntCore(null, e, e != element.getSubdetailSequence().get(element.getSubdetailSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSubdetailSequence())) {
openArray("_subdetailSequence");
@@ -39738,10 +40672,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasNoteNumber()) {
if (anyHasValue(element.getNoteNumber())) {
- openArray("noteNumber");
- for (PositiveIntType e : element.getNoteNumber())
+ openArray("noteNumber");
+ for (PositiveIntType e : element.getNoteNumber())
composePositiveIntCore(null, e, e != element.getNoteNumber().get(element.getNoteNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNoteNumber())) {
openArray("_noteNumber");
@@ -39798,10 +40732,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasNoteNumber()) {
if (anyHasValue(element.getNoteNumber())) {
- openArray("noteNumber");
- for (PositiveIntType e : element.getNoteNumber())
+ openArray("noteNumber");
+ for (PositiveIntType e : element.getNoteNumber())
composePositiveIntCore(null, e, e != element.getNoteNumber().get(element.getNoteNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNoteNumber())) {
openArray("_noteNumber");
@@ -39858,10 +40792,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasNoteNumber()) {
if (anyHasValue(element.getNoteNumber())) {
- openArray("noteNumber");
- for (PositiveIntType e : element.getNoteNumber())
+ openArray("noteNumber");
+ for (PositiveIntType e : element.getNoteNumber())
composePositiveIntCore(null, e, e != element.getNoteNumber().get(element.getNoteNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNoteNumber())) {
openArray("_noteNumber");
@@ -40064,10 +40998,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasProtocol()) {
if (anyHasValue(element.getProtocol())) {
- openArray("protocol");
- for (UriType e : element.getProtocol())
+ openArray("protocol");
+ for (UriType e : element.getProtocol())
composeUriCore(null, e, e != element.getProtocol().get(element.getProtocol().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getProtocol())) {
openArray("_protocol");
@@ -40197,15 +41131,15 @@ public class JsonParser extends JsonParserBase {
protected void composeClinicalUseIssueContraindicationComponentProperties(ClinicalUseIssue.ClinicalUseIssueContraindicationComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasDiseaseSymptomProcedure()) {
- composeCodeableConcept("diseaseSymptomProcedure", element.getDiseaseSymptomProcedure());
+ composeCodeableReference("diseaseSymptomProcedure", element.getDiseaseSymptomProcedure());
}
if (element.hasDiseaseStatus()) {
- composeCodeableConcept("diseaseStatus", element.getDiseaseStatus());
+ composeCodeableReference("diseaseStatus", element.getDiseaseStatus());
}
if (element.hasComorbidity()) {
openArray("comorbidity");
- for (CodeableConcept e : element.getComorbidity())
- composeCodeableConcept(null, e);
+ for (CodeableReference e : element.getComorbidity())
+ composeCodeableReference(null, e);
closeArray();
};
if (element.hasIndication()) {
@@ -40232,11 +41166,11 @@ public class JsonParser extends JsonParserBase {
protected void composeClinicalUseIssueContraindicationOtherTherapyComponentProperties(ClinicalUseIssue.ClinicalUseIssueContraindicationOtherTherapyComponent element) throws IOException {
composeBackboneElementProperties(element);
- if (element.hasTherapyRelationshipType()) {
- composeCodeableConcept("therapyRelationshipType", element.getTherapyRelationshipType());
+ if (element.hasRelationshipType()) {
+ composeCodeableConcept("relationshipType", element.getRelationshipType());
}
- if (element.hasMedication()) {
- composeType("medication", element.getMedication());
+ if (element.hasTherapy()) {
+ composeCodeableReference("therapy", element.getTherapy());
}
}
@@ -40251,19 +41185,19 @@ public class JsonParser extends JsonParserBase {
protected void composeClinicalUseIssueIndicationComponentProperties(ClinicalUseIssue.ClinicalUseIssueIndicationComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasDiseaseSymptomProcedure()) {
- composeCodeableConcept("diseaseSymptomProcedure", element.getDiseaseSymptomProcedure());
+ composeCodeableReference("diseaseSymptomProcedure", element.getDiseaseSymptomProcedure());
}
if (element.hasDiseaseStatus()) {
- composeCodeableConcept("diseaseStatus", element.getDiseaseStatus());
+ composeCodeableReference("diseaseStatus", element.getDiseaseStatus());
}
if (element.hasComorbidity()) {
openArray("comorbidity");
- for (CodeableConcept e : element.getComorbidity())
- composeCodeableConcept(null, e);
+ for (CodeableReference e : element.getComorbidity())
+ composeCodeableReference(null, e);
closeArray();
};
if (element.hasIntendedEffect()) {
- composeCodeableConcept("intendedEffect", element.getIntendedEffect());
+ composeCodeableReference("intendedEffect", element.getIntendedEffect());
}
if (element.hasDuration()) {
composeQuantity("duration", element.getDuration());
@@ -40302,7 +41236,7 @@ public class JsonParser extends JsonParserBase {
composeCodeableConcept("type", element.getType());
}
if (element.hasEffect()) {
- composeCodeableConcept("effect", element.getEffect());
+ composeCodeableReference("effect", element.getEffect());
}
if (element.hasIncidence()) {
composeCodeableConcept("incidence", element.getIncidence());
@@ -40338,7 +41272,7 @@ public class JsonParser extends JsonParserBase {
protected void composeClinicalUseIssueUndesirableEffectComponentProperties(ClinicalUseIssue.ClinicalUseIssueUndesirableEffectComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasSymptomConditionEffect()) {
- composeCodeableConcept("symptomConditionEffect", element.getSymptomConditionEffect());
+ composeCodeableReference("symptomConditionEffect", element.getSymptomConditionEffect());
}
if (element.hasClassification()) {
composeCodeableConcept("classification", element.getClassification());
@@ -40642,10 +41576,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -40656,10 +41590,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -40813,6 +41747,10 @@ public class JsonParser extends JsonParserBase {
if (element.hasStatusReason()) {
composeCodeableConcept("statusReason", element.getStatusReason());
}
+ if (element.hasIntentElement()) {
+ composeEnumerationCore("intent", element.getIntentElement(), new Enumerations.RequestIntentEnumFactory(), false);
+ composeEnumerationExtras("intent", element.getIntentElement(), new Enumerations.RequestIntentEnumFactory(), false);
+ }
if (element.hasCategory()) {
openArray("category");
for (CodeableConcept e : element.getCategory())
@@ -40991,10 +41929,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasParam()) {
if (anyHasValue(element.getParam())) {
- openArray("param");
- for (StringType e : element.getParam())
+ openArray("param");
+ for (StringType e : element.getParam())
composeStringCore(null, e, e != element.getParam().get(element.getParam().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getParam())) {
openArray("_param");
@@ -41223,8 +42161,11 @@ public class JsonParser extends JsonParserBase {
composeUriExtras("url", element.getUrlElement(), false);
}
if (element.hasIdentifier()) {
- composeIdentifier("identifier", element.getIdentifierFirstRep());
- }
+ openArray("identifier");
+ for (Identifier e : element.getIdentifier())
+ composeIdentifier(null, e);
+ closeArray();
+ };
if (element.hasVersionElement()) {
composeStringCore("version", element.getVersionElement(), false);
composeStringExtras("version", element.getVersionElement(), false);
@@ -41308,20 +42249,12 @@ public class JsonParser extends JsonParserBase {
protected void composeConceptMapGroupComponentProperties(ConceptMap.ConceptMapGroupComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasSourceElement()) {
- composeUriCore("source", element.getSourceElement(), false);
- composeUriExtras("source", element.getSourceElement(), false);
- }
- if (element.hasSourceVersionElement()) {
- composeStringCore("sourceVersion", element.getSourceVersionElement(), false);
- composeStringExtras("sourceVersion", element.getSourceVersionElement(), false);
+ composeCanonicalCore("source", element.getSourceElement(), false);
+ composeCanonicalExtras("source", element.getSourceElement(), false);
}
if (element.hasTargetElement()) {
- composeUriCore("target", element.getTargetElement(), false);
- composeUriExtras("target", element.getTargetElement(), false);
- }
- if (element.hasTargetVersionElement()) {
- composeStringCore("targetVersion", element.getTargetVersionElement(), false);
- composeStringExtras("targetVersion", element.getTargetVersionElement(), false);
+ composeCanonicalCore("target", element.getTargetElement(), false);
+ composeCanonicalExtras("target", element.getTargetElement(), false);
}
if (element.hasElement()) {
openArray("element");
@@ -41688,10 +42621,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasDefinition()) {
if (anyHasValue(element.getDefinition())) {
- openArray("definition");
- for (UriType e : element.getDefinition())
+ openArray("definition");
+ for (UriType e : element.getDefinition())
composeUriCore(null, e, e != element.getDefinition().get(element.getDefinition().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDefinition())) {
openArray("_definition");
@@ -41963,10 +42896,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasVerificationDate()) {
if (anyHasValue(element.getVerificationDate())) {
- openArray("verificationDate");
- for (DateTimeType e : element.getVerificationDate())
+ openArray("verificationDate");
+ for (DateTimeType e : element.getVerificationDate())
composeDateTimeCore(null, e, e != element.getVerificationDate().get(element.getVerificationDate().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getVerificationDate())) {
openArray("_verificationDate");
@@ -42172,10 +43105,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasAlias()) {
if (anyHasValue(element.getAlias())) {
- openArray("alias");
- for (StringType e : element.getAlias())
+ openArray("alias");
+ for (StringType e : element.getAlias())
composeStringCore(null, e, e != element.getAlias().get(element.getAlias().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getAlias())) {
openArray("_alias");
@@ -42359,10 +43292,10 @@ public class JsonParser extends JsonParserBase {
composeBackboneElementProperties(element);
if (element.hasNumber()) {
if (anyHasValue(element.getNumber())) {
- openArray("number");
- for (UnsignedIntType e : element.getNumber())
+ openArray("number");
+ for (UnsignedIntType e : element.getNumber())
composeUnsignedIntCore(null, e, e != element.getNumber().get(element.getNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNumber())) {
openArray("_number");
@@ -42437,10 +43370,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasLinkId()) {
if (anyHasValue(element.getLinkId())) {
- openArray("linkId");
- for (StringType e : element.getLinkId())
+ openArray("linkId");
+ for (StringType e : element.getLinkId())
composeStringCore(null, e, e != element.getLinkId().get(element.getLinkId().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getLinkId())) {
openArray("_linkId");
@@ -42451,10 +43384,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasSecurityLabelNumber()) {
if (anyHasValue(element.getSecurityLabelNumber())) {
- openArray("securityLabelNumber");
- for (UnsignedIntType e : element.getSecurityLabelNumber())
+ openArray("securityLabelNumber");
+ for (UnsignedIntType e : element.getSecurityLabelNumber())
composeUnsignedIntCore(null, e, e != element.getSecurityLabelNumber().get(element.getSecurityLabelNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSecurityLabelNumber())) {
openArray("_securityLabelNumber");
@@ -42569,10 +43502,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasLinkId()) {
if (anyHasValue(element.getLinkId())) {
- openArray("linkId");
- for (StringType e : element.getLinkId())
+ openArray("linkId");
+ for (StringType e : element.getLinkId())
composeStringCore(null, e, e != element.getLinkId().get(element.getLinkId().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getLinkId())) {
openArray("_linkId");
@@ -42589,10 +43522,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasSecurityLabelNumber()) {
if (anyHasValue(element.getSecurityLabelNumber())) {
- openArray("securityLabelNumber");
- for (UnsignedIntType e : element.getSecurityLabelNumber())
+ openArray("securityLabelNumber");
+ for (UnsignedIntType e : element.getSecurityLabelNumber())
composeUnsignedIntCore(null, e, e != element.getSecurityLabelNumber().get(element.getSecurityLabelNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSecurityLabelNumber())) {
openArray("_securityLabelNumber");
@@ -42687,10 +43620,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasLinkId()) {
if (anyHasValue(element.getLinkId())) {
- openArray("linkId");
- for (StringType e : element.getLinkId())
+ openArray("linkId");
+ for (StringType e : element.getLinkId())
composeStringCore(null, e, e != element.getLinkId().get(element.getLinkId().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getLinkId())) {
openArray("_linkId");
@@ -42701,10 +43634,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasSecurityLabelNumber()) {
if (anyHasValue(element.getSecurityLabelNumber())) {
- openArray("securityLabelNumber");
- for (UnsignedIntType e : element.getSecurityLabelNumber())
+ openArray("securityLabelNumber");
+ for (UnsignedIntType e : element.getSecurityLabelNumber())
composeUnsignedIntCore(null, e, e != element.getSecurityLabelNumber().get(element.getSecurityLabelNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSecurityLabelNumber())) {
openArray("_securityLabelNumber");
@@ -42743,10 +43676,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasLinkId()) {
if (anyHasValue(element.getLinkId())) {
- openArray("linkId");
- for (StringType e : element.getLinkId())
+ openArray("linkId");
+ for (StringType e : element.getLinkId())
composeStringCore(null, e, e != element.getLinkId().get(element.getLinkId().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getLinkId())) {
openArray("_linkId");
@@ -42763,10 +43696,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasContextLinkId()) {
if (anyHasValue(element.getContextLinkId())) {
- openArray("contextLinkId");
- for (StringType e : element.getContextLinkId())
+ openArray("contextLinkId");
+ for (StringType e : element.getContextLinkId())
composeStringCore(null, e, e != element.getContextLinkId().get(element.getContextLinkId().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getContextLinkId())) {
openArray("_contextLinkId");
@@ -42786,10 +43719,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasRequesterLinkId()) {
if (anyHasValue(element.getRequesterLinkId())) {
- openArray("requesterLinkId");
- for (StringType e : element.getRequesterLinkId())
+ openArray("requesterLinkId");
+ for (StringType e : element.getRequesterLinkId())
composeStringCore(null, e, e != element.getRequesterLinkId().get(element.getRequesterLinkId().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getRequesterLinkId())) {
openArray("_requesterLinkId");
@@ -42812,10 +43745,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasPerformerLinkId()) {
if (anyHasValue(element.getPerformerLinkId())) {
- openArray("performerLinkId");
- for (StringType e : element.getPerformerLinkId())
+ openArray("performerLinkId");
+ for (StringType e : element.getPerformerLinkId())
composeStringCore(null, e, e != element.getPerformerLinkId().get(element.getPerformerLinkId().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getPerformerLinkId())) {
openArray("_performerLinkId");
@@ -42832,10 +43765,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasReasonLinkId()) {
if (anyHasValue(element.getReasonLinkId())) {
- openArray("reasonLinkId");
- for (StringType e : element.getReasonLinkId())
+ openArray("reasonLinkId");
+ for (StringType e : element.getReasonLinkId())
composeStringCore(null, e, e != element.getReasonLinkId().get(element.getReasonLinkId().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getReasonLinkId())) {
openArray("_reasonLinkId");
@@ -42852,10 +43785,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasSecurityLabelNumber()) {
if (anyHasValue(element.getSecurityLabelNumber())) {
- openArray("securityLabelNumber");
- for (UnsignedIntType e : element.getSecurityLabelNumber())
+ openArray("securityLabelNumber");
+ for (UnsignedIntType e : element.getSecurityLabelNumber())
composeUnsignedIntCore(null, e, e != element.getSecurityLabelNumber().get(element.getSecurityLabelNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSecurityLabelNumber())) {
openArray("_securityLabelNumber");
@@ -43237,10 +44170,10 @@ public class JsonParser extends JsonParserBase {
composeBackboneElementProperties(element);
if (element.hasSupportingInfoSequence()) {
if (anyHasValue(element.getSupportingInfoSequence())) {
- openArray("supportingInfoSequence");
- for (PositiveIntType e : element.getSupportingInfoSequence())
+ openArray("supportingInfoSequence");
+ for (PositiveIntType e : element.getSupportingInfoSequence())
composePositiveIntCore(null, e, e != element.getSupportingInfoSequence().get(element.getSupportingInfoSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSupportingInfoSequence())) {
openArray("_supportingInfoSequence");
@@ -43350,8 +44283,8 @@ public class JsonParser extends JsonParserBase {
composeReference("request", element.getRequest());
}
if (element.hasOutcomeElement()) {
- composeEnumerationCore("outcome", element.getOutcomeElement(), new Enumerations.ClaimProcessingCodesEnumFactory(), false);
- composeEnumerationExtras("outcome", element.getOutcomeElement(), new Enumerations.ClaimProcessingCodesEnumFactory(), false);
+ composeEnumerationCore("outcome", element.getOutcomeElement(), new CoverageEligibilityResponse.EligibilityOutcomeEnumFactory(), false);
+ composeEnumerationExtras("outcome", element.getOutcomeElement(), new CoverageEligibilityResponse.EligibilityOutcomeEnumFactory(), false);
}
if (element.hasDispositionElement()) {
composeStringCore("disposition", element.getDispositionElement(), false);
@@ -43874,18 +44807,9 @@ public class JsonParser extends JsonParserBase {
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
- if (element.hasValueQuantity()) {
- openArray("valueQuantity");
- for (Quantity e : element.getValueQuantity())
- composeQuantity(null, e);
- closeArray();
- };
- if (element.hasValueCode()) {
- openArray("valueCode");
- for (CodeableConcept e : element.getValueCode())
- composeCodeableConcept(null, e);
- closeArray();
- };
+ if (element.hasValue()) {
+ composeType("value", element.getValue());
+ }
}
protected void composeDeviceOperationalStatusComponent(String name, Device.DeviceOperationalStatusComponent element) throws IOException {
@@ -43965,27 +44889,34 @@ public class JsonParser extends JsonParserBase {
composeStringExtras("modelNumber", element.getModelNumberElement(), false);
}
if (element.hasType()) {
- composeCodeableConcept("type", element.getType());
- }
+ openArray("type");
+ for (CodeableConcept e : element.getType())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
if (element.hasSpecialization()) {
openArray("specialization");
for (DeviceDefinition.DeviceDefinitionSpecializationComponent e : element.getSpecialization())
composeDeviceDefinitionSpecializationComponent(null, e);
closeArray();
};
- if (element.hasVersion()) {
- if (anyHasValue(element.getVersion())) {
- openArray("version");
- for (StringType e : element.getVersion())
- composeStringCore(null, e, e != element.getVersion().get(element.getVersion().size()-1));
+ if (element.hasHasPart()) {
+ openArray("hasPart");
+ for (DeviceDefinition.DeviceDefinitionHasPartComponent e : element.getHasPart())
+ composeDeviceDefinitionHasPartComponent(null, e);
+ closeArray();
+ };
+ if (element.hasPackaging()) {
+ openArray("packaging");
+ for (DeviceDefinition.DeviceDefinitionPackagingComponent e : element.getPackaging())
+ composeDeviceDefinitionPackagingComponent(null, e);
+ closeArray();
+ };
+ if (element.hasVersion()) {
+ openArray("version");
+ for (DeviceDefinition.DeviceDefinitionVersionComponent e : element.getVersion())
+ composeDeviceDefinitionVersionComponent(null, e);
closeArray();
- }
- if (anyHasExtras(element.getVersion())) {
- openArray("_version");
- for (StringType e : element.getVersion())
- composeStringExtras(null, e, true);
- closeArray();
- }
};
if (element.hasSafety()) {
openArray("safety");
@@ -44039,9 +44970,6 @@ public class JsonParser extends JsonParserBase {
composeAnnotation(null, e);
closeArray();
};
- if (element.hasQuantity()) {
- composeQuantity("quantity", element.getQuantity());
- }
if (element.hasParentDevice()) {
composeReference("parentDevice", element.getParentDevice());
}
@@ -44117,6 +45045,133 @@ public class JsonParser extends JsonParserBase {
}
}
+ protected void composeDeviceDefinitionHasPartComponent(String name, DeviceDefinition.DeviceDefinitionHasPartComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeDeviceDefinitionHasPartComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeDeviceDefinitionHasPartComponentProperties(DeviceDefinition.DeviceDefinitionHasPartComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasReference()) {
+ composeReference("reference", element.getReference());
+ }
+ if (element.hasCountElement()) {
+ composeIntegerCore("count", element.getCountElement(), false);
+ composeIntegerExtras("count", element.getCountElement(), false);
+ }
+ }
+
+ protected void composeDeviceDefinitionPackagingComponent(String name, DeviceDefinition.DeviceDefinitionPackagingComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeDeviceDefinitionPackagingComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeDeviceDefinitionPackagingComponentProperties(DeviceDefinition.DeviceDefinitionPackagingComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasIdentifier()) {
+ composeIdentifier("identifier", element.getIdentifier());
+ }
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasCountElement()) {
+ composeIntegerCore("count", element.getCountElement(), false);
+ composeIntegerExtras("count", element.getCountElement(), false);
+ }
+ if (element.hasDistributor()) {
+ openArray("distributor");
+ for (DeviceDefinition.DeviceDefinitionPackagingDistributorComponent e : element.getDistributor())
+ composeDeviceDefinitionPackagingDistributorComponent(null, e);
+ closeArray();
+ };
+ if (element.hasUdiDeviceIdentifier()) {
+ openArray("udiDeviceIdentifier");
+ for (DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent e : element.getUdiDeviceIdentifier())
+ composeDeviceDefinitionPackagingUdiDeviceIdentifierComponent(null, e);
+ closeArray();
+ };
+ if (element.hasPackaging()) {
+ openArray("packaging");
+ for (DeviceDefinition.DeviceDefinitionPackagingComponent e : element.getPackaging())
+ composeDeviceDefinitionPackagingComponent(null, e);
+ closeArray();
+ };
+ }
+
+ protected void composeDeviceDefinitionPackagingDistributorComponent(String name, DeviceDefinition.DeviceDefinitionPackagingDistributorComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeDeviceDefinitionPackagingDistributorComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeDeviceDefinitionPackagingDistributorComponentProperties(DeviceDefinition.DeviceDefinitionPackagingDistributorComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasNameElement()) {
+ composeStringCore("name", element.getNameElement(), false);
+ composeStringExtras("name", element.getNameElement(), false);
+ }
+ if (element.hasOrganizationReference()) {
+ openArray("organizationReference");
+ for (Reference e : element.getOrganizationReference())
+ composeReference(null, e);
+ closeArray();
+ };
+ }
+
+ protected void composeDeviceDefinitionPackagingUdiDeviceIdentifierComponent(String name, DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeDeviceDefinitionPackagingUdiDeviceIdentifierComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeDeviceDefinitionPackagingUdiDeviceIdentifierComponentProperties(DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasDeviceIdentifierElement()) {
+ composeStringCore("deviceIdentifier", element.getDeviceIdentifierElement(), false);
+ composeStringExtras("deviceIdentifier", element.getDeviceIdentifierElement(), false);
+ }
+ if (element.hasIssuerElement()) {
+ composeUriCore("issuer", element.getIssuerElement(), false);
+ composeUriExtras("issuer", element.getIssuerElement(), false);
+ }
+ if (element.hasJurisdictionElement()) {
+ composeUriCore("jurisdiction", element.getJurisdictionElement(), false);
+ composeUriExtras("jurisdiction", element.getJurisdictionElement(), false);
+ }
+ }
+
+ protected void composeDeviceDefinitionVersionComponent(String name, DeviceDefinition.DeviceDefinitionVersionComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeDeviceDefinitionVersionComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeDeviceDefinitionVersionComponentProperties(DeviceDefinition.DeviceDefinitionVersionComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasComponent()) {
+ composeIdentifier("component", element.getComponent());
+ }
+ if (element.hasValueElement()) {
+ composeStringCore("value", element.getValueElement(), false);
+ composeStringExtras("value", element.getValueElement(), false);
+ }
+ }
+
protected void composeDeviceDefinitionCapabilityComponent(String name, DeviceDefinition.DeviceDefinitionCapabilityComponent element) throws IOException {
if (element != null) {
open(name);
@@ -44279,10 +45334,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -44293,10 +45348,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -44332,9 +45387,17 @@ public class JsonParser extends JsonParserBase {
composeEnumerationCore("priority", element.getPriorityElement(), new Enumerations.RequestPriorityEnumFactory(), false);
composeEnumerationExtras("priority", element.getPriorityElement(), new Enumerations.RequestPriorityEnumFactory(), false);
}
+ if (element.hasDoNotPerformElement()) {
+ composeBooleanCore("doNotPerform", element.getDoNotPerformElement(), false);
+ composeBooleanExtras("doNotPerform", element.getDoNotPerformElement(), false);
+ }
if (element.hasCode()) {
composeCodeableReference("code", element.getCode());
}
+ if (element.hasQuantityElement()) {
+ composeIntegerCore("quantity", element.getQuantityElement(), false);
+ composeIntegerExtras("quantity", element.getQuantityElement(), false);
+ }
if (element.hasParameter()) {
openArray("parameter");
for (DeviceRequest.DeviceRequestParameterComponent e : element.getParameter())
@@ -44413,14 +45476,14 @@ public class JsonParser extends JsonParserBase {
}
}
- protected void composeDeviceUseStatement(String name, DeviceUseStatement element) throws IOException {
+ protected void composeDeviceUsage(String name, DeviceUsage element) throws IOException {
if (element != null) {
prop("resourceType", name);
- composeDeviceUseStatementProperties(element);
+ composeDeviceUsageProperties(element);
}
}
- protected void composeDeviceUseStatementProperties(DeviceUseStatement element) throws IOException {
+ protected void composeDeviceUsageProperties(DeviceUsage element) throws IOException {
composeDomainResourceProperties(element);
if (element.hasIdentifier()) {
openArray("identifier");
@@ -44435,8 +45498,8 @@ public class JsonParser extends JsonParserBase {
closeArray();
};
if (element.hasStatusElement()) {
- composeEnumerationCore("status", element.getStatusElement(), new DeviceUseStatement.DeviceUseStatementStatusEnumFactory(), false);
- composeEnumerationExtras("status", element.getStatusElement(), new DeviceUseStatement.DeviceUseStatementStatusEnumFactory(), false);
+ composeEnumerationCore("status", element.getStatusElement(), new DeviceUsage.DeviceUsageStatusEnumFactory(), false);
+ composeEnumerationExtras("status", element.getStatusElement(), new DeviceUsage.DeviceUsageStatusEnumFactory(), false);
}
if (element.hasCategory()) {
openArray("category");
@@ -44578,6 +45641,9 @@ public class JsonParser extends JsonParserBase {
composeDiagnosticReportMediaComponent(null, e);
closeArray();
};
+ if (element.hasComposition()) {
+ composeReference("composition", element.getComposition());
+ }
if (element.hasConclusionElement()) {
composeStringCore("conclusion", element.getConclusionElement(), false);
composeStringExtras("conclusion", element.getConclusionElement(), false);
@@ -44873,7 +45939,7 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasIdentifier()) {
composeIdentifier("identifier", element.getIdentifier());
- }
+ }
}
protected void composeEncounter(String name, Encounter element) throws IOException {
@@ -45195,10 +46261,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasPayloadMimeType()) {
if (anyHasValue(element.getPayloadMimeType())) {
- openArray("payloadMimeType");
- for (CodeType e : element.getPayloadMimeType())
+ openArray("payloadMimeType");
+ for (CodeType e : element.getPayloadMimeType())
composeCodeCore(null, e, e != element.getPayloadMimeType().get(element.getPayloadMimeType().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getPayloadMimeType())) {
openArray("_payloadMimeType");
@@ -45213,10 +46279,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasHeader()) {
if (anyHasValue(element.getHeader())) {
- openArray("header");
- for (StringType e : element.getHeader())
+ openArray("header");
+ for (StringType e : element.getHeader())
composeStringCore(null, e, e != element.getHeader().get(element.getHeader().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getHeader())) {
openArray("_header");
@@ -45287,8 +46353,8 @@ public class JsonParser extends JsonParserBase {
composeReference("request", element.getRequest());
}
if (element.hasOutcomeElement()) {
- composeEnumerationCore("outcome", element.getOutcomeElement(), new Enumerations.ClaimProcessingCodesEnumFactory(), false);
- composeEnumerationExtras("outcome", element.getOutcomeElement(), new Enumerations.ClaimProcessingCodesEnumFactory(), false);
+ composeEnumerationCore("outcome", element.getOutcomeElement(), new EnrollmentResponse.EnrollmentOutcomeEnumFactory(), false);
+ composeEnumerationExtras("outcome", element.getOutcomeElement(), new EnrollmentResponse.EnrollmentOutcomeEnumFactory(), false);
}
if (element.hasDispositionElement()) {
composeStringCore("disposition", element.getDispositionElement(), false);
@@ -45586,6 +46652,9 @@ public class JsonParser extends JsonParserBase {
composeStringCore("title", element.getTitleElement(), false);
composeStringExtras("title", element.getTitleElement(), false);
}
+ if (element.hasCiteAs()) {
+ composeType("citeAs", element.getCiteAs());
+ }
if (element.hasStatusElement()) {
composeEnumerationCore("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
@@ -45737,40 +46806,6 @@ public class JsonParser extends JsonParserBase {
}
protected void composeEvidenceCertaintyComponentProperties(Evidence.EvidenceCertaintyComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasDescriptionElement()) {
- composeStringCore("description", element.getDescriptionElement(), false);
- composeStringExtras("description", element.getDescriptionElement(), false);
- }
- if (element.hasNote()) {
- openArray("note");
- for (Annotation e : element.getNote())
- composeAnnotation(null, e);
- closeArray();
- };
- if (element.hasRating()) {
- openArray("rating");
- for (CodeableConcept e : element.getRating())
- composeCodeableConcept(null, e);
- closeArray();
- };
- if (element.hasCertaintySubcomponent()) {
- openArray("certaintySubcomponent");
- for (Evidence.EvidenceCertaintyCertaintySubcomponentComponent e : element.getCertaintySubcomponent())
- composeEvidenceCertaintyCertaintySubcomponentComponent(null, e);
- closeArray();
- };
- }
-
- protected void composeEvidenceCertaintyCertaintySubcomponentComponent(String name, Evidence.EvidenceCertaintyCertaintySubcomponentComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeEvidenceCertaintyCertaintySubcomponentComponentProperties(element);
- close();
- }
- }
-
- protected void composeEvidenceCertaintyCertaintySubcomponentComponentProperties(Evidence.EvidenceCertaintyCertaintySubcomponentComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasDescriptionElement()) {
composeStringCore("description", element.getDescriptionElement(), false);
@@ -45783,15 +46818,19 @@ public class JsonParser extends JsonParserBase {
closeArray();
};
if (element.hasType()) {
- openArray("type");
- for (CodeableConcept e : element.getType())
- composeCodeableConcept(null, e);
- closeArray();
- };
+ composeCodeableConcept("type", element.getType());
+ }
if (element.hasRating()) {
- openArray("rating");
- for (CodeableConcept e : element.getRating())
- composeCodeableConcept(null, e);
+ composeCodeableConcept("rating", element.getRating());
+ }
+ if (element.hasRaterElement()) {
+ composeStringCore("rater", element.getRaterElement(), false);
+ composeStringExtras("rater", element.getRaterElement(), false);
+ }
+ if (element.hasSubcomponent()) {
+ openArray("subcomponent");
+ for (Evidence.EvidenceCertaintyComponent e : element.getSubcomponent())
+ composeEvidenceCertaintyComponent(null, e);
closeArray();
};
}
@@ -45832,7 +46871,7 @@ public class JsonParser extends JsonParserBase {
closeArray();
};
if (element.hasCiteAs()) {
- composeReference("citeAs", element.getCiteAs());
+ composeType("citeAs", element.getCiteAs());
}
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
@@ -46016,6 +47055,12 @@ public class JsonParser extends JsonParserBase {
composeReference(null, e);
closeArray();
};
+ if (element.hasEntryQuantity()) {
+ openArray("entryQuantity");
+ for (Quantity e : element.getEntryQuantity())
+ composeQuantity(null, e);
+ closeArray();
+ };
if (element.hasEmptyReason()) {
composeCodeableConcept("emptyReason", element.getEmptyReason());
}
@@ -46328,10 +47373,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasWorkflow()) {
if (anyHasValue(element.getWorkflow())) {
- openArray("workflow");
- for (CanonicalType e : element.getWorkflow())
+ openArray("workflow");
+ for (CanonicalType e : element.getWorkflow())
composeCanonicalCore(null, e, e != element.getWorkflow().get(element.getWorkflow().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getWorkflow())) {
openArray("_workflow");
@@ -46685,10 +47730,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasPreAuthRef()) {
if (anyHasValue(element.getPreAuthRef())) {
- openArray("preAuthRef");
- for (StringType e : element.getPreAuthRef())
+ openArray("preAuthRef");
+ for (StringType e : element.getPreAuthRef())
composeStringCore(null, e, e != element.getPreAuthRef().get(element.getPreAuthRef().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getPreAuthRef())) {
openArray("_preAuthRef");
@@ -46974,10 +48019,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasPreAuthRef()) {
if (anyHasValue(element.getPreAuthRef())) {
- openArray("preAuthRef");
- for (StringType e : element.getPreAuthRef())
+ openArray("preAuthRef");
+ for (StringType e : element.getPreAuthRef())
composeStringCore(null, e, e != element.getPreAuthRef().get(element.getPreAuthRef().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getPreAuthRef())) {
openArray("_preAuthRef");
@@ -47026,10 +48071,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasCareTeamSequence()) {
if (anyHasValue(element.getCareTeamSequence())) {
- openArray("careTeamSequence");
- for (PositiveIntType e : element.getCareTeamSequence())
+ openArray("careTeamSequence");
+ for (PositiveIntType e : element.getCareTeamSequence())
composePositiveIntCore(null, e, e != element.getCareTeamSequence().get(element.getCareTeamSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getCareTeamSequence())) {
openArray("_careTeamSequence");
@@ -47040,10 +48085,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasDiagnosisSequence()) {
if (anyHasValue(element.getDiagnosisSequence())) {
- openArray("diagnosisSequence");
- for (PositiveIntType e : element.getDiagnosisSequence())
+ openArray("diagnosisSequence");
+ for (PositiveIntType e : element.getDiagnosisSequence())
composePositiveIntCore(null, e, e != element.getDiagnosisSequence().get(element.getDiagnosisSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDiagnosisSequence())) {
openArray("_diagnosisSequence");
@@ -47054,10 +48099,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasProcedureSequence()) {
if (anyHasValue(element.getProcedureSequence())) {
- openArray("procedureSequence");
- for (PositiveIntType e : element.getProcedureSequence())
+ openArray("procedureSequence");
+ for (PositiveIntType e : element.getProcedureSequence())
composePositiveIntCore(null, e, e != element.getProcedureSequence().get(element.getProcedureSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getProcedureSequence())) {
openArray("_procedureSequence");
@@ -47068,10 +48113,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInformationSequence()) {
if (anyHasValue(element.getInformationSequence())) {
- openArray("informationSequence");
- for (PositiveIntType e : element.getInformationSequence())
+ openArray("informationSequence");
+ for (PositiveIntType e : element.getInformationSequence())
composePositiveIntCore(null, e, e != element.getInformationSequence().get(element.getInformationSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInformationSequence())) {
openArray("_informationSequence");
@@ -47143,10 +48188,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasNoteNumber()) {
if (anyHasValue(element.getNoteNumber())) {
- openArray("noteNumber");
- for (PositiveIntType e : element.getNoteNumber())
+ openArray("noteNumber");
+ for (PositiveIntType e : element.getNoteNumber())
composePositiveIntCore(null, e, e != element.getNoteNumber().get(element.getNoteNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNoteNumber())) {
openArray("_noteNumber");
@@ -47250,10 +48295,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasNoteNumber()) {
if (anyHasValue(element.getNoteNumber())) {
- openArray("noteNumber");
- for (PositiveIntType e : element.getNoteNumber())
+ openArray("noteNumber");
+ for (PositiveIntType e : element.getNoteNumber())
composePositiveIntCore(null, e, e != element.getNoteNumber().get(element.getNoteNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNoteNumber())) {
openArray("_noteNumber");
@@ -47332,10 +48377,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasNoteNumber()) {
if (anyHasValue(element.getNoteNumber())) {
- openArray("noteNumber");
- for (PositiveIntType e : element.getNoteNumber())
+ openArray("noteNumber");
+ for (PositiveIntType e : element.getNoteNumber())
composePositiveIntCore(null, e, e != element.getNoteNumber().get(element.getNoteNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNoteNumber())) {
openArray("_noteNumber");
@@ -47364,10 +48409,10 @@ public class JsonParser extends JsonParserBase {
composeBackboneElementProperties(element);
if (element.hasItemSequence()) {
if (anyHasValue(element.getItemSequence())) {
- openArray("itemSequence");
- for (PositiveIntType e : element.getItemSequence())
+ openArray("itemSequence");
+ for (PositiveIntType e : element.getItemSequence())
composePositiveIntCore(null, e, e != element.getItemSequence().get(element.getItemSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getItemSequence())) {
openArray("_itemSequence");
@@ -47378,10 +48423,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasDetailSequence()) {
if (anyHasValue(element.getDetailSequence())) {
- openArray("detailSequence");
- for (PositiveIntType e : element.getDetailSequence())
+ openArray("detailSequence");
+ for (PositiveIntType e : element.getDetailSequence())
composePositiveIntCore(null, e, e != element.getDetailSequence().get(element.getDetailSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDetailSequence())) {
openArray("_detailSequence");
@@ -47392,10 +48437,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasSubDetailSequence()) {
if (anyHasValue(element.getSubDetailSequence())) {
- openArray("subDetailSequence");
- for (PositiveIntType e : element.getSubDetailSequence())
+ openArray("subDetailSequence");
+ for (PositiveIntType e : element.getSubDetailSequence())
composePositiveIntCore(null, e, e != element.getSubDetailSequence().get(element.getSubDetailSequence().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSubDetailSequence())) {
openArray("_subDetailSequence");
@@ -47455,10 +48500,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasNoteNumber()) {
if (anyHasValue(element.getNoteNumber())) {
- openArray("noteNumber");
- for (PositiveIntType e : element.getNoteNumber())
+ openArray("noteNumber");
+ for (PositiveIntType e : element.getNoteNumber())
composePositiveIntCore(null, e, e != element.getNoteNumber().get(element.getNoteNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNoteNumber())) {
openArray("_noteNumber");
@@ -47515,10 +48560,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasNoteNumber()) {
if (anyHasValue(element.getNoteNumber())) {
- openArray("noteNumber");
- for (PositiveIntType e : element.getNoteNumber())
+ openArray("noteNumber");
+ for (PositiveIntType e : element.getNoteNumber())
composePositiveIntCore(null, e, e != element.getNoteNumber().get(element.getNoteNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNoteNumber())) {
openArray("_noteNumber");
@@ -47575,10 +48620,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasNoteNumber()) {
if (anyHasValue(element.getNoteNumber())) {
- openArray("noteNumber");
- for (PositiveIntType e : element.getNoteNumber())
+ openArray("noteNumber");
+ for (PositiveIntType e : element.getNoteNumber())
composePositiveIntCore(null, e, e != element.getNoteNumber().get(element.getNoteNumber().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNoteNumber())) {
openArray("_noteNumber");
@@ -47751,10 +48796,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -47765,10 +48810,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -48002,8 +49047,8 @@ public class JsonParser extends JsonParserBase {
composeStringCore("statusReason", element.getStatusReasonElement(), false);
composeStringExtras("statusReason", element.getStatusReasonElement(), false);
}
- if (element.hasExpressedBy()) {
- composeReference("expressedBy", element.getExpressedBy());
+ if (element.hasSource()) {
+ composeReference("source", element.getSource());
}
if (element.hasAddresses()) {
openArray("addresses");
@@ -48853,10 +49898,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -48867,10 +49912,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -49176,10 +50221,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -49190,10 +50235,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -49665,10 +50710,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasImage()) {
if (anyHasValue(element.getImage())) {
- openArray("image");
- for (StringType e : element.getImage())
+ openArray("image");
+ for (StringType e : element.getImage())
composeStringCore(null, e, e != element.getImage().get(element.getImage().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getImage())) {
openArray("_image");
@@ -49679,10 +50724,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasOther()) {
if (anyHasValue(element.getOther())) {
- openArray("other");
- for (StringType e : element.getOther())
+ openArray("other");
+ for (StringType e : element.getOther())
composeStringCore(null, e, e != element.getOther().get(element.getOther().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getOther())) {
openArray("_other");
@@ -49735,10 +50780,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasAnchor()) {
if (anyHasValue(element.getAnchor())) {
- openArray("anchor");
- for (StringType e : element.getAnchor())
+ openArray("anchor");
+ for (StringType e : element.getAnchor())
composeStringCore(null, e, e != element.getAnchor().get(element.getAnchor().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getAnchor())) {
openArray("_anchor");
@@ -49770,6 +50815,9 @@ public class JsonParser extends JsonParserBase {
composeCodeableConcept(null, e);
closeArray();
};
+ if (element.hasGroup()) {
+ composeCodeableConcept("group", element.getGroup());
+ }
if (element.hasDescriptionElement()) {
composeMarkdownCore("description", element.getDescriptionElement(), false);
composeMarkdownExtras("description", element.getDescriptionElement(), false);
@@ -49806,7 +50854,7 @@ public class JsonParser extends JsonParserBase {
protected void composeIngredientSubstanceComponentProperties(Ingredient.IngredientSubstanceComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasCode()) {
- composeType("code", element.getCode());
+ composeCodeableReference("code", element.getCode());
}
if (element.hasStrength()) {
openArray("strength");
@@ -49827,25 +50875,28 @@ public class JsonParser extends JsonParserBase {
protected void composeIngredientSubstanceStrengthComponentProperties(Ingredient.IngredientSubstanceStrengthComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasPresentation()) {
- composeRatio("presentation", element.getPresentation());
+ composeType("presentation", element.getPresentation());
}
if (element.hasPresentationHighLimit()) {
- composeRatio("presentationHighLimit", element.getPresentationHighLimit());
+ composeType("presentationHighLimit", element.getPresentationHighLimit());
}
if (element.hasPresentationTextElement()) {
composeStringCore("presentationText", element.getPresentationTextElement(), false);
composeStringExtras("presentationText", element.getPresentationTextElement(), false);
}
if (element.hasConcentration()) {
- composeRatio("concentration", element.getConcentration());
+ composeType("concentration", element.getConcentration());
}
if (element.hasConcentrationHighLimit()) {
- composeRatio("concentrationHighLimit", element.getConcentrationHighLimit());
+ composeType("concentrationHighLimit", element.getConcentrationHighLimit());
}
if (element.hasConcentrationTextElement()) {
composeStringCore("concentrationText", element.getConcentrationTextElement(), false);
composeStringExtras("concentrationText", element.getConcentrationTextElement(), false);
}
+ if (element.hasBasis()) {
+ composeCodeableConcept("basis", element.getBasis());
+ }
if (element.hasMeasurementPointElement()) {
composeStringCore("measurementPoint", element.getMeasurementPointElement(), false);
composeStringExtras("measurementPoint", element.getMeasurementPointElement(), false);
@@ -49875,13 +50926,13 @@ public class JsonParser extends JsonParserBase {
protected void composeIngredientSubstanceStrengthReferenceStrengthComponentProperties(Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasSubstance()) {
- composeType("substance", element.getSubstance());
+ composeCodeableReference("substance", element.getSubstance());
}
if (element.hasStrength()) {
- composeRatio("strength", element.getStrength());
+ composeType("strength", element.getStrength());
}
if (element.hasStrengthHighLimit()) {
- composeRatio("strengthHighLimit", element.getStrengthHighLimit());
+ composeType("strengthHighLimit", element.getStrengthHighLimit());
}
if (element.hasMeasurementPointElement()) {
composeStringCore("measurementPoint", element.getMeasurementPointElement(), false);
@@ -49906,7 +50957,7 @@ public class JsonParser extends JsonParserBase {
protected void composeIngredientSpecifiedSubstanceComponentProperties(Ingredient.IngredientSpecifiedSubstanceComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasCode()) {
- composeType("code", element.getCode());
+ composeCodeableReference("code", element.getCode());
}
if (element.hasGroup()) {
composeCodeableConcept("group", element.getGroup());
@@ -49953,10 +51004,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasAlias()) {
if (anyHasValue(element.getAlias())) {
- openArray("alias");
- for (StringType e : element.getAlias())
+ openArray("alias");
+ for (StringType e : element.getAlias())
composeStringCore(null, e, e != element.getAlias().get(element.getAlias().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getAlias())) {
openArray("_alias");
@@ -50249,6 +51300,121 @@ public class JsonParser extends JsonParserBase {
}
}
+ protected void composeInventoryReport(String name, InventoryReport element) throws IOException {
+ if (element != null) {
+ prop("resourceType", name);
+ composeInventoryReportProperties(element);
+ }
+ }
+
+ protected void composeInventoryReportProperties(InventoryReport element) throws IOException {
+ composeDomainResourceProperties(element);
+ if (element.hasIdentifier()) {
+ openArray("identifier");
+ for (Identifier e : element.getIdentifier())
+ composeIdentifier(null, e);
+ closeArray();
+ };
+ if (element.hasStatusElement()) {
+ composeEnumerationCore("status", element.getStatusElement(), new InventoryReport.InventoryReportStatusEnumFactory(), false);
+ composeEnumerationExtras("status", element.getStatusElement(), new InventoryReport.InventoryReportStatusEnumFactory(), false);
+ }
+ if (element.hasCountTypeElement()) {
+ composeEnumerationCore("countType", element.getCountTypeElement(), new InventoryReport.InventoryCountTypeEnumFactory(), false);
+ composeEnumerationExtras("countType", element.getCountTypeElement(), new InventoryReport.InventoryCountTypeEnumFactory(), false);
+ }
+ if (element.hasOperationType()) {
+ composeCodeableConcept("operationType", element.getOperationType());
+ }
+ if (element.hasOperationTypeReason()) {
+ composeCodeableConcept("operationTypeReason", element.getOperationTypeReason());
+ }
+ if (element.hasReportedDateTimeElement()) {
+ composeDateTimeCore("reportedDateTime", element.getReportedDateTimeElement(), false);
+ composeDateTimeExtras("reportedDateTime", element.getReportedDateTimeElement(), false);
+ }
+ if (element.hasReporter()) {
+ composeReference("reporter", element.getReporter());
+ }
+ if (element.hasReportingPeriod()) {
+ composePeriod("reportingPeriod", element.getReportingPeriod());
+ }
+ if (element.hasInventoryListing()) {
+ openArray("inventoryListing");
+ for (InventoryReport.InventoryReportInventoryListingComponent e : element.getInventoryListing())
+ composeInventoryReportInventoryListingComponent(null, e);
+ closeArray();
+ };
+ if (element.hasNote()) {
+ composeAnnotation("note", element.getNote());
+ }
+ }
+
+ protected void composeInventoryReportInventoryListingComponent(String name, InventoryReport.InventoryReportInventoryListingComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeInventoryReportInventoryListingComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeInventoryReportInventoryListingComponentProperties(InventoryReport.InventoryReportInventoryListingComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasLocation()) {
+ composeReference("location", element.getLocation());
+ }
+ if (element.hasItemStatus()) {
+ composeCodeableConcept("itemStatus", element.getItemStatus());
+ }
+ if (element.hasCountingDateTimeElement()) {
+ composeDateTimeCore("countingDateTime", element.getCountingDateTimeElement(), false);
+ composeDateTimeExtras("countingDateTime", element.getCountingDateTimeElement(), false);
+ }
+ if (element.hasItems()) {
+ openArray("items");
+ for (InventoryReport.InventoryReportInventoryListingItemsComponent e : element.getItems())
+ composeInventoryReportInventoryListingItemsComponent(null, e);
+ closeArray();
+ };
+ }
+
+ protected void composeInventoryReportInventoryListingItemsComponent(String name, InventoryReport.InventoryReportInventoryListingItemsComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeInventoryReportInventoryListingItemsComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeInventoryReportInventoryListingItemsComponentProperties(InventoryReport.InventoryReportInventoryListingItemsComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasCategory()) {
+ composeCodeableConcept("category", element.getCategory());
+ }
+ if (element.hasQuantity()) {
+ composeQuantity("quantity", element.getQuantity());
+ }
+ if (element.hasItem()) {
+ composeCodeableReference("item", element.getItem());
+ }
+ if (element.hasLotElement()) {
+ composeStringCore("lot", element.getLotElement(), false);
+ composeStringExtras("lot", element.getLotElement(), false);
+ }
+ if (element.hasSerialElement()) {
+ composeStringCore("serial", element.getSerialElement(), false);
+ composeStringExtras("serial", element.getSerialElement(), false);
+ }
+ if (element.hasExpiryElement()) {
+ composeDateTimeCore("expiry", element.getExpiryElement(), false);
+ composeDateTimeExtras("expiry", element.getExpiryElement(), false);
+ }
+ if (element.hasManufacturingDateElement()) {
+ composeDateTimeCore("manufacturingDate", element.getManufacturingDateElement(), false);
+ composeDateTimeExtras("manufacturingDate", element.getManufacturingDateElement(), false);
+ }
+ }
+
protected void composeInvoice(String name, Invoice element) throws IOException {
if (element != null) {
prop("resourceType", name);
@@ -50714,10 +51880,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasAlias()) {
if (anyHasValue(element.getAlias())) {
- openArray("alias");
- for (StringType e : element.getAlias())
+ openArray("alias");
+ for (StringType e : element.getAlias())
composeStringCore(null, e, e != element.getAlias().get(element.getAlias().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getAlias())) {
openArray("_alias");
@@ -50868,8 +52034,8 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasIngredient()) {
openArray("ingredient");
- for (Reference e : element.getIngredient())
- composeReference(null, e);
+ for (CodeableReference e : element.getIngredient())
+ composeCodeableReference(null, e);
closeArray();
};
if (element.hasProperty()) {
@@ -50944,6 +52110,10 @@ public class JsonParser extends JsonParserBase {
if (element.hasSubject()) {
composeType("subject", element.getSubject());
}
+ if (element.hasBasisElement()) {
+ composeEnumerationCore("basis", element.getBasisElement(), new Enumerations.FHIRAllTypesEnumFactory(), false);
+ composeEnumerationExtras("basis", element.getBasisElement(), new Enumerations.FHIRAllTypesEnumFactory(), false);
+ }
if (element.hasDateElement()) {
composeDateTimeCore("date", element.getDateElement(), false);
composeDateTimeExtras("date", element.getDateElement(), false);
@@ -51035,10 +52205,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasLibrary()) {
if (anyHasValue(element.getLibrary())) {
- openArray("library");
- for (CanonicalType e : element.getLibrary())
+ openArray("library");
+ for (CanonicalType e : element.getLibrary())
composeCanonicalCore(null, e, e != element.getLibrary().get(element.getLibrary().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getLibrary())) {
openArray("_library");
@@ -51054,6 +52224,9 @@ public class JsonParser extends JsonParserBase {
if (element.hasScoring()) {
composeCodeableConcept("scoring", element.getScoring());
}
+ if (element.hasScoringUnit()) {
+ composeCodeableConcept("scoringUnit", element.getScoringUnit());
+ }
if (element.hasCompositeScoring()) {
composeCodeableConcept("compositeScoring", element.getCompositeScoring());
}
@@ -51084,10 +52257,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasDefinition()) {
if (anyHasValue(element.getDefinition())) {
- openArray("definition");
- for (MarkdownType e : element.getDefinition())
+ openArray("definition");
+ for (MarkdownType e : element.getDefinition())
composeMarkdownCore(null, e, e != element.getDefinition().get(element.getDefinition().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDefinition())) {
openArray("_definition");
@@ -51131,6 +52304,25 @@ public class JsonParser extends JsonParserBase {
composeStringCore("description", element.getDescriptionElement(), false);
composeStringExtras("description", element.getDescriptionElement(), false);
}
+ if (element.hasType()) {
+ openArray("type");
+ for (CodeableConcept e : element.getType())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasBasisElement()) {
+ composeEnumerationCore("basis", element.getBasisElement(), new Enumerations.FHIRAllTypesEnumFactory(), false);
+ composeEnumerationExtras("basis", element.getBasisElement(), new Enumerations.FHIRAllTypesEnumFactory(), false);
+ }
+ if (element.hasScoring()) {
+ composeCodeableConcept("scoring", element.getScoring());
+ }
+ if (element.hasScoringUnit()) {
+ composeCodeableConcept("scoringUnit", element.getScoringUnit());
+ }
+ if (element.hasImprovementNotation()) {
+ composeCodeableConcept("improvementNotation", element.getImprovementNotation());
+ }
if (element.hasPopulation()) {
openArray("population");
for (Measure.MeasureGroupPopulationComponent e : element.getPopulation())
@@ -51165,6 +52357,13 @@ public class JsonParser extends JsonParserBase {
if (element.hasCriteria()) {
composeExpression("criteria", element.getCriteria());
}
+ if (element.hasInputPopulationIdElement()) {
+ composeStringCore("inputPopulationId", element.getInputPopulationIdElement(), false);
+ composeStringExtras("inputPopulationId", element.getInputPopulationIdElement(), false);
+ }
+ if (element.hasAggregateMethod()) {
+ composeCodeableConcept("aggregateMethod", element.getAggregateMethod());
+ }
}
protected void composeMeasureGroupStratifierComponent(String name, Measure.MeasureGroupStratifierComponent element) throws IOException {
@@ -51268,6 +52467,10 @@ public class JsonParser extends JsonParserBase {
composeEnumerationCore("type", element.getTypeElement(), new MeasureReport.MeasureReportTypeEnumFactory(), false);
composeEnumerationExtras("type", element.getTypeElement(), new MeasureReport.MeasureReportTypeEnumFactory(), false);
}
+ if (element.hasDataUpdateTypeElement()) {
+ composeEnumerationCore("dataUpdateType", element.getDataUpdateTypeElement(), new MeasureReport.SubmitDataUpdateTypeEnumFactory(), false);
+ composeEnumerationExtras("dataUpdateType", element.getDataUpdateTypeElement(), new MeasureReport.SubmitDataUpdateTypeEnumFactory(), false);
+ }
if (element.hasMeasureElement()) {
composeCanonicalCore("measure", element.getMeasureElement(), false);
composeCanonicalExtras("measure", element.getMeasureElement(), false);
@@ -51282,9 +52485,15 @@ public class JsonParser extends JsonParserBase {
if (element.hasReporter()) {
composeReference("reporter", element.getReporter());
}
+ if (element.hasReportingVendor()) {
+ composeReference("reportingVendor", element.getReportingVendor());
+ }
if (element.hasPeriod()) {
composePeriod("period", element.getPeriod());
}
+ if (element.hasScoring()) {
+ composeCodeableConcept("scoring", element.getScoring());
+ }
if (element.hasImprovementNotation()) {
composeCodeableConcept("improvementNotation", element.getImprovementNotation());
}
@@ -51322,7 +52531,7 @@ public class JsonParser extends JsonParserBase {
closeArray();
};
if (element.hasMeasureScore()) {
- composeQuantity("measureScore", element.getMeasureScore());
+ composeType("measureScore", element.getMeasureScore());
}
if (element.hasStratifier()) {
openArray("stratifier");
@@ -51389,7 +52598,7 @@ public class JsonParser extends JsonParserBase {
protected void composeStratifierGroupComponentProperties(MeasureReport.StratifierGroupComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasValue()) {
- composeCodeableConcept("value", element.getValue());
+ composeType("value", element.getValue());
}
if (element.hasComponent()) {
openArray("component");
@@ -51404,7 +52613,7 @@ public class JsonParser extends JsonParserBase {
closeArray();
};
if (element.hasMeasureScore()) {
- composeQuantity("measureScore", element.getMeasureScore());
+ composeType("measureScore", element.getMeasureScore());
}
}
@@ -51422,7 +52631,7 @@ public class JsonParser extends JsonParserBase {
composeCodeableConcept("code", element.getCode());
}
if (element.hasValue()) {
- composeCodeableConcept("value", element.getValue());
+ composeType("value", element.getValue());
}
}
@@ -51470,8 +52679,8 @@ public class JsonParser extends JsonParserBase {
composeEnumerationCore("status", element.getStatusElement(), new Medication.MedicationStatusCodesEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new Medication.MedicationStatusCodesEnumFactory(), false);
}
- if (element.hasManufacturer()) {
- composeReference("manufacturer", element.getManufacturer());
+ if (element.hasSponsor()) {
+ composeReference("sponsor", element.getSponsor());
}
if (element.hasDoseForm()) {
composeCodeableConcept("doseForm", element.getDoseForm());
@@ -51549,10 +52758,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -51563,10 +52772,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -51912,8 +53121,8 @@ public class JsonParser extends JsonParserBase {
if (element.hasAuthor()) {
composeReference("author", element.getAuthor());
}
- if (element.hasManufacturer()) {
- composeReference("manufacturer", element.getManufacturer());
+ if (element.hasSponsor()) {
+ composeReference("sponsor", element.getSponsor());
}
if (element.hasDoseForm()) {
composeCodeableConcept("doseForm", element.getDoseForm());
@@ -51923,10 +53132,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasSynonym()) {
if (anyHasValue(element.getSynonym())) {
- openArray("synonym");
- for (StringType e : element.getSynonym())
+ openArray("synonym");
+ for (StringType e : element.getSynonym())
composeStringCore(null, e, e != element.getSynonym().get(element.getSynonym().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSynonym())) {
openArray("_synonym");
@@ -51996,10 +53205,10 @@ public class JsonParser extends JsonParserBase {
composeMedicationKnowledgeMonitoringProgramComponent(null, e);
closeArray();
};
- if (element.hasAdministrationGuideline()) {
- openArray("administrationGuideline");
- for (MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent e : element.getAdministrationGuideline())
- composeMedicationKnowledgeAdministrationGuidelineComponent(null, e);
+ if (element.hasIndicationGuideline()) {
+ openArray("indicationGuideline");
+ for (MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent e : element.getIndicationGuideline())
+ composeMedicationKnowledgeIndicationGuidelineComponent(null, e);
closeArray();
};
if (element.hasMedicineClassification()) {
@@ -52092,9 +53301,8 @@ public class JsonParser extends JsonParserBase {
if (element.hasItem()) {
composeCodeableReference("item", element.getItem());
}
- if (element.hasIsActiveElement()) {
- composeBooleanCore("isActive", element.getIsActiveElement(), false);
- composeBooleanExtras("isActive", element.getIsActiveElement(), false);
+ if (element.hasIsActive()) {
+ composeCodeableConcept("isActive", element.getIsActive());
}
if (element.hasStrength()) {
composeType("strength", element.getStrength());
@@ -52148,42 +53356,69 @@ public class JsonParser extends JsonParserBase {
}
}
- protected void composeMedicationKnowledgeAdministrationGuidelineComponent(String name, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent element) throws IOException {
+ protected void composeMedicationKnowledgeIndicationGuidelineComponent(String name, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent element) throws IOException {
if (element != null) {
open(name);
- composeMedicationKnowledgeAdministrationGuidelineComponentProperties(element);
+ composeMedicationKnowledgeIndicationGuidelineComponentProperties(element);
close();
}
}
- protected void composeMedicationKnowledgeAdministrationGuidelineComponentProperties(MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent element) throws IOException {
+ protected void composeMedicationKnowledgeIndicationGuidelineComponentProperties(MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent element) throws IOException {
composeBackboneElementProperties(element);
- if (element.hasDosage()) {
- openArray("dosage");
- for (MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent e : element.getDosage())
- composeMedicationKnowledgeAdministrationGuidelineDosageComponent(null, e);
+ if (element.hasIndication()) {
+ openArray("indication");
+ for (CodeableReference e : element.getIndication())
+ composeCodeableReference(null, e);
closeArray();
};
- if (element.hasIndication()) {
- composeCodeableReference("indication", element.getIndication());
+ if (element.hasDosingGuideline()) {
+ openArray("dosingGuideline");
+ for (MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent e : element.getDosingGuideline())
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelineComponent(null, e);
+ closeArray();
+ };
+ }
+
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelineComponent(String name, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelineComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelineComponentProperties(MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasTreatmentIntent()) {
+ composeCodeableConcept("treatmentIntent", element.getTreatmentIntent());
+ }
+ if (element.hasDosage()) {
+ openArray("dosage");
+ for (MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent e : element.getDosage())
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent(null, e);
+ closeArray();
+ };
+ if (element.hasAdministrationTreatment()) {
+ composeCodeableConcept("administrationTreatment", element.getAdministrationTreatment());
}
if (element.hasPatientCharacteristic()) {
openArray("patientCharacteristic");
- for (MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent e : element.getPatientCharacteristic())
- composeMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent(null, e);
+ for (MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent e : element.getPatientCharacteristic())
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent(null, e);
closeArray();
};
}
- protected void composeMedicationKnowledgeAdministrationGuidelineDosageComponent(String name, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent element) throws IOException {
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent(String name, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent element) throws IOException {
if (element != null) {
open(name);
- composeMedicationKnowledgeAdministrationGuidelineDosageComponentProperties(element);
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponentProperties(element);
close();
}
}
- protected void composeMedicationKnowledgeAdministrationGuidelineDosageComponentProperties(MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent element) throws IOException {
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponentProperties(MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
@@ -52196,15 +53431,15 @@ public class JsonParser extends JsonParserBase {
};
}
- protected void composeMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent(String name, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent element) throws IOException {
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent(String name, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent element) throws IOException {
if (element != null) {
open(name);
- composeMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponentProperties(element);
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponentProperties(element);
close();
}
}
- protected void composeMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponentProperties(MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent element) throws IOException {
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponentProperties(MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
@@ -52460,10 +53695,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -52474,10 +53709,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -52575,6 +53810,15 @@ public class JsonParser extends JsonParserBase {
if (element.hasDispenser()) {
composeReference("dispenser", element.getDispenser());
}
+ if (element.hasDispenserInstruction()) {
+ openArray("dispenserInstruction");
+ for (Annotation e : element.getDispenserInstruction())
+ composeAnnotation(null, e);
+ closeArray();
+ };
+ if (element.hasDoseAdministrationAid()) {
+ composeCodeableConcept("doseAdministrationAid", element.getDoseAdministrationAid());
+ }
}
protected void composeMedicationRequestDispenseRequestInitialFillComponent(String name, MedicationRequest.MedicationRequestDispenseRequestInitialFillComponent element) throws IOException {
@@ -52703,9 +53947,8 @@ public class JsonParser extends JsonParserBase {
composeDosage(null, e);
closeArray();
};
- if (element.hasTakenAsOrderedElement()) {
- composeBooleanCore("takenAsOrdered", element.getTakenAsOrderedElement(), false);
- composeBooleanExtras("takenAsOrdered", element.getTakenAsOrderedElement(), false);
+ if (element.hasAdherence()) {
+ composeCodeableConcept("adherence", element.getAdherence());
}
}
@@ -52785,22 +54028,10 @@ public class JsonParser extends JsonParserBase {
composeMarketingStatus(null, e);
closeArray();
};
- if (element.hasPharmaceuticalProduct()) {
- openArray("pharmaceuticalProduct");
- for (Reference e : element.getPharmaceuticalProduct())
- composeReference(null, e);
- closeArray();
- };
- if (element.hasPackagedMedicinalProduct()) {
- openArray("packagedMedicinalProduct");
- for (Reference e : element.getPackagedMedicinalProduct())
- composeReference(null, e);
- closeArray();
- };
if (element.hasIngredient()) {
openArray("ingredient");
- for (Reference e : element.getIngredient())
- composeReference(null, e);
+ for (CodeableReference e : element.getIngredient())
+ composeCodeableReference(null, e);
closeArray();
};
if (element.hasImpurity()) {
@@ -52845,10 +54076,22 @@ public class JsonParser extends JsonParserBase {
composeMedicinalProductDefinitionCrossReferenceComponent(null, e);
closeArray();
};
- if (element.hasManufacturingBusinessOperation()) {
- openArray("manufacturingBusinessOperation");
- for (MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent e : element.getManufacturingBusinessOperation())
- composeMedicinalProductDefinitionManufacturingBusinessOperationComponent(null, e);
+ if (element.hasOperation()) {
+ openArray("operation");
+ for (MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent e : element.getOperation())
+ composeMedicinalProductDefinitionOperationComponent(null, e);
+ closeArray();
+ };
+ if (element.hasPackage()) {
+ openArray("package");
+ for (MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent e : element.getPackage())
+ composeMedicinalProductDefinitionPackageComponent(null, e);
+ closeArray();
+ };
+ if (element.hasAdministrableProduct()) {
+ openArray("administrableProduct");
+ for (MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent e : element.getAdministrableProduct())
+ composeMedicinalProductDefinitionAdministrableProductComponent(null, e);
closeArray();
};
}
@@ -52960,15 +54203,15 @@ public class JsonParser extends JsonParserBase {
}
}
- protected void composeMedicinalProductDefinitionManufacturingBusinessOperationComponent(String name, MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent element) throws IOException {
+ protected void composeMedicinalProductDefinitionOperationComponent(String name, MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent element) throws IOException {
if (element != null) {
open(name);
- composeMedicinalProductDefinitionManufacturingBusinessOperationComponentProperties(element);
+ composeMedicinalProductDefinitionOperationComponentProperties(element);
close();
}
}
- protected void composeMedicinalProductDefinitionManufacturingBusinessOperationComponentProperties(MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent element) throws IOException {
+ protected void composeMedicinalProductDefinitionOperationComponentProperties(MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasType()) {
composeCodeableReference("type", element.getType());
@@ -52976,9 +54219,9 @@ public class JsonParser extends JsonParserBase {
if (element.hasEffectiveDate()) {
composePeriod("effectiveDate", element.getEffectiveDate());
}
- if (element.hasManufacturer()) {
- openArray("manufacturer");
- for (Reference e : element.getManufacturer())
+ if (element.hasOrganization()) {
+ openArray("organization");
+ for (Reference e : element.getOrganization())
composeReference(null, e);
closeArray();
};
@@ -52990,6 +54233,48 @@ public class JsonParser extends JsonParserBase {
}
}
+ protected void composeMedicinalProductDefinitionPackageComponent(String name, MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeMedicinalProductDefinitionPackageComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeMedicinalProductDefinitionPackageComponentProperties(MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasSize()) {
+ composeType("size", element.getSize());
+ }
+ if (element.hasPackage()) {
+ composeReference("package", element.getPackage());
+ }
+ }
+
+ protected void composeMedicinalProductDefinitionAdministrableProductComponent(String name, MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeMedicinalProductDefinitionAdministrableProductComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeMedicinalProductDefinitionAdministrableProductComponentProperties(MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasRoute()) {
+ openArray("route");
+ for (CodeableConcept e : element.getRoute())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasProduct()) {
+ composeReference("product", element.getProduct());
+ }
+ }
+
protected void composeMessageDefinition(String name, MessageDefinition element) throws IOException {
if (element != null) {
prop("resourceType", name);
@@ -53023,10 +54308,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasReplaces()) {
if (anyHasValue(element.getReplaces())) {
- openArray("replaces");
- for (CanonicalType e : element.getReplaces())
+ openArray("replaces");
+ for (CanonicalType e : element.getReplaces())
composeCanonicalCore(null, e, e != element.getReplaces().get(element.getReplaces().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getReplaces())) {
openArray("_replaces");
@@ -53087,10 +54372,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasParent()) {
if (anyHasValue(element.getParent())) {
- openArray("parent");
- for (CanonicalType e : element.getParent())
+ openArray("parent");
+ for (CanonicalType e : element.getParent())
composeCanonicalCore(null, e, e != element.getParent().get(element.getParent().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getParent())) {
openArray("_parent");
@@ -53124,10 +54409,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasGraph()) {
if (anyHasValue(element.getGraph())) {
- openArray("graph");
- for (CanonicalType e : element.getGraph())
+ openArray("graph");
+ for (CanonicalType e : element.getGraph())
composeCanonicalCore(null, e, e != element.getGraph().get(element.getGraph().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getGraph())) {
openArray("_graph");
@@ -53558,10 +54843,10 @@ public class JsonParser extends JsonParserBase {
composeBackboneElementProperties(element);
if (element.hasScore()) {
if (anyHasValue(element.getScore())) {
- openArray("score");
- for (IntegerType e : element.getScore())
+ openArray("score");
+ for (IntegerType e : element.getScore())
composeIntegerCore(null, e, e != element.getScore().get(element.getScore().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getScore())) {
openArray("_score");
@@ -53572,10 +54857,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasNumTP()) {
if (anyHasValue(element.getNumTP())) {
- openArray("numTP");
- for (IntegerType e : element.getNumTP())
+ openArray("numTP");
+ for (IntegerType e : element.getNumTP())
composeIntegerCore(null, e, e != element.getNumTP().get(element.getNumTP().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNumTP())) {
openArray("_numTP");
@@ -53586,10 +54871,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasNumFP()) {
if (anyHasValue(element.getNumFP())) {
- openArray("numFP");
- for (IntegerType e : element.getNumFP())
+ openArray("numFP");
+ for (IntegerType e : element.getNumFP())
composeIntegerCore(null, e, e != element.getNumFP().get(element.getNumFP().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNumFP())) {
openArray("_numFP");
@@ -53600,10 +54885,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasNumFN()) {
if (anyHasValue(element.getNumFN())) {
- openArray("numFN");
- for (IntegerType e : element.getNumFN())
+ openArray("numFN");
+ for (IntegerType e : element.getNumFN())
composeIntegerCore(null, e, e != element.getNumFN().get(element.getNumFN().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getNumFN())) {
openArray("_numFN");
@@ -53614,10 +54899,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasPrecision()) {
if (anyHasValue(element.getPrecision())) {
- openArray("precision");
- for (DecimalType e : element.getPrecision())
+ openArray("precision");
+ for (DecimalType e : element.getPrecision())
composeDecimalCore(null, e, e != element.getPrecision().get(element.getPrecision().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getPrecision())) {
openArray("_precision");
@@ -53628,10 +54913,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasSensitivity()) {
if (anyHasValue(element.getSensitivity())) {
- openArray("sensitivity");
- for (DecimalType e : element.getSensitivity())
+ openArray("sensitivity");
+ for (DecimalType e : element.getSensitivity())
composeDecimalCore(null, e, e != element.getSensitivity().get(element.getSensitivity().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSensitivity())) {
openArray("_sensitivity");
@@ -53642,10 +54927,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasFMeasure()) {
if (anyHasValue(element.getFMeasure())) {
- openArray("fMeasure");
- for (DecimalType e : element.getFMeasure())
+ openArray("fMeasure");
+ for (DecimalType e : element.getFMeasure())
composeDecimalCore(null, e, e != element.getFMeasure().get(element.getFMeasure().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getFMeasure())) {
openArray("_fMeasure");
@@ -53782,6 +55067,10 @@ public class JsonParser extends JsonParserBase {
composeStringCore("name", element.getNameElement(), false);
composeStringExtras("name", element.getNameElement(), false);
}
+ if (element.hasTitleElement()) {
+ composeStringCore("title", element.getTitleElement(), false);
+ composeStringExtras("title", element.getTitleElement(), false);
+ }
if (element.hasStatusElement()) {
composeEnumerationCore("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
@@ -53868,6 +55157,10 @@ public class JsonParser extends JsonParserBase {
if (element.hasPeriod()) {
composePeriod("period", element.getPeriod());
}
+ if (element.hasAuthoritativeElement()) {
+ composeBooleanCore("authoritative", element.getAuthoritativeElement(), false);
+ composeBooleanExtras("authoritative", element.getAuthoritativeElement(), false);
+ }
}
protected void composeNutritionIntake(String name, NutritionIntake element) throws IOException {
@@ -53887,10 +55180,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -53901,10 +55194,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -54082,10 +55375,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -54096,10 +55389,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -54110,10 +55403,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiates()) {
if (anyHasValue(element.getInstantiates())) {
- openArray("instantiates");
- for (UriType e : element.getInstantiates())
+ openArray("instantiates");
+ for (UriType e : element.getInstantiates())
composeUriCore(null, e, e != element.getInstantiates().get(element.getInstantiates().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiates())) {
openArray("_instantiates");
@@ -54532,6 +55825,9 @@ public class JsonParser extends JsonParserBase {
composeIdentifier(null, e);
closeArray();
};
+ if (element.hasInstantiates()) {
+ composeType("instantiates", element.getInstantiates());
+ }
if (element.hasBasedOn()) {
openArray("basedOn");
for (Reference e : element.getBasedOn())
@@ -54725,38 +56021,14 @@ public class JsonParser extends JsonParserBase {
composeStringCore("version", element.getVersionElement(), false);
composeStringExtras("version", element.getVersionElement(), false);
}
+ if (element.hasNameElement()) {
+ composeStringCore("name", element.getNameElement(), false);
+ composeStringExtras("name", element.getNameElement(), false);
+ }
if (element.hasTitleElement()) {
composeStringCore("title", element.getTitleElement(), false);
composeStringExtras("title", element.getTitleElement(), false);
}
- if (element.hasDerivedFromCanonical()) {
- if (anyHasValue(element.getDerivedFromCanonical())) {
- openArray("derivedFromCanonical");
- for (CanonicalType e : element.getDerivedFromCanonical())
- composeCanonicalCore(null, e, e != element.getDerivedFromCanonical().get(element.getDerivedFromCanonical().size()-1));
- closeArray();
- }
- if (anyHasExtras(element.getDerivedFromCanonical())) {
- openArray("_derivedFromCanonical");
- for (CanonicalType e : element.getDerivedFromCanonical())
- composeCanonicalExtras(null, e, true);
- closeArray();
- }
- };
- if (element.hasDerivedFromUri()) {
- if (anyHasValue(element.getDerivedFromUri())) {
- openArray("derivedFromUri");
- for (UriType e : element.getDerivedFromUri())
- composeUriCore(null, e, e != element.getDerivedFromUri().get(element.getDerivedFromUri().size()-1));
- closeArray();
- }
- if (anyHasExtras(element.getDerivedFromUri())) {
- openArray("_derivedFromUri");
- for (UriType e : element.getDerivedFromUri())
- composeUriExtras(null, e, true);
- closeArray();
- }
- };
if (element.hasStatusElement()) {
composeEnumerationCore("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
@@ -54765,9 +56037,6 @@ public class JsonParser extends JsonParserBase {
composeBooleanCore("experimental", element.getExperimentalElement(), false);
composeBooleanExtras("experimental", element.getExperimentalElement(), false);
}
- if (element.hasSubject()) {
- composeType("subject", element.getSubject());
- }
if (element.hasDateElement()) {
composeDateTimeCore("date", element.getDateElement(), false);
composeDateTimeExtras("date", element.getDateElement(), false);
@@ -54816,6 +56085,37 @@ public class JsonParser extends JsonParserBase {
if (element.hasEffectivePeriod()) {
composePeriod("effectivePeriod", element.getEffectivePeriod());
}
+ if (element.hasDerivedFromCanonical()) {
+ if (anyHasValue(element.getDerivedFromCanonical())) {
+ openArray("derivedFromCanonical");
+ for (CanonicalType e : element.getDerivedFromCanonical())
+ composeCanonicalCore(null, e, e != element.getDerivedFromCanonical().get(element.getDerivedFromCanonical().size()-1));
+ closeArray();
+ }
+ if (anyHasExtras(element.getDerivedFromCanonical())) {
+ openArray("_derivedFromCanonical");
+ for (CanonicalType e : element.getDerivedFromCanonical())
+ composeCanonicalExtras(null, e, true);
+ closeArray();
+ }
+ };
+ if (element.hasDerivedFromUri()) {
+ if (anyHasValue(element.getDerivedFromUri())) {
+ openArray("derivedFromUri");
+ for (UriType e : element.getDerivedFromUri())
+ composeUriCore(null, e, e != element.getDerivedFromUri().get(element.getDerivedFromUri().size()-1));
+ closeArray();
+ }
+ if (anyHasExtras(element.getDerivedFromUri())) {
+ openArray("_derivedFromUri");
+ for (UriType e : element.getDerivedFromUri())
+ composeUriExtras(null, e, true);
+ closeArray();
+ }
+ };
+ if (element.hasSubject()) {
+ composeCodeableConcept("subject", element.getSubject());
+ }
if (element.hasPerformerType()) {
composeCodeableConcept("performerType", element.getPerformerType());
}
@@ -54851,11 +56151,17 @@ public class JsonParser extends JsonParserBase {
composeCodeableConcept("method", element.getMethod());
}
if (element.hasSpecimen()) {
- composeReference("specimen", element.getSpecimen());
- }
+ openArray("specimen");
+ for (Reference e : element.getSpecimen())
+ composeReference(null, e);
+ closeArray();
+ };
if (element.hasDevice()) {
- composeReference("device", element.getDevice());
- }
+ openArray("device");
+ for (Reference e : element.getDevice())
+ composeReference(null, e);
+ closeArray();
+ };
if (element.hasPreferredReportNameElement()) {
composeStringCore("preferredReportName", element.getPreferredReportNameElement(), false);
composeStringExtras("preferredReportName", element.getPreferredReportNameElement(), false);
@@ -54863,24 +56169,12 @@ public class JsonParser extends JsonParserBase {
if (element.hasQuantitativeDetails()) {
composeObservationDefinitionQuantitativeDetailsComponent("quantitativeDetails", element.getQuantitativeDetails());
}
- if (element.hasQualifiedInterval()) {
- openArray("qualifiedInterval");
- for (ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent e : element.getQualifiedInterval())
- composeObservationDefinitionQualifiedIntervalComponent(null, e);
+ if (element.hasQualifiedValue()) {
+ openArray("qualifiedValue");
+ for (ObservationDefinition.ObservationDefinitionQualifiedValueComponent e : element.getQualifiedValue())
+ composeObservationDefinitionQualifiedValueComponent(null, e);
closeArray();
};
- if (element.hasValidCodedValueSet()) {
- composeReference("validCodedValueSet", element.getValidCodedValueSet());
- }
- if (element.hasNormalCodedValueSet()) {
- composeReference("normalCodedValueSet", element.getNormalCodedValueSet());
- }
- if (element.hasAbnormalCodedValueSet()) {
- composeReference("abnormalCodedValueSet", element.getAbnormalCodedValueSet());
- }
- if (element.hasCriticalCodedValueSet()) {
- composeReference("criticalCodedValueSet", element.getCriticalCodedValueSet());
- }
if (element.hasHasMember()) {
openArray("hasMember");
for (Reference e : element.getHasMember())
@@ -54905,12 +56199,12 @@ public class JsonParser extends JsonParserBase {
protected void composeObservationDefinitionQuantitativeDetailsComponentProperties(ObservationDefinition.ObservationDefinitionQuantitativeDetailsComponent element) throws IOException {
composeBackboneElementProperties(element);
- if (element.hasCustomaryUnit()) {
- composeCodeableConcept("customaryUnit", element.getCustomaryUnit());
- }
if (element.hasUnit()) {
composeCodeableConcept("unit", element.getUnit());
}
+ if (element.hasCustomaryUnit()) {
+ composeCodeableConcept("customaryUnit", element.getCustomaryUnit());
+ }
if (element.hasConversionFactorElement()) {
composeDecimalCore("conversionFactor", element.getConversionFactorElement(), false);
composeDecimalExtras("conversionFactor", element.getConversionFactorElement(), false);
@@ -54921,23 +56215,16 @@ public class JsonParser extends JsonParserBase {
}
}
- protected void composeObservationDefinitionQualifiedIntervalComponent(String name, ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent element) throws IOException {
+ protected void composeObservationDefinitionQualifiedValueComponent(String name, ObservationDefinition.ObservationDefinitionQualifiedValueComponent element) throws IOException {
if (element != null) {
open(name);
- composeObservationDefinitionQualifiedIntervalComponentProperties(element);
+ composeObservationDefinitionQualifiedValueComponentProperties(element);
close();
}
}
- protected void composeObservationDefinitionQualifiedIntervalComponentProperties(ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent element) throws IOException {
+ protected void composeObservationDefinitionQualifiedValueComponentProperties(ObservationDefinition.ObservationDefinitionQualifiedValueComponent element) throws IOException {
composeBackboneElementProperties(element);
- if (element.hasCategoryElement()) {
- composeEnumerationCore("category", element.getCategoryElement(), new ObservationDefinition.ObservationRangeCategoryEnumFactory(), false);
- composeEnumerationExtras("category", element.getCategoryElement(), new ObservationDefinition.ObservationRangeCategoryEnumFactory(), false);
- }
- if (element.hasRange()) {
- composeRange("range", element.getRange());
- }
if (element.hasContext()) {
composeCodeableConcept("context", element.getContext());
}
@@ -54961,6 +56248,29 @@ public class JsonParser extends JsonParserBase {
composeStringCore("condition", element.getConditionElement(), false);
composeStringExtras("condition", element.getConditionElement(), false);
}
+ if (element.hasRangeCategoryElement()) {
+ composeEnumerationCore("rangeCategory", element.getRangeCategoryElement(), new ObservationDefinition.ObservationRangeCategoryEnumFactory(), false);
+ composeEnumerationExtras("rangeCategory", element.getRangeCategoryElement(), new ObservationDefinition.ObservationRangeCategoryEnumFactory(), false);
+ }
+ if (element.hasRange()) {
+ composeRange("range", element.getRange());
+ }
+ if (element.hasValidCodedValueSetElement()) {
+ composeCanonicalCore("validCodedValueSet", element.getValidCodedValueSetElement(), false);
+ composeCanonicalExtras("validCodedValueSet", element.getValidCodedValueSetElement(), false);
+ }
+ if (element.hasNormalCodedValueSetElement()) {
+ composeCanonicalCore("normalCodedValueSet", element.getNormalCodedValueSetElement(), false);
+ composeCanonicalExtras("normalCodedValueSet", element.getNormalCodedValueSetElement(), false);
+ }
+ if (element.hasAbnormalCodedValueSetElement()) {
+ composeCanonicalCore("abnormalCodedValueSet", element.getAbnormalCodedValueSetElement(), false);
+ composeCanonicalExtras("abnormalCodedValueSet", element.getAbnormalCodedValueSetElement(), false);
+ }
+ if (element.hasCriticalCodedValueSetElement()) {
+ composeCanonicalCore("criticalCodedValueSet", element.getCriticalCodedValueSetElement(), false);
+ composeCanonicalExtras("criticalCodedValueSet", element.getCriticalCodedValueSetElement(), false);
+ }
}
protected void composeObservationDefinitionComponentComponent(String name, ObservationDefinition.ObservationDefinitionComponentComponent element) throws IOException {
@@ -54991,10 +56301,10 @@ public class JsonParser extends JsonParserBase {
if (element.hasQuantitativeDetails()) {
composeObservationDefinitionQuantitativeDetailsComponent("quantitativeDetails", element.getQuantitativeDetails());
}
- if (element.hasQualifiedInterval()) {
- openArray("qualifiedInterval");
- for (ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent e : element.getQualifiedInterval())
- composeObservationDefinitionQualifiedIntervalComponent(null, e);
+ if (element.hasQualifiedValue()) {
+ openArray("qualifiedValue");
+ for (ObservationDefinition.ObservationDefinitionQualifiedValueComponent e : element.getQualifiedValue())
+ composeObservationDefinitionQualifiedValueComponent(null, e);
closeArray();
};
}
@@ -55088,10 +56398,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasResource()) {
if (anyHasValue(element.getResource())) {
- openArray("resource");
- for (CodeType e : element.getResource())
+ openArray("resource");
+ for (CodeType e : element.getResource())
composeCodeCore(null, e, e != element.getResource().get(element.getResource().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getResource())) {
openArray("_resource");
@@ -55170,10 +56480,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasTargetProfile()) {
if (anyHasValue(element.getTargetProfile())) {
- openArray("targetProfile");
- for (CanonicalType e : element.getTargetProfile())
+ openArray("targetProfile");
+ for (CanonicalType e : element.getTargetProfile())
composeCanonicalCore(null, e, e != element.getTargetProfile().get(element.getTargetProfile().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getTargetProfile())) {
openArray("_targetProfile");
@@ -55255,10 +56565,10 @@ public class JsonParser extends JsonParserBase {
composeBackboneElementProperties(element);
if (element.hasParameterName()) {
if (anyHasValue(element.getParameterName())) {
- openArray("parameterName");
- for (StringType e : element.getParameterName())
+ openArray("parameterName");
+ for (StringType e : element.getParameterName())
composeStringCore(null, e, e != element.getParameterName().get(element.getParameterName().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getParameterName())) {
openArray("_parameterName");
@@ -55317,10 +56627,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasLocation()) {
if (anyHasValue(element.getLocation())) {
- openArray("location");
- for (StringType e : element.getLocation())
+ openArray("location");
+ for (StringType e : element.getLocation())
composeStringCore(null, e, e != element.getLocation().get(element.getLocation().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getLocation())) {
openArray("_location");
@@ -55331,10 +56641,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasExpression()) {
if (anyHasValue(element.getExpression())) {
- openArray("expression");
- for (StringType e : element.getExpression())
+ openArray("expression");
+ for (StringType e : element.getExpression())
composeStringCore(null, e, e != element.getExpression().get(element.getExpression().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getExpression())) {
openArray("_expression");
@@ -55376,10 +56686,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasAlias()) {
if (anyHasValue(element.getAlias())) {
- openArray("alias");
- for (StringType e : element.getAlias())
+ openArray("alias");
+ for (StringType e : element.getAlias())
composeStringCore(null, e, e != element.getAlias().get(element.getAlias().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getAlias())) {
openArray("_alias");
@@ -55551,6 +56861,12 @@ public class JsonParser extends JsonParserBase {
composeDateTimeCore("statusDate", element.getStatusDateElement(), false);
composeDateTimeExtras("statusDate", element.getStatusDateElement(), false);
}
+ if (element.hasContainedItemQuantity()) {
+ openArray("containedItemQuantity");
+ for (Quantity e : element.getContainedItemQuantity())
+ composeQuantity(null, e);
+ closeArray();
+ };
if (element.hasDescriptionElement()) {
composeMarkdownCore("description", element.getDescriptionElement(), false);
composeMarkdownExtras("description", element.getDescriptionElement(), false);
@@ -55583,35 +56899,14 @@ public class JsonParser extends JsonParserBase {
composeReference(null, e);
closeArray();
};
- if (element.hasBatchIdentifier()) {
- openArray("batchIdentifier");
- for (PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent e : element.getBatchIdentifier())
- composePackagedProductDefinitionBatchIdentifierComponent(null, e);
+ if (element.hasAttachedDocument()) {
+ openArray("attachedDocument");
+ for (Reference e : element.getAttachedDocument())
+ composeReference(null, e);
closeArray();
};
if (element.hasPackage()) {
- openArray("package");
- for (PackagedProductDefinition.PackagedProductDefinitionPackageComponent e : element.getPackage())
- composePackagedProductDefinitionPackageComponent(null, e);
- closeArray();
- };
- }
-
- protected void composePackagedProductDefinitionBatchIdentifierComponent(String name, PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent element) throws IOException {
- if (element != null) {
- open(name);
- composePackagedProductDefinitionBatchIdentifierComponentProperties(element);
- close();
- }
- }
-
- protected void composePackagedProductDefinitionBatchIdentifierComponentProperties(PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasOuterPackaging()) {
- composeIdentifier("outerPackaging", element.getOuterPackaging());
- }
- if (element.hasImmediatePackaging()) {
- composeIdentifier("immediatePackaging", element.getImmediatePackaging());
+ composePackagedProductDefinitionPackageComponent("package", element.getPackage());
}
}
@@ -55712,8 +57007,8 @@ public class JsonParser extends JsonParserBase {
composeBackboneElementProperties(element);
if (element.hasItem()) {
openArray("item");
- for (Reference e : element.getItem())
- composeReference(null, e);
+ for (CodeableReference e : element.getItem())
+ composeCodeableReference(null, e);
closeArray();
};
if (element.hasAmount()) {
@@ -56024,8 +57319,8 @@ public class JsonParser extends JsonParserBase {
composeReference("requestor", element.getRequestor());
}
if (element.hasOutcomeElement()) {
- composeEnumerationCore("outcome", element.getOutcomeElement(), new Enumerations.ClaimProcessingCodesEnumFactory(), false);
- composeEnumerationExtras("outcome", element.getOutcomeElement(), new Enumerations.ClaimProcessingCodesEnumFactory(), false);
+ composeEnumerationCore("outcome", element.getOutcomeElement(), new PaymentReconciliation.PaymentOutcomeEnumFactory(), false);
+ composeEnumerationExtras("outcome", element.getOutcomeElement(), new PaymentReconciliation.PaymentOutcomeEnumFactory(), false);
}
if (element.hasDispositionElement()) {
composeStringCore("disposition", element.getDispositionElement(), false);
@@ -56142,10 +57437,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasAssertionDate()) {
if (anyHasValue(element.getAssertionDate())) {
- openArray("assertionDate");
- for (DateTimeType e : element.getAssertionDate())
+ openArray("assertionDate");
+ for (DateTimeType e : element.getAssertionDate())
composeDateTimeCore(null, e, e != element.getAssertionDate().get(element.getAssertionDate().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getAssertionDate())) {
openArray("_assertionDate");
@@ -56458,10 +57753,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasLibrary()) {
if (anyHasValue(element.getLibrary())) {
- openArray("library");
- for (CanonicalType e : element.getLibrary())
+ openArray("library");
+ for (CanonicalType e : element.getLibrary())
composeCanonicalCore(null, e, e != element.getLibrary().get(element.getLibrary().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getLibrary())) {
openArray("_library");
@@ -56476,6 +57771,12 @@ public class JsonParser extends JsonParserBase {
composePlanDefinitionGoalComponent(null, e);
closeArray();
};
+ if (element.hasActor()) {
+ openArray("actor");
+ for (PlanDefinition.PlanDefinitionActorComponent e : element.getActor())
+ composePlanDefinitionActorComponent(null, e);
+ closeArray();
+ };
if (element.hasAction()) {
openArray("action");
for (PlanDefinition.PlanDefinitionActionComponent e : element.getAction())
@@ -56547,6 +57848,54 @@ public class JsonParser extends JsonParserBase {
}
}
+ protected void composePlanDefinitionActorComponent(String name, PlanDefinition.PlanDefinitionActorComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composePlanDefinitionActorComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composePlanDefinitionActorComponentProperties(PlanDefinition.PlanDefinitionActorComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasTitleElement()) {
+ composeStringCore("title", element.getTitleElement(), false);
+ composeStringExtras("title", element.getTitleElement(), false);
+ }
+ if (element.hasDescriptionElement()) {
+ composeMarkdownCore("description", element.getDescriptionElement(), false);
+ composeMarkdownExtras("description", element.getDescriptionElement(), false);
+ }
+ if (element.hasOption()) {
+ openArray("option");
+ for (PlanDefinition.PlanDefinitionActorOptionComponent e : element.getOption())
+ composePlanDefinitionActorOptionComponent(null, e);
+ closeArray();
+ };
+ }
+
+ protected void composePlanDefinitionActorOptionComponent(String name, PlanDefinition.PlanDefinitionActorOptionComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composePlanDefinitionActorOptionComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composePlanDefinitionActorOptionComponentProperties(PlanDefinition.PlanDefinitionActorOptionComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasTypeElement()) {
+ composeEnumerationCore("type", element.getTypeElement(), new Enumerations.ActionParticipantTypeEnumFactory(), false);
+ composeEnumerationExtras("type", element.getTypeElement(), new Enumerations.ActionParticipantTypeEnumFactory(), false);
+ }
+ if (element.hasTypeReference()) {
+ composeReference("typeReference", element.getTypeReference());
+ }
+ if (element.hasRole()) {
+ composeCodeableConcept("role", element.getRole());
+ }
+ }
+
protected void composePlanDefinitionActionComponent(String name, PlanDefinition.PlanDefinitionActionComponent element) throws IOException {
if (element != null) {
open(name);
@@ -56578,11 +57927,8 @@ public class JsonParser extends JsonParserBase {
composeEnumerationExtras("priority", element.getPriorityElement(), new Enumerations.RequestPriorityEnumFactory(), false);
}
if (element.hasCode()) {
- openArray("code");
- for (CodeableConcept e : element.getCode())
- composeCodeableConcept(null, e);
- closeArray();
- };
+ composeCodeableConcept("code", element.getCode());
+ }
if (element.hasReason()) {
openArray("reason");
for (CodeableConcept e : element.getReason())
@@ -56597,10 +57943,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasGoalId()) {
if (anyHasValue(element.getGoalId())) {
- openArray("goalId");
- for (IdType e : element.getGoalId())
+ openArray("goalId");
+ for (IdType e : element.getGoalId())
composeIdCore(null, e, e != element.getGoalId().get(element.getGoalId().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getGoalId())) {
openArray("_goalId");
@@ -56626,14 +57972,14 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInput()) {
openArray("input");
- for (DataRequirement e : element.getInput())
- composeDataRequirement(null, e);
+ for (PlanDefinition.PlanDefinitionActionInputComponent e : element.getInput())
+ composePlanDefinitionActionInputComponent(null, e);
closeArray();
};
if (element.hasOutput()) {
openArray("output");
- for (DataRequirement e : element.getOutput())
- composeDataRequirement(null, e);
+ for (PlanDefinition.PlanDefinitionActionOutputComponent e : element.getOutput())
+ composePlanDefinitionActionOutputComponent(null, e);
closeArray();
};
if (element.hasRelatedAction()) {
@@ -56645,6 +57991,9 @@ public class JsonParser extends JsonParserBase {
if (element.hasTiming()) {
composeType("timing", element.getTiming());
}
+ if (element.hasLocation()) {
+ composeCodeableReference("location", element.getLocation());
+ }
if (element.hasParticipant()) {
openArray("participant");
for (PlanDefinition.PlanDefinitionActionParticipantComponent e : element.getParticipant())
@@ -56714,6 +58063,52 @@ public class JsonParser extends JsonParserBase {
}
}
+ protected void composePlanDefinitionActionInputComponent(String name, PlanDefinition.PlanDefinitionActionInputComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composePlanDefinitionActionInputComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composePlanDefinitionActionInputComponentProperties(PlanDefinition.PlanDefinitionActionInputComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasTitleElement()) {
+ composeStringCore("title", element.getTitleElement(), false);
+ composeStringExtras("title", element.getTitleElement(), false);
+ }
+ if (element.hasRequirement()) {
+ composeDataRequirement("requirement", element.getRequirement());
+ }
+ if (element.hasRelatedDataElement()) {
+ composeIdCore("relatedData", element.getRelatedDataElement(), false);
+ composeIdExtras("relatedData", element.getRelatedDataElement(), false);
+ }
+ }
+
+ protected void composePlanDefinitionActionOutputComponent(String name, PlanDefinition.PlanDefinitionActionOutputComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composePlanDefinitionActionOutputComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composePlanDefinitionActionOutputComponentProperties(PlanDefinition.PlanDefinitionActionOutputComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasTitleElement()) {
+ composeStringCore("title", element.getTitleElement(), false);
+ composeStringExtras("title", element.getTitleElement(), false);
+ }
+ if (element.hasRequirement()) {
+ composeDataRequirement("requirement", element.getRequirement());
+ }
+ if (element.hasRelatedDataElement()) {
+ composeStringCore("relatedData", element.getRelatedDataElement(), false);
+ composeStringExtras("relatedData", element.getRelatedDataElement(), false);
+ }
+ }
+
protected void composePlanDefinitionActionRelatedActionComponent(String name, PlanDefinition.PlanDefinitionActionRelatedActionComponent element) throws IOException {
if (element != null) {
open(name);
@@ -56724,9 +58119,9 @@ public class JsonParser extends JsonParserBase {
protected void composePlanDefinitionActionRelatedActionComponentProperties(PlanDefinition.PlanDefinitionActionRelatedActionComponent element) throws IOException {
composeBackboneElementProperties(element);
- if (element.hasActionIdElement()) {
- composeIdCore("actionId", element.getActionIdElement(), false);
- composeIdExtras("actionId", element.getActionIdElement(), false);
+ if (element.hasTargetIdElement()) {
+ composeIdCore("targetId", element.getTargetIdElement(), false);
+ composeIdExtras("targetId", element.getTargetIdElement(), false);
}
if (element.hasRelationshipElement()) {
composeEnumerationCore("relationship", element.getRelationshipElement(), new Enumerations.ActionRelationshipTypeEnumFactory(), false);
@@ -56747,13 +58142,23 @@ public class JsonParser extends JsonParserBase {
protected void composePlanDefinitionActionParticipantComponentProperties(PlanDefinition.PlanDefinitionActionParticipantComponent element) throws IOException {
composeBackboneElementProperties(element);
+ if (element.hasActorIdElement()) {
+ composeStringCore("actorId", element.getActorIdElement(), false);
+ composeStringExtras("actorId", element.getActorIdElement(), false);
+ }
if (element.hasTypeElement()) {
composeEnumerationCore("type", element.getTypeElement(), new Enumerations.ActionParticipantTypeEnumFactory(), false);
composeEnumerationExtras("type", element.getTypeElement(), new Enumerations.ActionParticipantTypeEnumFactory(), false);
}
+ if (element.hasTypeReference()) {
+ composeReference("typeReference", element.getTypeReference());
+ }
if (element.hasRole()) {
composeCodeableConcept("role", element.getRole());
}
+ if (element.hasFunction()) {
+ composeCodeableConcept("function", element.getFunction());
+ }
}
protected void composePlanDefinitionActionDynamicValueComponent(String name, PlanDefinition.PlanDefinitionActionDynamicValueComponent element) throws IOException {
@@ -57021,10 +58426,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -57035,10 +58440,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -57160,6 +58565,12 @@ public class JsonParser extends JsonParserBase {
composeCodeableReference(null, e);
closeArray();
};
+ if (element.hasSupportingInfo()) {
+ openArray("supportingInfo");
+ for (Reference e : element.getSupportingInfo())
+ composeReference(null, e);
+ closeArray();
+ };
}
protected void composeProcedurePerformerComponent(String name, Procedure.ProcedurePerformerComponent element) throws IOException {
@@ -57225,10 +58636,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasPolicy()) {
if (anyHasValue(element.getPolicy())) {
- openArray("policy");
- for (UriType e : element.getPolicy())
+ openArray("policy");
+ for (UriType e : element.getPolicy())
composeUriCore(null, e, e != element.getPolicy().get(element.getPolicy().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getPolicy())) {
openArray("_policy");
@@ -57249,6 +58660,15 @@ public class JsonParser extends JsonParserBase {
if (element.hasActivity()) {
composeCodeableConcept("activity", element.getActivity());
}
+ if (element.hasBasedOn()) {
+ openArray("basedOn");
+ for (Reference e : element.getBasedOn())
+ composeReference(null, e);
+ closeArray();
+ };
+ if (element.hasEncounter()) {
+ composeReference("encounter", element.getEncounter());
+ }
if (element.hasAgent()) {
openArray("agent");
for (Provenance.ProvenanceAgentComponent e : element.getAgent())
@@ -57354,10 +58774,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasDerivedFrom()) {
if (anyHasValue(element.getDerivedFrom())) {
- openArray("derivedFrom");
- for (CanonicalType e : element.getDerivedFrom())
+ openArray("derivedFrom");
+ for (CanonicalType e : element.getDerivedFrom())
composeCanonicalCore(null, e, e != element.getDerivedFrom().get(element.getDerivedFrom().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDerivedFrom())) {
openArray("_derivedFrom");
@@ -57376,10 +58796,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasSubjectType()) {
if (anyHasValue(element.getSubjectType())) {
- openArray("subjectType");
- for (CodeType e : element.getSubjectType())
+ openArray("subjectType");
+ for (CodeType e : element.getSubjectType())
composeCodeCore(null, e, e != element.getSubjectType().get(element.getSubjectType().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getSubjectType())) {
openArray("_subjectType");
@@ -57480,8 +58900,8 @@ public class JsonParser extends JsonParserBase {
composeStringExtras("prefix", element.getPrefixElement(), false);
}
if (element.hasTextElement()) {
- composeStringCore("text", element.getTextElement(), false);
- composeStringExtras("text", element.getTextElement(), false);
+ composeMarkdownCore("text", element.getTextElement(), false);
+ composeMarkdownExtras("text", element.getTextElement(), false);
}
if (element.hasTypeElement()) {
composeEnumerationCore("type", element.getTypeElement(), new Questionnaire.QuestionnaireItemTypeEnumFactory(), false);
@@ -57497,6 +58917,10 @@ public class JsonParser extends JsonParserBase {
composeEnumerationCore("enableBehavior", element.getEnableBehaviorElement(), new Questionnaire.EnableWhenBehaviorEnumFactory(), false);
composeEnumerationExtras("enableBehavior", element.getEnableBehaviorElement(), new Questionnaire.EnableWhenBehaviorEnumFactory(), false);
}
+ if (element.hasDisabledDisplayElement()) {
+ composeEnumerationCore("disabledDisplay", element.getDisabledDisplayElement(), new Questionnaire.QuestionnaireItemDisabledDisplayEnumFactory(), false);
+ composeEnumerationExtras("disabledDisplay", element.getDisabledDisplayElement(), new Questionnaire.QuestionnaireItemDisabledDisplayEnumFactory(), false);
+ }
if (element.hasRequiredElement()) {
composeBooleanCore("required", element.getRequiredElement(), false);
composeBooleanExtras("required", element.getRequiredElement(), false);
@@ -57513,6 +58937,10 @@ public class JsonParser extends JsonParserBase {
composeIntegerCore("maxLength", element.getMaxLengthElement(), false);
composeIntegerExtras("maxLength", element.getMaxLengthElement(), false);
}
+ if (element.hasAnswerConstraintElement()) {
+ composeEnumerationCore("answerConstraint", element.getAnswerConstraintElement(), new Questionnaire.QuestionnaireAnswerConstraintEnumFactory(), false);
+ composeEnumerationExtras("answerConstraint", element.getAnswerConstraintElement(), new Questionnaire.QuestionnaireAnswerConstraintEnumFactory(), false);
+ }
if (element.hasAnswerValueSetElement()) {
composeCanonicalCore("answerValueSet", element.getAnswerValueSetElement(), false);
composeCanonicalExtras("answerValueSet", element.getAnswerValueSetElement(), false);
@@ -57749,7 +59177,7 @@ public class JsonParser extends JsonParserBase {
composePeriod("validityPeriod", element.getValidityPeriod());
}
if (element.hasIndication()) {
- composeType("indication", element.getIndication());
+ composeCodeableReference("indication", element.getIndication());
}
if (element.hasIntendedUse()) {
composeCodeableConcept("intendedUse", element.getIntendedUse());
@@ -57778,6 +59206,12 @@ public class JsonParser extends JsonParserBase {
if (element.hasRegulator()) {
composeReference("regulator", element.getRegulator());
}
+ if (element.hasAttachedDocument()) {
+ openArray("attachedDocument");
+ for (Reference e : element.getAttachedDocument())
+ composeReference(null, e);
+ closeArray();
+ };
if (element.hasCase()) {
composeRegulatedAuthorizationCaseComponent("case", element.getCase());
}
@@ -57938,10 +59372,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -57952,10 +59386,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -58084,10 +59518,13 @@ public class JsonParser extends JsonParserBase {
if (element.hasTiming()) {
composeType("timing", element.getTiming());
}
+ if (element.hasLocation()) {
+ composeCodeableReference("location", element.getLocation());
+ }
if (element.hasParticipant()) {
openArray("participant");
- for (Reference e : element.getParticipant())
- composeReference(null, e);
+ for (RequestGroup.RequestGroupActionParticipantComponent e : element.getParticipant())
+ composeRequestGroupActionParticipantComponent(null, e);
closeArray();
};
if (element.hasType()) {
@@ -58153,9 +59590,9 @@ public class JsonParser extends JsonParserBase {
protected void composeRequestGroupActionRelatedActionComponentProperties(RequestGroup.RequestGroupActionRelatedActionComponent element) throws IOException {
composeBackboneElementProperties(element);
- if (element.hasActionIdElement()) {
- composeIdCore("actionId", element.getActionIdElement(), false);
- composeIdExtras("actionId", element.getActionIdElement(), false);
+ if (element.hasTargetIdElement()) {
+ composeIdCore("targetId", element.getTargetIdElement(), false);
+ composeIdExtras("targetId", element.getTargetIdElement(), false);
}
if (element.hasRelationshipElement()) {
composeEnumerationCore("relationship", element.getRelationshipElement(), new Enumerations.ActionRelationshipTypeEnumFactory(), false);
@@ -58166,6 +59603,34 @@ public class JsonParser extends JsonParserBase {
}
}
+ protected void composeRequestGroupActionParticipantComponent(String name, RequestGroup.RequestGroupActionParticipantComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeRequestGroupActionParticipantComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeRequestGroupActionParticipantComponentProperties(RequestGroup.RequestGroupActionParticipantComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasTypeElement()) {
+ composeEnumerationCore("type", element.getTypeElement(), new Enumerations.ActionParticipantTypeEnumFactory(), false);
+ composeEnumerationExtras("type", element.getTypeElement(), new Enumerations.ActionParticipantTypeEnumFactory(), false);
+ }
+ if (element.hasTypeReference()) {
+ composeReference("typeReference", element.getTypeReference());
+ }
+ if (element.hasRole()) {
+ composeCodeableConcept("role", element.getRole());
+ }
+ if (element.hasFunction()) {
+ composeCodeableConcept("function", element.getFunction());
+ }
+ if (element.hasActor()) {
+ composeReference("actor", element.getActor());
+ }
+ }
+
protected void composeResearchStudy(String name, ResearchStudy element) throws IOException {
if (element != null) {
prop("resourceType", name);
@@ -58175,16 +59640,34 @@ public class JsonParser extends JsonParserBase {
protected void composeResearchStudyProperties(ResearchStudy element) throws IOException {
composeDomainResourceProperties(element);
+ if (element.hasUrlElement()) {
+ composeUriCore("url", element.getUrlElement(), false);
+ composeUriExtras("url", element.getUrlElement(), false);
+ }
if (element.hasIdentifier()) {
openArray("identifier");
for (Identifier e : element.getIdentifier())
composeIdentifier(null, e);
closeArray();
};
+ if (element.hasVersionElement()) {
+ composeStringCore("version", element.getVersionElement(), false);
+ composeStringExtras("version", element.getVersionElement(), false);
+ }
+ if (element.hasNameElement()) {
+ composeStringCore("name", element.getNameElement(), false);
+ composeStringExtras("name", element.getNameElement(), false);
+ }
if (element.hasTitleElement()) {
composeStringCore("title", element.getTitleElement(), false);
composeStringExtras("title", element.getTitleElement(), false);
}
+ if (element.hasLabel()) {
+ openArray("label");
+ for (ResearchStudy.ResearchStudyLabelComponent e : element.getLabel())
+ composeResearchStudyLabelComponent(null, e);
+ closeArray();
+ };
if (element.hasProtocol()) {
openArray("protocol");
for (Reference e : element.getProtocol())
@@ -58197,9 +59680,19 @@ public class JsonParser extends JsonParserBase {
composeReference(null, e);
closeArray();
};
+ if (element.hasRelatedArtifact()) {
+ openArray("relatedArtifact");
+ for (RelatedArtifact e : element.getRelatedArtifact())
+ composeRelatedArtifact(null, e);
+ closeArray();
+ };
+ if (element.hasDateElement()) {
+ composeDateTimeCore("date", element.getDateElement(), false);
+ composeDateTimeExtras("date", element.getDateElement(), false);
+ }
if (element.hasStatusElement()) {
- composeEnumerationCore("status", element.getStatusElement(), new ResearchStudy.ResearchStudyStatusEnumFactory(), false);
- composeEnumerationExtras("status", element.getStatusElement(), new ResearchStudy.ResearchStudyStatusEnumFactory(), false);
+ composeEnumerationCore("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
+ composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
}
if (element.hasPrimaryPurposeType()) {
composeCodeableConcept("primaryPurposeType", element.getPrimaryPurposeType());
@@ -58215,8 +59708,8 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasFocus()) {
openArray("focus");
- for (CodeableConcept e : element.getFocus())
- composeCodeableConcept(null, e);
+ for (ResearchStudy.ResearchStudyFocusComponent e : element.getFocus())
+ composeResearchStudyFocusComponent(null, e);
closeArray();
};
if (element.hasCondition()) {
@@ -58225,18 +59718,6 @@ public class JsonParser extends JsonParserBase {
composeCodeableConcept(null, e);
closeArray();
};
- if (element.hasContact()) {
- openArray("contact");
- for (ContactDetail e : element.getContact())
- composeContactDetail(null, e);
- closeArray();
- };
- if (element.hasRelatedArtifact()) {
- openArray("relatedArtifact");
- for (RelatedArtifact e : element.getRelatedArtifact())
- composeRelatedArtifact(null, e);
- closeArray();
- };
if (element.hasKeyword()) {
openArray("keyword");
for (CodeableConcept e : element.getKeyword())
@@ -58249,19 +59730,23 @@ public class JsonParser extends JsonParserBase {
composeCodeableConcept(null, e);
closeArray();
};
+ if (element.hasDescriptionSummaryElement()) {
+ composeMarkdownCore("descriptionSummary", element.getDescriptionSummaryElement(), false);
+ composeMarkdownExtras("descriptionSummary", element.getDescriptionSummaryElement(), false);
+ }
if (element.hasDescriptionElement()) {
composeMarkdownCore("description", element.getDescriptionElement(), false);
composeMarkdownExtras("description", element.getDescriptionElement(), false);
}
- if (element.hasEnrollment()) {
- openArray("enrollment");
- for (Reference e : element.getEnrollment())
- composeReference(null, e);
- closeArray();
- };
if (element.hasPeriod()) {
composePeriod("period", element.getPeriod());
}
+ if (element.hasContact()) {
+ openArray("contact");
+ for (ContactDetail e : element.getContact())
+ composeContactDetail(null, e);
+ closeArray();
+ };
if (element.hasSponsor()) {
composeReference("sponsor", element.getSponsor());
}
@@ -58274,19 +59759,46 @@ public class JsonParser extends JsonParserBase {
composeReference(null, e);
closeArray();
};
- if (element.hasReasonStopped()) {
- composeCodeableConcept("reasonStopped", element.getReasonStopped());
- }
if (element.hasNote()) {
openArray("note");
for (Annotation e : element.getNote())
composeAnnotation(null, e);
closeArray();
};
- if (element.hasArm()) {
- openArray("arm");
- for (ResearchStudy.ResearchStudyArmComponent e : element.getArm())
- composeResearchStudyArmComponent(null, e);
+ if (element.hasClassification()) {
+ openArray("classification");
+ for (ResearchStudy.ResearchStudyClassificationComponent e : element.getClassification())
+ composeResearchStudyClassificationComponent(null, e);
+ closeArray();
+ };
+ if (element.hasAssociatedParty()) {
+ openArray("associatedParty");
+ for (ResearchStudy.ResearchStudyAssociatedPartyComponent e : element.getAssociatedParty())
+ composeResearchStudyAssociatedPartyComponent(null, e);
+ closeArray();
+ };
+ if (element.hasCurrentState()) {
+ openArray("currentState");
+ for (CodeableConcept e : element.getCurrentState())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasStatusDate()) {
+ openArray("statusDate");
+ for (ResearchStudy.ResearchStudyStatusDateComponent e : element.getStatusDate())
+ composeResearchStudyStatusDateComponent(null, e);
+ closeArray();
+ };
+ if (element.hasWhyStopped()) {
+ composeCodeableConcept("whyStopped", element.getWhyStopped());
+ }
+ if (element.hasRecruitment()) {
+ composeResearchStudyRecruitmentComponent("recruitment", element.getRecruitment());
+ }
+ if (element.hasComparisonGroup()) {
+ openArray("comparisonGroup");
+ for (ResearchStudy.ResearchStudyComparisonGroupComponent e : element.getComparisonGroup())
+ composeResearchStudyComparisonGroupComponent(null, e);
closeArray();
};
if (element.hasObjective()) {
@@ -58295,18 +59807,180 @@ public class JsonParser extends JsonParserBase {
composeResearchStudyObjectiveComponent(null, e);
closeArray();
};
+ if (element.hasOutcomeMeasure()) {
+ openArray("outcomeMeasure");
+ for (ResearchStudy.ResearchStudyOutcomeMeasureComponent e : element.getOutcomeMeasure())
+ composeResearchStudyOutcomeMeasureComponent(null, e);
+ closeArray();
+ };
+ if (element.hasResult()) {
+ openArray("result");
+ for (Reference e : element.getResult())
+ composeReference(null, e);
+ closeArray();
+ };
+ if (element.hasWebLocation()) {
+ openArray("webLocation");
+ for (ResearchStudy.ResearchStudyWebLocationComponent e : element.getWebLocation())
+ composeResearchStudyWebLocationComponent(null, e);
+ closeArray();
+ };
}
- protected void composeResearchStudyArmComponent(String name, ResearchStudy.ResearchStudyArmComponent element) throws IOException {
+ protected void composeResearchStudyLabelComponent(String name, ResearchStudy.ResearchStudyLabelComponent element) throws IOException {
if (element != null) {
open(name);
- composeResearchStudyArmComponentProperties(element);
+ composeResearchStudyLabelComponentProperties(element);
close();
}
}
- protected void composeResearchStudyArmComponentProperties(ResearchStudy.ResearchStudyArmComponent element) throws IOException {
+ protected void composeResearchStudyLabelComponentProperties(ResearchStudy.ResearchStudyLabelComponent element) throws IOException {
composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasValueElement()) {
+ composeStringCore("value", element.getValueElement(), false);
+ composeStringExtras("value", element.getValueElement(), false);
+ }
+ }
+
+ protected void composeResearchStudyFocusComponent(String name, ResearchStudy.ResearchStudyFocusComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeResearchStudyFocusComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeResearchStudyFocusComponentProperties(ResearchStudy.ResearchStudyFocusComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasProductCode()) {
+ composeCodeableConcept("productCode", element.getProductCode());
+ }
+ if (element.hasFocusType()) {
+ openArray("focusType");
+ for (CodeableConcept e : element.getFocusType())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasFactorElement()) {
+ composeMarkdownCore("factor", element.getFactorElement(), false);
+ composeMarkdownExtras("factor", element.getFactorElement(), false);
+ }
+ }
+
+ protected void composeResearchStudyClassificationComponent(String name, ResearchStudy.ResearchStudyClassificationComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeResearchStudyClassificationComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeResearchStudyClassificationComponentProperties(ResearchStudy.ResearchStudyClassificationComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasClassifier()) {
+ openArray("classifier");
+ for (CodeableConcept e : element.getClassifier())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ }
+
+ protected void composeResearchStudyAssociatedPartyComponent(String name, ResearchStudy.ResearchStudyAssociatedPartyComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeResearchStudyAssociatedPartyComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeResearchStudyAssociatedPartyComponentProperties(ResearchStudy.ResearchStudyAssociatedPartyComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasNameElement()) {
+ composeStringCore("name", element.getNameElement(), false);
+ composeStringExtras("name", element.getNameElement(), false);
+ }
+ if (element.hasRole()) {
+ composeCodeableConcept("role", element.getRole());
+ }
+ if (element.hasClassifier()) {
+ openArray("classifier");
+ for (CodeableConcept e : element.getClassifier())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasParty()) {
+ composeReference("party", element.getParty());
+ }
+ }
+
+ protected void composeResearchStudyStatusDateComponent(String name, ResearchStudy.ResearchStudyStatusDateComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeResearchStudyStatusDateComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeResearchStudyStatusDateComponentProperties(ResearchStudy.ResearchStudyStatusDateComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasActivity()) {
+ composeCodeableConcept("activity", element.getActivity());
+ }
+ if (element.hasActualElement()) {
+ composeBooleanCore("actual", element.getActualElement(), false);
+ composeBooleanExtras("actual", element.getActualElement(), false);
+ }
+ if (element.hasPeriod()) {
+ composePeriod("period", element.getPeriod());
+ }
+ }
+
+ protected void composeResearchStudyRecruitmentComponent(String name, ResearchStudy.ResearchStudyRecruitmentComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeResearchStudyRecruitmentComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeResearchStudyRecruitmentComponentProperties(ResearchStudy.ResearchStudyRecruitmentComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasTargetNumberElement()) {
+ composeUnsignedIntCore("targetNumber", element.getTargetNumberElement(), false);
+ composeUnsignedIntExtras("targetNumber", element.getTargetNumberElement(), false);
+ }
+ if (element.hasActualNumberElement()) {
+ composeUnsignedIntCore("actualNumber", element.getActualNumberElement(), false);
+ composeUnsignedIntExtras("actualNumber", element.getActualNumberElement(), false);
+ }
+ if (element.hasEligibility()) {
+ composeReference("eligibility", element.getEligibility());
+ }
+ if (element.hasActualGroup()) {
+ composeReference("actualGroup", element.getActualGroup());
+ }
+ }
+
+ protected void composeResearchStudyComparisonGroupComponent(String name, ResearchStudy.ResearchStudyComparisonGroupComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeResearchStudyComparisonGroupComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeResearchStudyComparisonGroupComponentProperties(ResearchStudy.ResearchStudyComparisonGroupComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasIdentifier()) {
+ composeType("identifier", element.getIdentifier());
+ }
if (element.hasNameElement()) {
composeStringCore("name", element.getNameElement(), false);
composeStringExtras("name", element.getNameElement(), false);
@@ -58315,8 +59989,17 @@ public class JsonParser extends JsonParserBase {
composeCodeableConcept("type", element.getType());
}
if (element.hasDescriptionElement()) {
- composeStringCore("description", element.getDescriptionElement(), false);
- composeStringExtras("description", element.getDescriptionElement(), false);
+ composeMarkdownCore("description", element.getDescriptionElement(), false);
+ composeMarkdownExtras("description", element.getDescriptionElement(), false);
+ }
+ if (element.hasIntendedExposure()) {
+ openArray("intendedExposure");
+ for (Reference e : element.getIntendedExposure())
+ composeReference(null, e);
+ closeArray();
+ };
+ if (element.hasObservedGroup()) {
+ composeReference("observedGroup", element.getObservedGroup());
}
}
@@ -58337,6 +60020,58 @@ public class JsonParser extends JsonParserBase {
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
+ if (element.hasDescriptionElement()) {
+ composeMarkdownCore("description", element.getDescriptionElement(), false);
+ composeMarkdownExtras("description", element.getDescriptionElement(), false);
+ }
+ }
+
+ protected void composeResearchStudyOutcomeMeasureComponent(String name, ResearchStudy.ResearchStudyOutcomeMeasureComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeResearchStudyOutcomeMeasureComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeResearchStudyOutcomeMeasureComponentProperties(ResearchStudy.ResearchStudyOutcomeMeasureComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasNameElement()) {
+ composeStringCore("name", element.getNameElement(), false);
+ composeStringExtras("name", element.getNameElement(), false);
+ }
+ if (element.hasType()) {
+ openArray("type");
+ for (CodeableConcept e : element.getType())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ if (element.hasDescriptionElement()) {
+ composeMarkdownCore("description", element.getDescriptionElement(), false);
+ composeMarkdownExtras("description", element.getDescriptionElement(), false);
+ }
+ if (element.hasReference()) {
+ composeReference("reference", element.getReference());
+ }
+ }
+
+ protected void composeResearchStudyWebLocationComponent(String name, ResearchStudy.ResearchStudyWebLocationComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeResearchStudyWebLocationComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeResearchStudyWebLocationComponentProperties(ResearchStudy.ResearchStudyWebLocationComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasUrlElement()) {
+ composeUriCore("url", element.getUrlElement(), false);
+ composeUriExtras("url", element.getUrlElement(), false);
+ }
}
protected void composeResearchSubject(String name, ResearchSubject element) throws IOException {
@@ -58355,8 +60090,8 @@ public class JsonParser extends JsonParserBase {
closeArray();
};
if (element.hasStatusElement()) {
- composeEnumerationCore("status", element.getStatusElement(), new ResearchSubject.ResearchSubjectStatusEnumFactory(), false);
- composeEnumerationExtras("status", element.getStatusElement(), new ResearchSubject.ResearchSubjectStatusEnumFactory(), false);
+ composeEnumerationCore("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
+ composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory(), false);
}
if (element.hasProgress()) {
openArray("progress");
@@ -58370,8 +60105,8 @@ public class JsonParser extends JsonParserBase {
if (element.hasStudy()) {
composeReference("study", element.getStudy());
}
- if (element.hasIndividual()) {
- composeReference("individual", element.getIndividual());
+ if (element.hasSubject()) {
+ composeReference("subject", element.getSubject());
}
if (element.hasAssignedArmElement()) {
composeStringCore("assignedArm", element.getAssignedArmElement(), false);
@@ -58399,8 +60134,8 @@ public class JsonParser extends JsonParserBase {
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
- if (element.hasState()) {
- composeCodeableConcept("state", element.getState());
+ if (element.hasSubjectState()) {
+ composeCodeableConcept("subjectState", element.getSubjectState());
}
if (element.hasMilestone()) {
composeCodeableConcept("milestone", element.getMilestone());
@@ -58412,6 +60147,10 @@ public class JsonParser extends JsonParserBase {
composeDateTimeCore("startDate", element.getStartDateElement(), false);
composeDateTimeExtras("startDate", element.getStartDateElement(), false);
}
+ if (element.hasEndDateElement()) {
+ composeDateTimeCore("endDate", element.getEndDateElement(), false);
+ composeDateTimeExtras("endDate", element.getEndDateElement(), false);
+ }
}
protected void composeRiskAssessment(String name, RiskAssessment element) throws IOException {
@@ -58647,10 +60386,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasBase()) {
if (anyHasValue(element.getBase())) {
- openArray("base");
- for (CodeType e : element.getBase())
+ openArray("base");
+ for (CodeType e : element.getBase())
composeCodeCore(null, e, e != element.getBase().get(element.getBase().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getBase())) {
openArray("_base");
@@ -58677,10 +60416,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasTarget()) {
if (anyHasValue(element.getTarget())) {
- openArray("target");
- for (CodeType e : element.getTarget())
+ openArray("target");
+ for (CodeType e : element.getTarget())
composeCodeCore(null, e, e != element.getTarget().get(element.getTarget().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getTarget())) {
openArray("_target");
@@ -58723,10 +60462,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasChain()) {
if (anyHasValue(element.getChain())) {
- openArray("chain");
- for (StringType e : element.getChain())
+ openArray("chain");
+ for (StringType e : element.getChain())
composeStringCore(null, e, e != element.getChain().get(element.getChain().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getChain())) {
openArray("_chain");
@@ -58780,10 +60519,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesCanonical()) {
if (anyHasValue(element.getInstantiatesCanonical())) {
- openArray("instantiatesCanonical");
- for (CanonicalType e : element.getInstantiatesCanonical())
+ openArray("instantiatesCanonical");
+ for (CanonicalType e : element.getInstantiatesCanonical())
composeCanonicalCore(null, e, e != element.getInstantiatesCanonical().get(element.getInstantiatesCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesCanonical())) {
openArray("_instantiatesCanonical");
@@ -58794,10 +60533,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasInstantiatesUri()) {
if (anyHasValue(element.getInstantiatesUri())) {
- openArray("instantiatesUri");
- for (UriType e : element.getInstantiatesUri())
+ openArray("instantiatesUri");
+ for (UriType e : element.getInstantiatesUri())
composeUriCore(null, e, e != element.getInstantiatesUri().get(element.getInstantiatesUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getInstantiatesUri())) {
openArray("_instantiatesUri");
@@ -59192,10 +60931,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasDerivedFromCanonical()) {
if (anyHasValue(element.getDerivedFromCanonical())) {
- openArray("derivedFromCanonical");
- for (CanonicalType e : element.getDerivedFromCanonical())
+ openArray("derivedFromCanonical");
+ for (CanonicalType e : element.getDerivedFromCanonical())
composeCanonicalCore(null, e, e != element.getDerivedFromCanonical().get(element.getDerivedFromCanonical().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDerivedFromCanonical())) {
openArray("_derivedFromCanonical");
@@ -59206,10 +60945,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasDerivedFromUri()) {
if (anyHasValue(element.getDerivedFromUri())) {
- openArray("derivedFromUri");
- for (UriType e : element.getDerivedFromUri())
+ openArray("derivedFromUri");
+ for (UriType e : element.getDerivedFromUri())
composeUriCore(null, e, e != element.getDerivedFromUri().get(element.getDerivedFromUri().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDerivedFromUri())) {
openArray("_derivedFromUri");
@@ -59549,10 +61288,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasContextInvariant()) {
if (anyHasValue(element.getContextInvariant())) {
- openArray("contextInvariant");
- for (StringType e : element.getContextInvariant())
+ openArray("contextInvariant");
+ for (StringType e : element.getContextInvariant())
composeStringCore(null, e, e != element.getContextInvariant().get(element.getContextInvariant().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getContextInvariant())) {
openArray("_contextInvariant");
@@ -59750,10 +61489,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasImport()) {
if (anyHasValue(element.getImport())) {
- openArray("import");
- for (CanonicalType e : element.getImport())
+ openArray("import");
+ for (CanonicalType e : element.getImport())
composeCanonicalCore(null, e, e != element.getImport().get(element.getImport().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getImport())) {
openArray("_import");
@@ -59979,10 +61718,6 @@ public class JsonParser extends JsonParserBase {
composeIdCore("context", element.getContextElement(), false);
composeIdExtras("context", element.getContextElement(), false);
}
- if (element.hasContextTypeElement()) {
- composeEnumerationCore("contextType", element.getContextTypeElement(), new StructureMap.StructureMapContextTypeEnumFactory(), false);
- composeEnumerationExtras("contextType", element.getContextTypeElement(), new StructureMap.StructureMapContextTypeEnumFactory(), false);
- }
if (element.hasElementElement()) {
composeStringCore("element", element.getElementElement(), false);
composeStringExtras("element", element.getElementElement(), false);
@@ -60050,10 +61785,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasVariable()) {
if (anyHasValue(element.getVariable())) {
- openArray("variable");
- for (StringType e : element.getVariable())
+ openArray("variable");
+ for (StringType e : element.getVariable())
composeStringCore(null, e, e != element.getVariable().get(element.getVariable().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getVariable())) {
openArray("_variable");
@@ -60087,8 +61822,9 @@ public class JsonParser extends JsonParserBase {
composeEnumerationCore("status", element.getStatusElement(), new Enumerations.SubscriptionStateEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.SubscriptionStateEnumFactory(), false);
}
- if (element.hasTopic()) {
- composeReference("topic", element.getTopic());
+ if (element.hasTopicElement()) {
+ composeCanonicalCore("topic", element.getTopicElement(), false);
+ composeCanonicalExtras("topic", element.getTopicElement(), false);
}
if (element.hasContact()) {
openArray("contact");
@@ -60119,10 +61855,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasHeader()) {
if (anyHasValue(element.getHeader())) {
- openArray("header");
- for (StringType e : element.getHeader())
+ openArray("header");
+ for (StringType e : element.getHeader())
composeStringCore(null, e, e != element.getHeader().get(element.getHeader().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getHeader())) {
openArray("_header");
@@ -60147,6 +61883,14 @@ public class JsonParser extends JsonParserBase {
composeEnumerationCore("content", element.getContentElement(), new Subscription.SubscriptionPayloadContentEnumFactory(), false);
composeEnumerationExtras("content", element.getContentElement(), new Subscription.SubscriptionPayloadContentEnumFactory(), false);
}
+ if (element.hasNotificationUrlLocationElement()) {
+ composeEnumerationCore("notificationUrlLocation", element.getNotificationUrlLocationElement(), new Subscription.SubscriptionUrlLocationEnumFactory(), false);
+ composeEnumerationExtras("notificationUrlLocation", element.getNotificationUrlLocationElement(), new Subscription.SubscriptionUrlLocationEnumFactory(), false);
+ }
+ if (element.hasMaxCountElement()) {
+ composePositiveIntCore("maxCount", element.getMaxCountElement(), false);
+ composePositiveIntExtras("maxCount", element.getMaxCountElement(), false);
+ }
}
protected void composeSubscriptionFilterByComponent(String name, Subscription.SubscriptionFilterByComponent element) throws IOException {
@@ -60159,6 +61903,10 @@ public class JsonParser extends JsonParserBase {
protected void composeSubscriptionFilterByComponentProperties(Subscription.SubscriptionFilterByComponent element) throws IOException {
composeBackboneElementProperties(element);
+ if (element.hasResourceTypeElement()) {
+ composeUriCore("resourceType", element.getResourceTypeElement(), false);
+ composeUriExtras("resourceType", element.getResourceTypeElement(), false);
+ }
if (element.hasSearchParamNameElement()) {
composeStringCore("searchParamName", element.getSearchParamNameElement(), false);
composeStringExtras("searchParamName", element.getSearchParamNameElement(), false);
@@ -60182,6 +61930,10 @@ public class JsonParser extends JsonParserBase {
protected void composeSubscriptionStatusProperties(SubscriptionStatus element) throws IOException {
composeDomainResourceProperties(element);
+ if (element.hasStatusElement()) {
+ composeEnumerationCore("status", element.getStatusElement(), new Enumerations.SubscriptionStateEnumFactory(), false);
+ composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.SubscriptionStateEnumFactory(), false);
+ }
if (element.hasTypeElement()) {
composeEnumerationCore("type", element.getTypeElement(), new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory(), false);
composeEnumerationExtras("type", element.getTypeElement(), new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory(), false);
@@ -60197,10 +61949,6 @@ public class JsonParser extends JsonParserBase {
if (element.hasSubscription()) {
composeReference("subscription", element.getSubscription());
}
- if (element.hasStatusElement()) {
- composeEnumerationCore("status", element.getStatusElement(), new Enumerations.SubscriptionStateEnumFactory(), false);
- composeEnumerationExtras("status", element.getStatusElement(), new Enumerations.SubscriptionStateEnumFactory(), false);
- }
if (element.hasTopicElement()) {
composeCanonicalCore("topic", element.getTopicElement(), false);
composeCanonicalExtras("topic", element.getTopicElement(), false);
@@ -60242,10 +61990,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasDerivedFrom()) {
if (anyHasValue(element.getDerivedFrom())) {
- openArray("derivedFrom");
- for (CanonicalType e : element.getDerivedFrom())
+ openArray("derivedFrom");
+ for (CanonicalType e : element.getDerivedFrom())
composeCanonicalCore(null, e, e != element.getDerivedFrom().get(element.getDerivedFrom().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDerivedFrom())) {
openArray("_derivedFrom");
@@ -60311,12 +62059,9 @@ public class JsonParser extends JsonParserBase {
composePeriod("effectivePeriod", element.getEffectivePeriod());
}
if (element.hasResourceTrigger()) {
- composeSubscriptionTopicResourceTriggerComponent("resourceTrigger", element.getResourceTrigger());
- }
- if (element.hasCanFilterBy()) {
- openArray("canFilterBy");
- for (SubscriptionTopic.SubscriptionTopicCanFilterByComponent e : element.getCanFilterBy())
- composeSubscriptionTopicCanFilterByComponent(null, e);
+ openArray("resourceTrigger");
+ for (SubscriptionTopic.SubscriptionTopicResourceTriggerComponent e : element.getResourceTrigger())
+ composeSubscriptionTopicResourceTriggerComponent(null, e);
closeArray();
};
}
@@ -60335,20 +62080,10 @@ public class JsonParser extends JsonParserBase {
composeStringCore("description", element.getDescriptionElement(), false);
composeStringExtras("description", element.getDescriptionElement(), false);
}
- if (element.hasResourceType()) {
- if (anyHasValue(element.getResourceType())) {
- openArray("resourceType");
- for (CodeType e : element.getResourceType())
- composeCodeCore(null, e, e != element.getResourceType().get(element.getResourceType().size()-1));
- closeArray();
- }
- if (anyHasExtras(element.getResourceType())) {
- openArray("_resourceType");
- for (CodeType e : element.getResourceType())
- composeCodeExtras(null, e, true);
- closeArray();
- }
- };
+ if (element.hasResourceTypeElement()) {
+ composeUriCore("resourceType", element.getResourceTypeElement(), false);
+ composeUriExtras("resourceType", element.getResourceTypeElement(), false);
+ }
if (element.hasMethodCriteria()) {
openArray("methodCriteria");
for (Enumeration e : element.getMethodCriteria())
@@ -60366,10 +62101,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasFhirPathCriteria()) {
if (anyHasValue(element.getFhirPathCriteria())) {
- openArray("fhirPathCriteria");
- for (StringType e : element.getFhirPathCriteria())
+ openArray("fhirPathCriteria");
+ for (StringType e : element.getFhirPathCriteria())
composeStringCore(null, e, e != element.getFhirPathCriteria().get(element.getFhirPathCriteria().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getFhirPathCriteria())) {
openArray("_fhirPathCriteria");
@@ -60378,6 +62113,12 @@ public class JsonParser extends JsonParserBase {
closeArray();
}
};
+ if (element.hasCanFilterBy()) {
+ openArray("canFilterBy");
+ for (SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent e : element.getCanFilterBy())
+ composeSubscriptionTopicResourceTriggerCanFilterByComponent(null, e);
+ closeArray();
+ };
}
protected void composeSubscriptionTopicResourceTriggerQueryCriteriaComponent(String name, SubscriptionTopic.SubscriptionTopicResourceTriggerQueryCriteriaComponent element) throws IOException {
@@ -60394,25 +62135,33 @@ public class JsonParser extends JsonParserBase {
composeStringCore("previous", element.getPreviousElement(), false);
composeStringExtras("previous", element.getPreviousElement(), false);
}
+ if (element.hasResultForCreateElement()) {
+ composeEnumerationCore("resultForCreate", element.getResultForCreateElement(), new SubscriptionTopic.CriteriaNotExistsBehaviorEnumFactory(), false);
+ composeEnumerationExtras("resultForCreate", element.getResultForCreateElement(), new SubscriptionTopic.CriteriaNotExistsBehaviorEnumFactory(), false);
+ }
if (element.hasCurrentElement()) {
composeStringCore("current", element.getCurrentElement(), false);
composeStringExtras("current", element.getCurrentElement(), false);
}
+ if (element.hasResultForDeleteElement()) {
+ composeEnumerationCore("resultForDelete", element.getResultForDeleteElement(), new SubscriptionTopic.CriteriaNotExistsBehaviorEnumFactory(), false);
+ composeEnumerationExtras("resultForDelete", element.getResultForDeleteElement(), new SubscriptionTopic.CriteriaNotExistsBehaviorEnumFactory(), false);
+ }
if (element.hasRequireBothElement()) {
composeBooleanCore("requireBoth", element.getRequireBothElement(), false);
composeBooleanExtras("requireBoth", element.getRequireBothElement(), false);
}
}
- protected void composeSubscriptionTopicCanFilterByComponent(String name, SubscriptionTopic.SubscriptionTopicCanFilterByComponent element) throws IOException {
+ protected void composeSubscriptionTopicResourceTriggerCanFilterByComponent(String name, SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent element) throws IOException {
if (element != null) {
open(name);
- composeSubscriptionTopicCanFilterByComponentProperties(element);
+ composeSubscriptionTopicResourceTriggerCanFilterByComponentProperties(element);
close();
}
}
- protected void composeSubscriptionTopicCanFilterByComponentProperties(SubscriptionTopic.SubscriptionTopicCanFilterByComponent element) throws IOException {
+ protected void composeSubscriptionTopicResourceTriggerCanFilterByComponentProperties(SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent element) throws IOException {
composeBackboneElementProperties(element);
if (element.hasSearchParamNameElement()) {
composeStringCore("searchParamName", element.getSearchParamNameElement(), false);
@@ -60451,6 +62200,10 @@ public class JsonParser extends JsonParserBase {
composeIdentifier(null, e);
closeArray();
};
+ if (element.hasInstanceElement()) {
+ composeBooleanCore("instance", element.getInstanceElement(), false);
+ composeBooleanExtras("instance", element.getInstanceElement(), false);
+ }
if (element.hasStatusElement()) {
composeEnumerationCore("status", element.getStatusElement(), new Substance.FHIRSubstanceStatusEnumFactory(), false);
composeEnumerationExtras("status", element.getStatusElement(), new Substance.FHIRSubstanceStatusEnumFactory(), false);
@@ -60462,39 +62215,12 @@ public class JsonParser extends JsonParserBase {
closeArray();
};
if (element.hasCode()) {
- composeCodeableConcept("code", element.getCode());
+ composeCodeableReference("code", element.getCode());
}
if (element.hasDescriptionElement()) {
composeStringCore("description", element.getDescriptionElement(), false);
composeStringExtras("description", element.getDescriptionElement(), false);
}
- if (element.hasInstance()) {
- openArray("instance");
- for (Substance.SubstanceInstanceComponent e : element.getInstance())
- composeSubstanceInstanceComponent(null, e);
- closeArray();
- };
- if (element.hasIngredient()) {
- openArray("ingredient");
- for (Substance.SubstanceIngredientComponent e : element.getIngredient())
- composeSubstanceIngredientComponent(null, e);
- closeArray();
- };
- }
-
- protected void composeSubstanceInstanceComponent(String name, Substance.SubstanceInstanceComponent element) throws IOException {
- if (element != null) {
- open(name);
- composeSubstanceInstanceComponentProperties(element);
- close();
- }
- }
-
- protected void composeSubstanceInstanceComponentProperties(Substance.SubstanceInstanceComponent element) throws IOException {
- composeBackboneElementProperties(element);
- if (element.hasIdentifier()) {
- composeIdentifier("identifier", element.getIdentifier());
- }
if (element.hasExpiryElement()) {
composeDateTimeCore("expiry", element.getExpiryElement(), false);
composeDateTimeExtras("expiry", element.getExpiryElement(), false);
@@ -60502,6 +62228,12 @@ public class JsonParser extends JsonParserBase {
if (element.hasQuantity()) {
composeQuantity("quantity", element.getQuantity());
}
+ if (element.hasIngredient()) {
+ openArray("ingredient");
+ for (Substance.SubstanceIngredientComponent e : element.getIngredient())
+ composeSubstanceIngredientComponent(null, e);
+ closeArray();
+ };
}
protected void composeSubstanceIngredientComponent(String name, Substance.SubstanceIngredientComponent element) throws IOException {
@@ -60553,6 +62285,12 @@ public class JsonParser extends JsonParserBase {
if (element.hasDomain()) {
composeCodeableConcept("domain", element.getDomain());
}
+ if (element.hasGrade()) {
+ openArray("grade");
+ for (CodeableConcept e : element.getGrade())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
if (element.hasDescriptionElement()) {
composeMarkdownCore("description", element.getDescriptionElement(), false);
composeMarkdownExtras("description", element.getDescriptionElement(), false);
@@ -60633,7 +62371,7 @@ public class JsonParser extends JsonParserBase {
composeReference("protein", element.getProtein());
}
if (element.hasSourceMaterial()) {
- composeReference("sourceMaterial", element.getSourceMaterial());
+ composeSubstanceDefinitionSourceMaterialComponent("sourceMaterial", element.getSourceMaterial());
}
}
@@ -60999,6 +62737,36 @@ public class JsonParser extends JsonParserBase {
};
}
+ protected void composeSubstanceDefinitionSourceMaterialComponent(String name, SubstanceDefinition.SubstanceDefinitionSourceMaterialComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeSubstanceDefinitionSourceMaterialComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeSubstanceDefinitionSourceMaterialComponentProperties(SubstanceDefinition.SubstanceDefinitionSourceMaterialComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasGenus()) {
+ composeCodeableConcept("genus", element.getGenus());
+ }
+ if (element.hasSpecies()) {
+ composeCodeableConcept("species", element.getSpecies());
+ }
+ if (element.hasPart()) {
+ composeCodeableConcept("part", element.getPart());
+ }
+ if (element.hasCountryOfOrigin()) {
+ openArray("countryOfOrigin");
+ for (CodeableConcept e : element.getCountryOfOrigin())
+ composeCodeableConcept(null, e);
+ closeArray();
+ };
+ }
+
protected void composeSubstanceNucleicAcid(String name, SubstanceNucleicAcid element) throws IOException {
if (element != null) {
prop("resourceType", name);
@@ -61343,10 +63111,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasDisulfideLinkage()) {
if (anyHasValue(element.getDisulfideLinkage())) {
- openArray("disulfideLinkage");
- for (StringType e : element.getDisulfideLinkage())
+ openArray("disulfideLinkage");
+ for (StringType e : element.getDisulfideLinkage())
composeStringCore(null, e, e != element.getDisulfideLinkage().get(element.getDisulfideLinkage().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getDisulfideLinkage())) {
openArray("_disulfideLinkage");
@@ -61557,10 +63325,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasParentSubstanceName()) {
if (anyHasValue(element.getParentSubstanceName())) {
- openArray("parentSubstanceName");
- for (StringType e : element.getParentSubstanceName())
+ openArray("parentSubstanceName");
+ for (StringType e : element.getParentSubstanceName())
composeStringCore(null, e, e != element.getParentSubstanceName().get(element.getParentSubstanceName().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getParentSubstanceName())) {
openArray("_parentSubstanceName");
@@ -61577,10 +63345,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasGeographicalLocation()) {
if (anyHasValue(element.getGeographicalLocation())) {
- openArray("geographicalLocation");
- for (StringType e : element.getGeographicalLocation())
+ openArray("geographicalLocation");
+ for (StringType e : element.getGeographicalLocation())
composeStringCore(null, e, e != element.getGeographicalLocation().get(element.getGeographicalLocation().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getGeographicalLocation())) {
openArray("_geographicalLocation");
@@ -62326,10 +64094,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasLanguage()) {
if (anyHasValue(element.getLanguage())) {
- openArray("language");
- for (CodeType e : element.getLanguage())
+ openArray("language");
+ for (CodeType e : element.getLanguage())
composeCodeCore(null, e, e != element.getLanguage().get(element.getLanguage().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getLanguage())) {
openArray("_language");
@@ -62346,10 +64114,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasProperty()) {
if (anyHasValue(element.getProperty())) {
- openArray("property");
- for (CodeType e : element.getProperty())
+ openArray("property");
+ for (CodeType e : element.getProperty())
composeCodeCore(null, e, e != element.getProperty().get(element.getProperty().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getProperty())) {
openArray("_property");
@@ -62376,10 +64144,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasOp()) {
if (anyHasValue(element.getOp())) {
- openArray("op");
- for (CodeType e : element.getOp())
+ openArray("op");
+ for (CodeType e : element.getOp())
composeCodeCore(null, e, e != element.getOp().get(element.getOp().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getOp())) {
openArray("_op");
@@ -62825,6 +64593,12 @@ public class JsonParser extends JsonParserBase {
if (element.hasMetadata()) {
composeTestScriptMetadataComponent("metadata", element.getMetadata());
}
+ if (element.hasScope()) {
+ openArray("scope");
+ for (TestScript.TestScriptScopeComponent e : element.getScope())
+ composeTestScriptScopeComponent(null, e);
+ closeArray();
+ };
if (element.hasFixture()) {
openArray("fixture");
for (TestScript.TestScriptFixtureComponent e : element.getFixture())
@@ -62963,10 +64737,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasOrigin()) {
if (anyHasValue(element.getOrigin())) {
- openArray("origin");
- for (IntegerType e : element.getOrigin())
+ openArray("origin");
+ for (IntegerType e : element.getOrigin())
composeIntegerCore(null, e, e != element.getOrigin().get(element.getOrigin().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getOrigin())) {
openArray("_origin");
@@ -62981,10 +64755,10 @@ public class JsonParser extends JsonParserBase {
}
if (element.hasLink()) {
if (anyHasValue(element.getLink())) {
- openArray("link");
- for (UriType e : element.getLink())
+ openArray("link");
+ for (UriType e : element.getLink())
composeUriCore(null, e, e != element.getLink().get(element.getLink().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getLink())) {
openArray("_link");
@@ -62999,6 +64773,28 @@ public class JsonParser extends JsonParserBase {
}
}
+ protected void composeTestScriptScopeComponent(String name, TestScript.TestScriptScopeComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeTestScriptScopeComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeTestScriptScopeComponentProperties(TestScript.TestScriptScopeComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasArtifactElement()) {
+ composeCanonicalCore("artifact", element.getArtifactElement(), false);
+ composeCanonicalExtras("artifact", element.getArtifactElement(), false);
+ }
+ if (element.hasConformance()) {
+ composeCodeableConcept("conformance", element.getConformance());
+ }
+ if (element.hasPhase()) {
+ composeCodeableConcept("phase", element.getPhase());
+ }
+ }
+
protected void composeTestScriptFixtureComponent(String name, TestScript.TestScriptFixtureComponent element) throws IOException {
if (element != null) {
open(name);
@@ -63289,6 +65085,10 @@ public class JsonParser extends JsonParserBase {
composeIdCore("sourceId", element.getSourceIdElement(), false);
composeIdExtras("sourceId", element.getSourceIdElement(), false);
}
+ if (element.hasStopTestOnFailElement()) {
+ composeBooleanCore("stopTestOnFail", element.getStopTestOnFailElement(), false);
+ composeBooleanExtras("stopTestOnFail", element.getStopTestOnFailElement(), false);
+ }
if (element.hasValidateProfileIdElement()) {
composeIdCore("validateProfileId", element.getValidateProfileIdElement(), false);
composeIdExtras("validateProfileId", element.getValidateProfileIdElement(), false);
@@ -63467,6 +65267,9 @@ public class JsonParser extends JsonParserBase {
if (element.hasExpansion()) {
composeValueSetExpansionComponent("expansion", element.getExpansion());
}
+ if (element.hasScope()) {
+ composeValueSetScopeComponent("scope", element.getScope());
+ }
}
protected void composeValueSetComposeComponent(String name, ValueSet.ValueSetComposeComponent element) throws IOException {
@@ -63501,10 +65304,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasProperty()) {
if (anyHasValue(element.getProperty())) {
- openArray("property");
- for (StringType e : element.getProperty())
+ openArray("property");
+ for (StringType e : element.getProperty())
composeStringCore(null, e, e != element.getProperty().get(element.getProperty().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getProperty())) {
openArray("_property");
@@ -63547,10 +65350,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasValueSet()) {
if (anyHasValue(element.getValueSet())) {
- openArray("valueSet");
- for (CanonicalType e : element.getValueSet())
+ openArray("valueSet");
+ for (CanonicalType e : element.getValueSet())
composeCanonicalCore(null, e, e != element.getValueSet().get(element.getValueSet().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getValueSet())) {
openArray("_valueSet");
@@ -63559,6 +65362,10 @@ public class JsonParser extends JsonParserBase {
closeArray();
}
};
+ if (element.hasCopyrightElement()) {
+ composeStringCore("copyright", element.getCopyrightElement(), false);
+ composeStringExtras("copyright", element.getCopyrightElement(), false);
+ }
}
protected void composeConceptReferenceComponent(String name, ValueSet.ConceptReferenceComponent element) throws IOException {
@@ -63792,6 +65599,30 @@ public class JsonParser extends JsonParserBase {
}
}
+ protected void composeValueSetScopeComponent(String name, ValueSet.ValueSetScopeComponent element) throws IOException {
+ if (element != null) {
+ open(name);
+ composeValueSetScopeComponentProperties(element);
+ close();
+ }
+ }
+
+ protected void composeValueSetScopeComponentProperties(ValueSet.ValueSetScopeComponent element) throws IOException {
+ composeBackboneElementProperties(element);
+ if (element.hasFocusElement()) {
+ composeStringCore("focus", element.getFocusElement(), false);
+ composeStringExtras("focus", element.getFocusElement(), false);
+ }
+ if (element.hasInclusionCriteriaElement()) {
+ composeStringCore("inclusionCriteria", element.getInclusionCriteriaElement(), false);
+ composeStringExtras("inclusionCriteria", element.getInclusionCriteriaElement(), false);
+ }
+ if (element.hasExclusionCriteriaElement()) {
+ composeStringCore("exclusionCriteria", element.getExclusionCriteriaElement(), false);
+ composeStringExtras("exclusionCriteria", element.getExclusionCriteriaElement(), false);
+ }
+ }
+
protected void composeVerificationResult(String name, VerificationResult element) throws IOException {
if (element != null) {
prop("resourceType", name);
@@ -63809,10 +65640,10 @@ public class JsonParser extends JsonParserBase {
};
if (element.hasTargetLocation()) {
if (anyHasValue(element.getTargetLocation())) {
- openArray("targetLocation");
- for (StringType e : element.getTargetLocation())
+ openArray("targetLocation");
+ for (StringType e : element.getTargetLocation())
composeStringCore(null, e, e != element.getTargetLocation().get(element.getTargetLocation().size()-1));
- closeArray();
+ closeArray();
}
if (anyHasExtras(element.getTargetLocation())) {
openArray("_targetLocation");
@@ -64202,8 +66033,8 @@ public class JsonParser extends JsonParserBase {
composeDeviceMetric("DeviceMetric", (DeviceMetric)resource);
} else if (resource instanceof DeviceRequest) {
composeDeviceRequest("DeviceRequest", (DeviceRequest)resource);
- } else if (resource instanceof DeviceUseStatement) {
- composeDeviceUseStatement("DeviceUseStatement", (DeviceUseStatement)resource);
+ } else if (resource instanceof DeviceUsage) {
+ composeDeviceUsage("DeviceUsage", (DeviceUsage)resource);
} else if (resource instanceof DiagnosticReport) {
composeDiagnosticReport("DiagnosticReport", (DiagnosticReport)resource);
} else if (resource instanceof DocumentManifest) {
@@ -64260,6 +66091,8 @@ public class JsonParser extends JsonParserBase {
composeIngredient("Ingredient", (Ingredient)resource);
} else if (resource instanceof InsurancePlan) {
composeInsurancePlan("InsurancePlan", (InsurancePlan)resource);
+ } else if (resource instanceof InventoryReport) {
+ composeInventoryReport("InventoryReport", (InventoryReport)resource);
} else if (resource instanceof Invoice) {
composeInvoice("Invoice", (Invoice)resource);
} else if (resource instanceof Library) {
@@ -64504,8 +66337,8 @@ public class JsonParser extends JsonParserBase {
composeDeviceMetric(name, (DeviceMetric)resource);
} else if (resource instanceof DeviceRequest) {
composeDeviceRequest(name, (DeviceRequest)resource);
- } else if (resource instanceof DeviceUseStatement) {
- composeDeviceUseStatement(name, (DeviceUseStatement)resource);
+ } else if (resource instanceof DeviceUsage) {
+ composeDeviceUsage(name, (DeviceUsage)resource);
} else if (resource instanceof DiagnosticReport) {
composeDiagnosticReport(name, (DiagnosticReport)resource);
} else if (resource instanceof DocumentManifest) {
@@ -64562,6 +66395,8 @@ public class JsonParser extends JsonParserBase {
composeIngredient(name, (Ingredient)resource);
} else if (resource instanceof InsurancePlan) {
composeInsurancePlan(name, (InsurancePlan)resource);
+ } else if (resource instanceof InventoryReport) {
+ composeInventoryReport(name, (InventoryReport)resource);
} else if (resource instanceof Invoice) {
composeInvoice(name, (Invoice)resource);
} else if (resource instanceof Library) {
@@ -64786,6 +66621,8 @@ public class JsonParser extends JsonParserBase {
composeRange(prefix+"Range", (Range) type);
} else if (type instanceof Ratio) {
composeRatio(prefix+"Ratio", (Ratio) type);
+ } else if (type instanceof RatioRange) {
+ composeRatioRange(prefix+"RatioRange", (RatioRange) type);
} else if (type instanceof Reference) {
composeReference(prefix+"Reference", (Reference) type);
} else if (type instanceof RelatedArtifact) {
@@ -64955,6 +66792,8 @@ public class JsonParser extends JsonParserBase {
composeRangeProperties((Range) type);
} else if (type instanceof Ratio) {
composeRatioProperties((Ratio) type);
+ } else if (type instanceof RatioRange) {
+ composeRatioRangeProperties((RatioRange) type);
} else if (type instanceof Reference) {
composeReferenceProperties((Reference) type);
} else if (type instanceof RelatedArtifact) {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParserBase.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParserBase.java
index e6dc9c217..80032e70d 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParserBase.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParserBase.java
@@ -156,6 +156,18 @@ public abstract class JsonParserBase extends ParserBase implements IParser {
}
return (JsonObject) j;
}
+
+ protected JsonArray getJArray(JsonObject parent, String name) throws IOException {
+ JsonElement j = parent.get(name);
+ if (j == null) {
+ return null;
+ }
+ if (!(j instanceof JsonArray)) {
+ throw new IOException("property "+name+" is a "+j.getClass()+" looking for an Array");
+ }
+ return (JsonArray) j;
+ }
+
/**
* Compose a resource to a stream, possibly using pretty presentation for a human reader (used in the spec, for example, but not normally in production)
* @throws IOException
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/RdfParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/RdfParser.java
index 9ebbb3a7d..94b622437 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/RdfParser.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/RdfParser.java
@@ -3,8 +3,6 @@ package org.hl7.fhir.r5.formats;
// generated
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -33,15 +31,16 @@ package org.hl7.fhir.r5.formats;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import org.hl7.fhir.r5.model.*;
+import org.hl7.fhir.r5.model.StringType;
import org.hl7.fhir.utilities.Utilities;
import org.hl7.fhir.exceptions.FHIRFormatError;
import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.utilities.turtle.Turtle.Complex;
+import org.hl7.fhir.utilities.turtle.Turtle.*;
import java.io.IOException;
public class RdfParser extends RdfParserBase {
@@ -1471,6 +1470,27 @@ public class RdfParser extends RdfParserBase {
}
}
+ protected void composeRatioRange(Complex parent, String parentType, String name, RatioRange element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeDataType(t, "RatioRange", name, element, index);
+ if (element.hasLowNumerator()) {
+ composeQuantity(t, "RatioRange", "lowNumerator", element.getLowNumerator(), -1);
+ }
+ if (element.hasHighNumerator()) {
+ composeQuantity(t, "RatioRange", "highNumerator", element.getHighNumerator(), -1);
+ }
+ if (element.hasDenominator()) {
+ composeQuantity(t, "RatioRange", "denominator", element.getDenominator(), -1);
+ }
+ }
+
protected void composeReference(Complex parent, String parentType, String name, Reference element, int index) {
if (element == null)
return;
@@ -1613,11 +1633,17 @@ public class RdfParser extends RdfParserBase {
if (element.hasStatisticType()) {
composeCodeableConcept(t, "Statistic", "statisticType", element.getStatisticType(), -1);
}
+ if (element.hasCategory()) {
+ composeCodeableConcept(t, "Statistic", "category", element.getCategory(), -1);
+ }
if (element.hasQuantity()) {
composeQuantity(t, "Statistic", "quantity", element.getQuantity(), -1);
}
if (element.hasNumberOfEventsElement()) {
- composeInteger(t, "Statistic", "numberOfEvents", element.getNumberOfEventsElement(), -1);
+ composeUnsignedInt(t, "Statistic", "numberOfEvents", element.getNumberOfEventsElement(), -1);
+ }
+ if (element.hasNumberAffectedElement()) {
+ composeUnsignedInt(t, "Statistic", "numberAffected", element.getNumberAffectedElement(), -1);
}
if (element.hasSampleSize()) {
composeStatisticSampleSizeComponent(t, "Statistic", "sampleSize", element.getSampleSize(), -1);
@@ -1647,13 +1673,13 @@ public class RdfParser extends RdfParserBase {
composeAnnotation(t, "StatisticSampleSizeComponent", "note", element.getNote().get(i), i);
}
if (element.hasNumberOfStudiesElement()) {
- composeInteger(t, "StatisticSampleSizeComponent", "numberOfStudies", element.getNumberOfStudiesElement(), -1);
+ composeUnsignedInt(t, "StatisticSampleSizeComponent", "numberOfStudies", element.getNumberOfStudiesElement(), -1);
}
if (element.hasNumberOfParticipantsElement()) {
- composeInteger(t, "StatisticSampleSizeComponent", "numberOfParticipants", element.getNumberOfParticipantsElement(), -1);
+ composeUnsignedInt(t, "StatisticSampleSizeComponent", "numberOfParticipants", element.getNumberOfParticipantsElement(), -1);
}
if (element.hasKnownDataCountElement()) {
- composeInteger(t, "StatisticSampleSizeComponent", "knownDataCount", element.getKnownDataCountElement(), -1);
+ composeUnsignedInt(t, "StatisticSampleSizeComponent", "knownDataCount", element.getKnownDataCountElement(), -1);
}
}
@@ -1734,7 +1760,7 @@ public class RdfParser extends RdfParserBase {
composeCodeableConcept(t, "StatisticModelCharacteristicComponent", "code", element.getCode(), -1);
}
if (element.hasValue()) {
- composeType(t, "StatisticModelCharacteristicComponent", "value", element.getValue(), -1);
+ composeQuantity(t, "StatisticModelCharacteristicComponent", "value", element.getValue(), -1);
}
for (int i = 0; i < element.getVariable().size(); i++) {
composeStatisticModelCharacteristicVariableComponent(t, "StatisticModelCharacteristicComponent", "variable", element.getVariable().get(i), i);
@@ -1967,6 +1993,24 @@ public class RdfParser extends RdfParserBase {
if (element.hasEffectivePeriod()) {
composePeriod(t, "MetadataResource", "effectivePeriod", element.getEffectivePeriod(), -1);
}
+ for (int i = 0; i < element.getTopic().size(); i++) {
+ composeCodeableConcept(t, "MetadataResource", "topic", element.getTopic().get(i), i);
+ }
+ for (int i = 0; i < element.getAuthor().size(); i++) {
+ composeContactDetail(t, "MetadataResource", "author", element.getAuthor().get(i), i);
+ }
+ for (int i = 0; i < element.getEditor().size(); i++) {
+ composeContactDetail(t, "MetadataResource", "editor", element.getEditor().get(i), i);
+ }
+ for (int i = 0; i < element.getReviewer().size(); i++) {
+ composeContactDetail(t, "MetadataResource", "reviewer", element.getReviewer().get(i), i);
+ }
+ for (int i = 0; i < element.getEndorser().size(); i++) {
+ composeContactDetail(t, "MetadataResource", "endorser", element.getEndorser().get(i), i);
+ }
+ for (int i = 0; i < element.getRelatedArtifact().size(); i++) {
+ composeRelatedArtifact(t, "MetadataResource", "relatedArtifact", element.getRelatedArtifact().get(i), i);
+ }
}
protected void composeResource(Complex t, String parentType, String name, Resource element, int index) {
@@ -2185,7 +2229,7 @@ public class RdfParser extends RdfParserBase {
composeType(t, "ActivityDefinition", "timing", element.getTiming(), -1);
}
if (element.hasLocation()) {
- composeReference(t, "ActivityDefinition", "location", element.getLocation(), -1);
+ composeCodeableReference(t, "ActivityDefinition", "location", element.getLocation(), -1);
}
for (int i = 0; i < element.getParticipant().size(); i++) {
composeActivityDefinitionParticipantComponent(t, "ActivityDefinition", "participant", element.getParticipant().get(i), i);
@@ -2232,9 +2276,15 @@ public class RdfParser extends RdfParserBase {
if (element.hasTypeElement()) {
composeEnum(t, "ActivityDefinitionParticipantComponent", "type", element.getTypeElement(), -1);
}
+ if (element.hasTypeReference()) {
+ composeReference(t, "ActivityDefinitionParticipantComponent", "typeReference", element.getTypeReference(), -1);
+ }
if (element.hasRole()) {
composeCodeableConcept(t, "ActivityDefinitionParticipantComponent", "role", element.getRole(), -1);
}
+ if (element.hasFunction()) {
+ composeCodeableConcept(t, "ActivityDefinitionParticipantComponent", "function", element.getFunction(), -1);
+ }
}
protected void composeActivityDefinitionDynamicValueComponent(Complex parent, String parentType, String name, ActivityDefinition.ActivityDefinitionDynamicValueComponent element, int index) {
@@ -2436,8 +2486,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasSeriousness()) {
composeCodeableConcept(t, "AdverseEvent", "seriousness", element.getSeriousness(), -1);
}
- if (element.hasOutcome()) {
- composeCodeableConcept(t, "AdverseEvent", "outcome", element.getOutcome(), -1);
+ for (int i = 0; i < element.getOutcome().size(); i++) {
+ composeCodeableConcept(t, "AdverseEvent", "outcome", element.getOutcome().get(i), i);
}
if (element.hasRecorder()) {
composeReference(t, "AdverseEvent", "recorder", element.getRecorder(), -1);
@@ -2656,7 +2706,7 @@ public class RdfParser extends RdfParserBase {
composeCodeableConcept(t, "AllergyIntoleranceReactionComponent", "substance", element.getSubstance(), -1);
}
for (int i = 0; i < element.getManifestation().size(); i++) {
- composeCodeableConcept(t, "AllergyIntoleranceReactionComponent", "manifestation", element.getManifestation().get(i), i);
+ composeCodeableReference(t, "AllergyIntoleranceReactionComponent", "manifestation", element.getManifestation().get(i), i);
}
if (element.hasDescriptionElement()) {
composeString(t, "AllergyIntoleranceReactionComponent", "description", element.getDescriptionElement(), -1);
@@ -2709,8 +2759,8 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getReason().size(); i++) {
composeCodeableReference(t, "Appointment", "reason", element.getReason().get(i), i);
}
- if (element.hasPriorityElement()) {
- composeUnsignedInt(t, "Appointment", "priority", element.getPriorityElement(), -1);
+ if (element.hasPriority()) {
+ composeCodeableConcept(t, "Appointment", "priority", element.getPriority(), -1);
}
if (element.hasDescriptionElement()) {
composeString(t, "Appointment", "description", element.getDescriptionElement(), -1);
@@ -2847,6 +2897,12 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getPurposeOfEvent().size(); i++) {
composeCodeableConcept(t, "AuditEvent", "purposeOfEvent", element.getPurposeOfEvent().get(i), i);
}
+ for (int i = 0; i < element.getBasedOn().size(); i++) {
+ composeReference(t, "AuditEvent", "basedOn", element.getBasedOn().get(i), i);
+ }
+ if (element.hasEncounter()) {
+ composeReference(t, "AuditEvent", "encounter", element.getEncounter(), -1);
+ }
for (int i = 0; i < element.getAgent().size(); i++) {
composeAuditEventAgentComponent(t, "AuditEvent", "agent", element.getAgent().get(i), i);
}
@@ -3924,6 +3980,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasDocumentationElement()) {
composeMarkdown(t, "CapabilityStatement2RestComponent", "documentation", element.getDocumentationElement(), -1);
}
+ for (int i = 0; i < element.getFeature().size(); i++) {
+ composeCapabilityStatement2RestFeatureComponent(t, "CapabilityStatement2RestComponent", "feature", element.getFeature().get(i), i);
+ }
for (int i = 0; i < element.getResource().size(); i++) {
composeCapabilityStatement2RestResourceComponent(t, "CapabilityStatement2RestComponent", "resource", element.getResource().get(i), i);
}
@@ -3941,6 +4000,24 @@ public class RdfParser extends RdfParserBase {
}
}
+ protected void composeCapabilityStatement2RestFeatureComponent(Complex parent, String parentType, String name, CapabilityStatement2.CapabilityStatement2RestFeatureComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "feature", name, element, index);
+ if (element.hasCodeElement()) {
+ composeEnum(t, "CapabilityStatement2RestFeatureComponent", "code", element.getCodeElement(), -1);
+ }
+ if (element.hasValueElement()) {
+ composeEnum(t, "CapabilityStatement2RestFeatureComponent", "value", element.getValueElement(), -1);
+ }
+ }
+
protected void composeCapabilityStatement2RestResourceComponent(Complex parent, String parentType, String name, CapabilityStatement2.CapabilityStatement2RestResourceComponent element, int index) {
if (element == null)
return;
@@ -3963,6 +4040,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasDocumentationElement()) {
composeMarkdown(t, "CapabilityStatement2RestResourceComponent", "documentation", element.getDocumentationElement(), -1);
}
+ for (int i = 0; i < element.getFeature().size(); i++) {
+ composeCapabilityStatement2RestFeatureComponent(t, "CapabilityStatement2RestResourceComponent", "feature", element.getFeature().get(i), i);
+ }
for (int i = 0; i < element.getInteraction().size(); i++) {
composeCapabilityStatement2ResourceInteractionComponent(t, "CapabilityStatement2RestResourceComponent", "interaction", element.getInteraction().get(i), i);
}
@@ -3990,6 +4070,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasDocumentationElement()) {
composeMarkdown(t, "ResourceInteractionComponent", "documentation", element.getDocumentationElement(), -1);
}
+ for (int i = 0; i < element.getFeature().size(); i++) {
+ composeCapabilityStatement2RestFeatureComponent(t, "ResourceInteractionComponent", "feature", element.getFeature().get(i), i);
+ }
}
protected void composeCapabilityStatement2RestResourceSearchParamComponent(Complex parent, String parentType, String name, CapabilityStatement2.CapabilityStatement2RestResourceSearchParamComponent element, int index) {
@@ -4014,6 +4097,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasDocumentationElement()) {
composeMarkdown(t, "CapabilityStatement2RestResourceSearchParamComponent", "documentation", element.getDocumentationElement(), -1);
}
+ for (int i = 0; i < element.getFeature().size(); i++) {
+ composeCapabilityStatement2RestFeatureComponent(t, "CapabilityStatement2RestResourceSearchParamComponent", "feature", element.getFeature().get(i), i);
+ }
}
protected void composeCapabilityStatement2RestResourceOperationComponent(Complex parent, String parentType, String name, CapabilityStatement2.CapabilityStatement2RestResourceOperationComponent element, int index) {
@@ -4035,6 +4121,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasDocumentationElement()) {
composeMarkdown(t, "CapabilityStatement2RestResourceOperationComponent", "documentation", element.getDocumentationElement(), -1);
}
+ for (int i = 0; i < element.getFeature().size(); i++) {
+ composeCapabilityStatement2RestFeatureComponent(t, "CapabilityStatement2RestResourceOperationComponent", "feature", element.getFeature().get(i), i);
+ }
}
protected void composeCapabilityStatement2SystemInteractionComponent(Complex parent, String parentType, String name, CapabilityStatement2.SystemInteractionComponent element, int index) {
@@ -4053,6 +4142,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasDocumentationElement()) {
composeMarkdown(t, "SystemInteractionComponent", "documentation", element.getDocumentationElement(), -1);
}
+ for (int i = 0; i < element.getFeature().size(); i++) {
+ composeCapabilityStatement2RestFeatureComponent(t, "SystemInteractionComponent", "feature", element.getFeature().get(i), i);
+ }
}
protected void composeCarePlan(Complex parent, String parentType, String name, CarePlan element, int index) {
@@ -4146,21 +4238,21 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeBackboneElement(t, "activity", name, element, index);
- for (int i = 0; i < element.getOutcome().size(); i++) {
- composeCodeableReference(t, "CarePlanActivityComponent", "outcome", element.getOutcome().get(i), i);
+ for (int i = 0; i < element.getPerformedActivity().size(); i++) {
+ composeCodeableReference(t, "CarePlanActivityComponent", "performedActivity", element.getPerformedActivity().get(i), i);
}
for (int i = 0; i < element.getProgress().size(); i++) {
composeAnnotation(t, "CarePlanActivityComponent", "progress", element.getProgress().get(i), i);
}
- if (element.hasReference()) {
- composeReference(t, "CarePlanActivityComponent", "reference", element.getReference(), -1);
+ if (element.hasPlannedActivityReference()) {
+ composeReference(t, "CarePlanActivityComponent", "plannedActivityReference", element.getPlannedActivityReference(), -1);
}
- if (element.hasDetail()) {
- composeCarePlanActivityDetailComponent(t, "CarePlanActivityComponent", "detail", element.getDetail(), -1);
+ if (element.hasPlannedActivityDetail()) {
+ composeCarePlanActivityPlannedActivityDetailComponent(t, "CarePlanActivityComponent", "plannedActivityDetail", element.getPlannedActivityDetail(), -1);
}
}
- protected void composeCarePlanActivityDetailComponent(Complex parent, String parentType, String name, CarePlan.CarePlanActivityDetailComponent element, int index) {
+ protected void composeCarePlanActivityPlannedActivityDetailComponent(Complex parent, String parentType, String name, CarePlan.CarePlanActivityPlannedActivityDetailComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -4169,57 +4261,57 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "detail", name, element, index);
+ composeBackboneElement(t, "plannedActivityDetail", name, element, index);
if (element.hasKindElement()) {
- composeEnum(t, "CarePlanActivityDetailComponent", "kind", element.getKindElement(), -1);
+ composeEnum(t, "CarePlanActivityPlannedActivityDetailComponent", "kind", element.getKindElement(), -1);
}
for (int i = 0; i < element.getInstantiatesCanonical().size(); i++) {
- composeCanonical(t, "CarePlanActivityDetailComponent", "instantiatesCanonical", element.getInstantiatesCanonical().get(i), i);
+ composeCanonical(t, "CarePlanActivityPlannedActivityDetailComponent", "instantiatesCanonical", element.getInstantiatesCanonical().get(i), i);
}
for (int i = 0; i < element.getInstantiatesUri().size(); i++) {
- composeUri(t, "CarePlanActivityDetailComponent", "instantiatesUri", element.getInstantiatesUri().get(i), i);
+ composeUri(t, "CarePlanActivityPlannedActivityDetailComponent", "instantiatesUri", element.getInstantiatesUri().get(i), i);
}
if (element.hasCode()) {
- composeCodeableConcept(t, "CarePlanActivityDetailComponent", "code", element.getCode(), -1);
+ composeCodeableConcept(t, "CarePlanActivityPlannedActivityDetailComponent", "code", element.getCode(), -1);
}
for (int i = 0; i < element.getReason().size(); i++) {
- composeCodeableReference(t, "CarePlanActivityDetailComponent", "reason", element.getReason().get(i), i);
+ composeCodeableReference(t, "CarePlanActivityPlannedActivityDetailComponent", "reason", element.getReason().get(i), i);
}
for (int i = 0; i < element.getGoal().size(); i++) {
- composeReference(t, "CarePlanActivityDetailComponent", "goal", element.getGoal().get(i), i);
+ composeReference(t, "CarePlanActivityPlannedActivityDetailComponent", "goal", element.getGoal().get(i), i);
}
if (element.hasStatusElement()) {
- composeEnum(t, "CarePlanActivityDetailComponent", "status", element.getStatusElement(), -1);
+ composeEnum(t, "CarePlanActivityPlannedActivityDetailComponent", "status", element.getStatusElement(), -1);
}
if (element.hasStatusReason()) {
- composeCodeableConcept(t, "CarePlanActivityDetailComponent", "statusReason", element.getStatusReason(), -1);
+ composeCodeableConcept(t, "CarePlanActivityPlannedActivityDetailComponent", "statusReason", element.getStatusReason(), -1);
}
if (element.hasDoNotPerformElement()) {
- composeBoolean(t, "CarePlanActivityDetailComponent", "doNotPerform", element.getDoNotPerformElement(), -1);
+ composeBoolean(t, "CarePlanActivityPlannedActivityDetailComponent", "doNotPerform", element.getDoNotPerformElement(), -1);
}
if (element.hasScheduled()) {
- composeType(t, "CarePlanActivityDetailComponent", "scheduled", element.getScheduled(), -1);
+ composeType(t, "CarePlanActivityPlannedActivityDetailComponent", "scheduled", element.getScheduled(), -1);
}
if (element.hasLocation()) {
- composeCodeableReference(t, "CarePlanActivityDetailComponent", "location", element.getLocation(), -1);
+ composeCodeableReference(t, "CarePlanActivityPlannedActivityDetailComponent", "location", element.getLocation(), -1);
}
if (element.hasReported()) {
- composeType(t, "CarePlanActivityDetailComponent", "reported", element.getReported(), -1);
+ composeType(t, "CarePlanActivityPlannedActivityDetailComponent", "reported", element.getReported(), -1);
}
for (int i = 0; i < element.getPerformer().size(); i++) {
- composeReference(t, "CarePlanActivityDetailComponent", "performer", element.getPerformer().get(i), i);
+ composeReference(t, "CarePlanActivityPlannedActivityDetailComponent", "performer", element.getPerformer().get(i), i);
}
if (element.hasProduct()) {
- composeType(t, "CarePlanActivityDetailComponent", "product", element.getProduct(), -1);
+ composeType(t, "CarePlanActivityPlannedActivityDetailComponent", "product", element.getProduct(), -1);
}
if (element.hasDailyAmount()) {
- composeQuantity(t, "CarePlanActivityDetailComponent", "dailyAmount", element.getDailyAmount(), -1);
+ composeQuantity(t, "CarePlanActivityPlannedActivityDetailComponent", "dailyAmount", element.getDailyAmount(), -1);
}
if (element.hasQuantity()) {
- composeQuantity(t, "CarePlanActivityDetailComponent", "quantity", element.getQuantity(), -1);
+ composeQuantity(t, "CarePlanActivityPlannedActivityDetailComponent", "quantity", element.getQuantity(), -1);
}
if (element.hasDescriptionElement()) {
- composeString(t, "CarePlanActivityDetailComponent", "description", element.getDescriptionElement(), -1);
+ composeString(t, "CarePlanActivityPlannedActivityDetailComponent", "description", element.getDescriptionElement(), -1);
}
}
@@ -4635,84 +4727,93 @@ public class RdfParser extends RdfParserBase {
if (element.hasUrlElement()) {
composeUri(t, "Citation", "url", element.getUrlElement(), -1);
}
+ for (int i = 0; i < element.getIdentifier().size(); i++) {
+ composeIdentifier(t, "Citation", "identifier", element.getIdentifier().get(i), i);
+ }
+ if (element.hasVersionElement()) {
+ composeString(t, "Citation", "version", element.getVersionElement(), -1);
+ }
+ if (element.hasNameElement()) {
+ composeString(t, "Citation", "name", element.getNameElement(), -1);
+ }
+ if (element.hasTitleElement()) {
+ composeString(t, "Citation", "title", element.getTitleElement(), -1);
+ }
if (element.hasStatusElement()) {
composeEnum(t, "Citation", "status", element.getStatusElement(), -1);
}
+ if (element.hasExperimentalElement()) {
+ composeBoolean(t, "Citation", "experimental", element.getExperimentalElement(), -1);
+ }
+ if (element.hasDateElement()) {
+ composeDateTime(t, "Citation", "date", element.getDateElement(), -1);
+ }
+ if (element.hasPublisherElement()) {
+ composeString(t, "Citation", "publisher", element.getPublisherElement(), -1);
+ }
+ for (int i = 0; i < element.getContact().size(); i++) {
+ composeContactDetail(t, "Citation", "contact", element.getContact().get(i), i);
+ }
+ if (element.hasDescriptionElement()) {
+ composeMarkdown(t, "Citation", "description", element.getDescriptionElement(), -1);
+ }
for (int i = 0; i < element.getUseContext().size(); i++) {
composeUsageContext(t, "Citation", "useContext", element.getUseContext().get(i), i);
}
- for (int i = 0; i < element.getIdentifier().size(); i++) {
- composeIdentifier(t, "Citation", "identifier", element.getIdentifier().get(i), i);
+ for (int i = 0; i < element.getJurisdiction().size(); i++) {
+ composeCodeableConcept(t, "Citation", "jurisdiction", element.getJurisdiction().get(i), i);
}
- for (int i = 0; i < element.getRelatedIdentifier().size(); i++) {
- composeIdentifier(t, "Citation", "relatedIdentifier", element.getRelatedIdentifier().get(i), i);
+ if (element.hasPurposeElement()) {
+ composeMarkdown(t, "Citation", "purpose", element.getPurposeElement(), -1);
+ }
+ if (element.hasCopyrightElement()) {
+ composeMarkdown(t, "Citation", "copyright", element.getCopyrightElement(), -1);
+ }
+ if (element.hasApprovalDateElement()) {
+ composeDate(t, "Citation", "approvalDate", element.getApprovalDateElement(), -1);
+ }
+ if (element.hasLastReviewDateElement()) {
+ composeDate(t, "Citation", "lastReviewDate", element.getLastReviewDateElement(), -1);
+ }
+ if (element.hasEffectivePeriod()) {
+ composePeriod(t, "Citation", "effectivePeriod", element.getEffectivePeriod(), -1);
+ }
+ for (int i = 0; i < element.getAuthor().size(); i++) {
+ composeContactDetail(t, "Citation", "author", element.getAuthor().get(i), i);
+ }
+ for (int i = 0; i < element.getEditor().size(); i++) {
+ composeContactDetail(t, "Citation", "editor", element.getEditor().get(i), i);
+ }
+ for (int i = 0; i < element.getReviewer().size(); i++) {
+ composeContactDetail(t, "Citation", "reviewer", element.getReviewer().get(i), i);
+ }
+ for (int i = 0; i < element.getEndorser().size(); i++) {
+ composeContactDetail(t, "Citation", "endorser", element.getEndorser().get(i), i);
}
for (int i = 0; i < element.getSummary().size(); i++) {
- composeCitationSummaryComponent(t, "Citation", "summary", element.getSummary().get(i), i);
+ composeContactDetail(t, "Citation", "summary", element.getSummary().get(i), i);
}
- if (element.hasDateCitedElement()) {
- composeDateTime(t, "Citation", "dateCited", element.getDateCitedElement(), -1);
- }
- if (element.hasVariantCitation()) {
- composeCitationVariantCitationComponent(t, "Citation", "variantCitation", element.getVariantCitation(), -1);
- }
- if (element.hasPublishingModel()) {
- composeCodeableConcept(t, "Citation", "publishingModel", element.getPublishingModel(), -1);
- }
- if (element.hasJournal()) {
- composeCitationJournalComponent(t, "Citation", "journal", element.getJournal(), -1);
- }
- if (element.hasPublicationInfo()) {
- composeCitationPublicationInfoComponent(t, "Citation", "publicationInfo", element.getPublicationInfo(), -1);
- }
- if (element.hasArticleTitleElement()) {
- composeMarkdown(t, "Citation", "articleTitle", element.getArticleTitleElement(), -1);
- }
- for (int i = 0; i < element.getAlternativeTitle().size(); i++) {
- composeCitationAlternativeTitleComponent(t, "Citation", "alternativeTitle", element.getAlternativeTitle().get(i), i);
- }
- if (element.hasPagination()) {
- composeCitationPaginationComponent(t, "Citation", "pagination", element.getPagination(), -1);
- }
- for (int i = 0; i < element.getArticleUrl().size(); i++) {
- composeCitationArticleUrlComponent(t, "Citation", "articleUrl", element.getArticleUrl().get(i), i);
- }
- if (element.hasAbstractElement()) {
- composeMarkdown(t, "Citation", "abstract", element.getAbstractElement(), -1);
- }
- if (element.hasAbstractCopyrightElement()) {
- composeMarkdown(t, "Citation", "abstractCopyright", element.getAbstractCopyrightElement(), -1);
- }
- for (int i = 0; i < element.getAlternativeAbstract().size(); i++) {
- composeCitationAlternativeAbstractComponent(t, "Citation", "alternativeAbstract", element.getAlternativeAbstract().get(i), i);
- }
- if (element.hasContributorship()) {
- composeCitationContributorshipComponent(t, "Citation", "contributorship", element.getContributorship(), -1);
- }
- if (element.hasArticleLanguage()) {
- composeCodeableConcept(t, "Citation", "articleLanguage", element.getArticleLanguage(), -1);
- }
- for (int i = 0; i < element.getAlternativeForm().size(); i++) {
- composeCitationAlternativeFormComponent(t, "Citation", "alternativeForm", element.getAlternativeForm().get(i), i);
- }
- for (int i = 0; i < element.getClassifier().size(); i++) {
- composeCodeableConcept(t, "Citation", "classifier", element.getClassifier().get(i), i);
- }
- for (int i = 0; i < element.getKeywordList().size(); i++) {
- composeCitationKeywordListComponent(t, "Citation", "keywordList", element.getKeywordList().get(i), i);
- }
- for (int i = 0; i < element.getRelatedArtifact().size(); i++) {
- composeRelatedArtifact(t, "Citation", "relatedArtifact", element.getRelatedArtifact().get(i), i);
+ for (int i = 0; i < element.getClassification().size(); i++) {
+ composeCitationClassificationComponent(t, "Citation", "classification", element.getClassification().get(i), i);
}
for (int i = 0; i < element.getNote().size(); i++) {
composeAnnotation(t, "Citation", "note", element.getNote().get(i), i);
}
- if (element.hasMedlinePubMed()) {
- composeCitationMedlinePubMedComponent(t, "Citation", "medlinePubMed", element.getMedlinePubMed(), -1);
+ for (int i = 0; i < element.getCurrentState().size(); i++) {
+ composeCodeableConcept(t, "Citation", "currentState", element.getCurrentState().get(i), i);
+ }
+ for (int i = 0; i < element.getStatusDate().size(); i++) {
+ composeCitationStatusDateComponent(t, "Citation", "statusDate", element.getStatusDate().get(i), i);
+ }
+ for (int i = 0; i < element.getRelatesTo().size(); i++) {
+ composeCitationRelatesToComponent(t, "Citation", "relatesTo", element.getRelatesTo().get(i), i);
+ }
+ if (element.hasCitedArtifact()) {
+ composeCitationCitedArtifactComponent(t, "Citation", "citedArtifact", element.getCitedArtifact(), -1);
}
}
- protected void composeCitationSummaryComponent(Complex parent, String parentType, String name, Citation.CitationSummaryComponent element, int index) {
+ protected void composeCitationClassificationComponent(Complex parent, String parentType, String name, Citation.CitationClassificationComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -4721,37 +4822,133 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "summary", name, element, index);
- if (element.hasStyle()) {
- composeCodeableConcept(t, "CitationSummaryComponent", "style", element.getStyle(), -1);
- }
- if (element.hasTextElement()) {
- composeMarkdown(t, "CitationSummaryComponent", "text", element.getTextElement(), -1);
- }
- }
-
- protected void composeCitationVariantCitationComponent(Complex parent, String parentType, String name, Citation.CitationVariantCitationComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "variantCitation", name, element, index);
+ composeBackboneElement(t, "classification", name, element, index);
if (element.hasType()) {
- composeCodeableConcept(t, "CitationVariantCitationComponent", "type", element.getType(), -1);
+ composeCodeableConcept(t, "CitationClassificationComponent", "type", element.getType(), -1);
}
+ for (int i = 0; i < element.getClassifier().size(); i++) {
+ composeCodeableConcept(t, "CitationClassificationComponent", "classifier", element.getClassifier().get(i), i);
+ }
+ }
+
+ protected void composeCitationStatusDateComponent(Complex parent, String parentType, String name, Citation.CitationStatusDateComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "statusDate", name, element, index);
+ if (element.hasActivity()) {
+ composeCodeableConcept(t, "CitationStatusDateComponent", "activity", element.getActivity(), -1);
+ }
+ if (element.hasActualElement()) {
+ composeBoolean(t, "CitationStatusDateComponent", "actual", element.getActualElement(), -1);
+ }
+ if (element.hasPeriod()) {
+ composePeriod(t, "CitationStatusDateComponent", "period", element.getPeriod(), -1);
+ }
+ }
+
+ protected void composeCitationRelatesToComponent(Complex parent, String parentType, String name, Citation.CitationRelatesToComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "relatesTo", name, element, index);
+ if (element.hasRelationshipType()) {
+ composeCodeableConcept(t, "CitationRelatesToComponent", "relationshipType", element.getRelationshipType(), -1);
+ }
+ for (int i = 0; i < element.getTargetClassifier().size(); i++) {
+ composeCodeableConcept(t, "CitationRelatesToComponent", "targetClassifier", element.getTargetClassifier().get(i), i);
+ }
+ if (element.hasTarget()) {
+ composeType(t, "CitationRelatesToComponent", "target", element.getTarget(), -1);
+ }
+ }
+
+ protected void composeCitationCitedArtifactComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "citedArtifact", name, element, index);
+ for (int i = 0; i < element.getIdentifier().size(); i++) {
+ composeIdentifier(t, "CitationCitedArtifactComponent", "identifier", element.getIdentifier().get(i), i);
+ }
+ for (int i = 0; i < element.getRelatedIdentifier().size(); i++) {
+ composeIdentifier(t, "CitationCitedArtifactComponent", "relatedIdentifier", element.getRelatedIdentifier().get(i), i);
+ }
+ if (element.hasDateAccessedElement()) {
+ composeDateTime(t, "CitationCitedArtifactComponent", "dateAccessed", element.getDateAccessedElement(), -1);
+ }
+ if (element.hasVersion()) {
+ composeCitationCitedArtifactVersionComponent(t, "CitationCitedArtifactComponent", "version", element.getVersion(), -1);
+ }
+ for (int i = 0; i < element.getCurrentState().size(); i++) {
+ composeCodeableConcept(t, "CitationCitedArtifactComponent", "currentState", element.getCurrentState().get(i), i);
+ }
+ for (int i = 0; i < element.getStatusDate().size(); i++) {
+ composeCitationCitedArtifactStatusDateComponent(t, "CitationCitedArtifactComponent", "statusDate", element.getStatusDate().get(i), i);
+ }
+ for (int i = 0; i < element.getTitle().size(); i++) {
+ composeCitationCitedArtifactTitleComponent(t, "CitationCitedArtifactComponent", "title", element.getTitle().get(i), i);
+ }
+ for (int i = 0; i < element.getAbstract().size(); i++) {
+ composeCitationCitedArtifactAbstractComponent(t, "CitationCitedArtifactComponent", "abstract", element.getAbstract().get(i), i);
+ }
+ if (element.hasPart()) {
+ composeCitationCitedArtifactPartComponent(t, "CitationCitedArtifactComponent", "part", element.getPart(), -1);
+ }
+ for (int i = 0; i < element.getRelatesTo().size(); i++) {
+ composeCitationCitedArtifactRelatesToComponent(t, "CitationCitedArtifactComponent", "relatesTo", element.getRelatesTo().get(i), i);
+ }
+ for (int i = 0; i < element.getPublicationForm().size(); i++) {
+ composeCitationCitedArtifactPublicationFormComponent(t, "CitationCitedArtifactComponent", "publicationForm", element.getPublicationForm().get(i), i);
+ }
+ for (int i = 0; i < element.getWebLocation().size(); i++) {
+ composeCitationCitedArtifactWebLocationComponent(t, "CitationCitedArtifactComponent", "webLocation", element.getWebLocation().get(i), i);
+ }
+ for (int i = 0; i < element.getClassification().size(); i++) {
+ composeCitationCitedArtifactClassificationComponent(t, "CitationCitedArtifactComponent", "classification", element.getClassification().get(i), i);
+ }
+ if (element.hasContributorship()) {
+ composeCitationCitedArtifactContributorshipComponent(t, "CitationCitedArtifactComponent", "contributorship", element.getContributorship(), -1);
+ }
+ for (int i = 0; i < element.getNote().size(); i++) {
+ composeAnnotation(t, "CitationCitedArtifactComponent", "note", element.getNote().get(i), i);
+ }
+ }
+
+ protected void composeCitationCitedArtifactVersionComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactVersionComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "version", name, element, index);
if (element.hasValueElement()) {
- composeString(t, "CitationVariantCitationComponent", "value", element.getValueElement(), -1);
+ composeString(t, "CitationCitedArtifactVersionComponent", "value", element.getValueElement(), -1);
}
if (element.hasBaseCitation()) {
- composeReference(t, "CitationVariantCitationComponent", "baseCitation", element.getBaseCitation(), -1);
+ composeReference(t, "CitationCitedArtifactVersionComponent", "baseCitation", element.getBaseCitation(), -1);
}
}
- protected void composeCitationJournalComponent(Complex parent, String parentType, String name, Citation.CitationJournalComponent element, int index) {
+ protected void composeCitationCitedArtifactStatusDateComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactStatusDateComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -4760,22 +4957,19 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "journal", name, element, index);
- for (int i = 0; i < element.getIdentifier().size(); i++) {
- composeIdentifier(t, "CitationJournalComponent", "identifier", element.getIdentifier().get(i), i);
+ composeBackboneElement(t, "statusDate", name, element, index);
+ if (element.hasActivity()) {
+ composeCodeableConcept(t, "CitationCitedArtifactStatusDateComponent", "activity", element.getActivity(), -1);
}
- if (element.hasCountryElement()) {
- composeString(t, "CitationJournalComponent", "country", element.getCountryElement(), -1);
+ if (element.hasActualElement()) {
+ composeBoolean(t, "CitationCitedArtifactStatusDateComponent", "actual", element.getActualElement(), -1);
}
- if (element.hasJournalIssue()) {
- composeCitationJournalJournalIssueComponent(t, "CitationJournalComponent", "journalIssue", element.getJournalIssue(), -1);
- }
- if (element.hasTitleElement()) {
- composeString(t, "CitationJournalComponent", "title", element.getTitleElement(), -1);
+ if (element.hasPeriod()) {
+ composePeriod(t, "CitationCitedArtifactStatusDateComponent", "period", element.getPeriod(), -1);
}
}
- protected void composeCitationJournalJournalIssueComponent(Complex parent, String parentType, String name, Citation.CitationJournalJournalIssueComponent element, int index) {
+ protected void composeCitationCitedArtifactTitleComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactTitleComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -4784,52 +4978,19 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "journalIssue", name, element, index);
- if (element.hasCitedMedium()) {
- composeCodeableConcept(t, "CitationJournalJournalIssueComponent", "citedMedium", element.getCitedMedium(), -1);
+ composeBackboneElement(t, "title", name, element, index);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "CitationCitedArtifactTitleComponent", "type", element.getType(), -1);
}
- if (element.hasVolumeElement()) {
- composeString(t, "CitationJournalJournalIssueComponent", "volume", element.getVolumeElement(), -1);
- }
- if (element.hasIssueElement()) {
- composeString(t, "CitationJournalJournalIssueComponent", "issue", element.getIssueElement(), -1);
- }
- if (element.hasPublicationDate()) {
- composeCitationJournalJournalIssuePublicationDateComponent(t, "CitationJournalJournalIssueComponent", "publicationDate", element.getPublicationDate(), -1);
- }
- }
-
- protected void composeCitationJournalJournalIssuePublicationDateComponent(Complex parent, String parentType, String name, Citation.CitationJournalJournalIssuePublicationDateComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "publicationDate", name, element, index);
- if (element.hasDateElement()) {
- composeDate(t, "CitationJournalJournalIssuePublicationDateComponent", "date", element.getDateElement(), -1);
- }
- if (element.hasYearElement()) {
- composeString(t, "CitationJournalJournalIssuePublicationDateComponent", "year", element.getYearElement(), -1);
- }
- if (element.hasMonthElement()) {
- composeString(t, "CitationJournalJournalIssuePublicationDateComponent", "month", element.getMonthElement(), -1);
- }
- if (element.hasDayElement()) {
- composeString(t, "CitationJournalJournalIssuePublicationDateComponent", "day", element.getDayElement(), -1);
- }
- if (element.hasSeasonElement()) {
- composeString(t, "CitationJournalJournalIssuePublicationDateComponent", "season", element.getSeasonElement(), -1);
+ if (element.hasLanguage()) {
+ composeCodeableConcept(t, "CitationCitedArtifactTitleComponent", "language", element.getLanguage(), -1);
}
if (element.hasTextElement()) {
- composeString(t, "CitationJournalJournalIssuePublicationDateComponent", "text", element.getTextElement(), -1);
+ composeMarkdown(t, "CitationCitedArtifactTitleComponent", "text", element.getTextElement(), -1);
}
}
- protected void composeCitationPublicationInfoComponent(Complex parent, String parentType, String name, Citation.CitationPublicationInfoComponent element, int index) {
+ protected void composeCitationCitedArtifactAbstractComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactAbstractComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -4838,22 +4999,109 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "publicationInfo", name, element, index);
- if (element.hasPublishedIn()) {
- composeCitationPublicationInfoPublishedInComponent(t, "CitationPublicationInfoComponent", "publishedIn", element.getPublishedIn(), -1);
+ composeBackboneElement(t, "abstract", name, element, index);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "CitationCitedArtifactAbstractComponent", "type", element.getType(), -1);
}
- if (element.hasEntryDateElement()) {
- composeDateTime(t, "CitationPublicationInfoComponent", "entryDate", element.getEntryDateElement(), -1);
+ if (element.hasLanguage()) {
+ composeCodeableConcept(t, "CitationCitedArtifactAbstractComponent", "language", element.getLanguage(), -1);
}
- if (element.hasRevisionDateElement()) {
- composeDateTime(t, "CitationPublicationInfoComponent", "revisionDate", element.getRevisionDateElement(), -1);
+ if (element.hasTextElement()) {
+ composeMarkdown(t, "CitationCitedArtifactAbstractComponent", "text", element.getTextElement(), -1);
}
- if (element.hasPageCountElement()) {
- composeString(t, "CitationPublicationInfoComponent", "pageCount", element.getPageCountElement(), -1);
+ if (element.hasCopyrightElement()) {
+ composeMarkdown(t, "CitationCitedArtifactAbstractComponent", "copyright", element.getCopyrightElement(), -1);
}
}
- protected void composeCitationPublicationInfoPublishedInComponent(Complex parent, String parentType, String name, Citation.CitationPublicationInfoPublishedInComponent element, int index) {
+ protected void composeCitationCitedArtifactPartComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactPartComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "part", name, element, index);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "CitationCitedArtifactPartComponent", "type", element.getType(), -1);
+ }
+ if (element.hasValueElement()) {
+ composeString(t, "CitationCitedArtifactPartComponent", "value", element.getValueElement(), -1);
+ }
+ if (element.hasBaseCitation()) {
+ composeReference(t, "CitationCitedArtifactPartComponent", "baseCitation", element.getBaseCitation(), -1);
+ }
+ }
+
+ protected void composeCitationCitedArtifactRelatesToComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactRelatesToComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "relatesTo", name, element, index);
+ if (element.hasRelationshipType()) {
+ composeCodeableConcept(t, "CitationCitedArtifactRelatesToComponent", "relationshipType", element.getRelationshipType(), -1);
+ }
+ for (int i = 0; i < element.getTargetClassifier().size(); i++) {
+ composeCodeableConcept(t, "CitationCitedArtifactRelatesToComponent", "targetClassifier", element.getTargetClassifier().get(i), i);
+ }
+ if (element.hasTarget()) {
+ composeType(t, "CitationCitedArtifactRelatesToComponent", "target", element.getTarget(), -1);
+ }
+ }
+
+ protected void composeCitationCitedArtifactPublicationFormComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactPublicationFormComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "publicationForm", name, element, index);
+ if (element.hasPublishedIn()) {
+ composeCitationCitedArtifactPublicationFormPublishedInComponent(t, "CitationCitedArtifactPublicationFormComponent", "publishedIn", element.getPublishedIn(), -1);
+ }
+ if (element.hasPeriodicRelease()) {
+ composeCitationCitedArtifactPublicationFormPeriodicReleaseComponent(t, "CitationCitedArtifactPublicationFormComponent", "periodicRelease", element.getPeriodicRelease(), -1);
+ }
+ if (element.hasArticleDateElement()) {
+ composeDateTime(t, "CitationCitedArtifactPublicationFormComponent", "articleDate", element.getArticleDateElement(), -1);
+ }
+ if (element.hasLastRevisionDateElement()) {
+ composeDateTime(t, "CitationCitedArtifactPublicationFormComponent", "lastRevisionDate", element.getLastRevisionDateElement(), -1);
+ }
+ for (int i = 0; i < element.getLanguage().size(); i++) {
+ composeCodeableConcept(t, "CitationCitedArtifactPublicationFormComponent", "language", element.getLanguage().get(i), i);
+ }
+ if (element.hasAccessionNumberElement()) {
+ composeString(t, "CitationCitedArtifactPublicationFormComponent", "accessionNumber", element.getAccessionNumberElement(), -1);
+ }
+ if (element.hasPageStringElement()) {
+ composeString(t, "CitationCitedArtifactPublicationFormComponent", "pageString", element.getPageStringElement(), -1);
+ }
+ if (element.hasFirstPageElement()) {
+ composeString(t, "CitationCitedArtifactPublicationFormComponent", "firstPage", element.getFirstPageElement(), -1);
+ }
+ if (element.hasLastPageElement()) {
+ composeString(t, "CitationCitedArtifactPublicationFormComponent", "lastPage", element.getLastPageElement(), -1);
+ }
+ if (element.hasPageCountElement()) {
+ composeString(t, "CitationCitedArtifactPublicationFormComponent", "pageCount", element.getPageCountElement(), -1);
+ }
+ if (element.hasCopyrightElement()) {
+ composeMarkdown(t, "CitationCitedArtifactPublicationFormComponent", "copyright", element.getCopyrightElement(), -1);
+ }
+ }
+
+ protected void composeCitationCitedArtifactPublicationFormPublishedInComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactPublicationFormPublishedInComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -4864,47 +5112,23 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "publishedIn", name, element, index);
if (element.hasType()) {
- composeCodeableConcept(t, "CitationPublicationInfoPublishedInComponent", "type", element.getType(), -1);
+ composeCodeableConcept(t, "CitationCitedArtifactPublicationFormPublishedInComponent", "type", element.getType(), -1);
}
for (int i = 0; i < element.getIdentifier().size(); i++) {
- composeIdentifier(t, "CitationPublicationInfoPublishedInComponent", "identifier", element.getIdentifier().get(i), i);
- }
- if (element.hasNameElement()) {
- composeString(t, "CitationPublicationInfoPublishedInComponent", "name", element.getNameElement(), -1);
- }
- if (element.hasPublisher()) {
- composeReference(t, "CitationPublicationInfoPublishedInComponent", "publisher", element.getPublisher(), -1);
- }
- if (element.hasPublisherLocationElement()) {
- composeString(t, "CitationPublicationInfoPublishedInComponent", "publisherLocation", element.getPublisherLocationElement(), -1);
- }
- if (element.hasStartDateElement()) {
- composeDate(t, "CitationPublicationInfoPublishedInComponent", "startDate", element.getStartDateElement(), -1);
- }
- }
-
- protected void composeCitationAlternativeTitleComponent(Complex parent, String parentType, String name, Citation.CitationAlternativeTitleComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "alternativeTitle", name, element, index);
- if (element.hasType()) {
- composeCodeableConcept(t, "CitationAlternativeTitleComponent", "type", element.getType(), -1);
- }
- if (element.hasLanguage()) {
- composeCodeableConcept(t, "CitationAlternativeTitleComponent", "language", element.getLanguage(), -1);
+ composeIdentifier(t, "CitationCitedArtifactPublicationFormPublishedInComponent", "identifier", element.getIdentifier().get(i), i);
}
if (element.hasTitleElement()) {
- composeMarkdown(t, "CitationAlternativeTitleComponent", "title", element.getTitleElement(), -1);
+ composeString(t, "CitationCitedArtifactPublicationFormPublishedInComponent", "title", element.getTitleElement(), -1);
+ }
+ if (element.hasPublisher()) {
+ composeReference(t, "CitationCitedArtifactPublicationFormPublishedInComponent", "publisher", element.getPublisher(), -1);
+ }
+ if (element.hasPublisherLocationElement()) {
+ composeString(t, "CitationCitedArtifactPublicationFormPublishedInComponent", "publisherLocation", element.getPublisherLocationElement(), -1);
}
}
- protected void composeCitationPaginationComponent(Complex parent, String parentType, String name, Citation.CitationPaginationComponent element, int index) {
+ protected void composeCitationCitedArtifactPublicationFormPeriodicReleaseComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactPublicationFormPeriodicReleaseComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -4913,19 +5137,22 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "pagination", name, element, index);
- if (element.hasPageStringElement()) {
- composeString(t, "CitationPaginationComponent", "pageString", element.getPageStringElement(), -1);
+ composeBackboneElement(t, "periodicRelease", name, element, index);
+ if (element.hasCitedMedium()) {
+ composeCodeableConcept(t, "CitationCitedArtifactPublicationFormPeriodicReleaseComponent", "citedMedium", element.getCitedMedium(), -1);
}
- if (element.hasFirstPageElement()) {
- composeString(t, "CitationPaginationComponent", "firstPage", element.getFirstPageElement(), -1);
+ if (element.hasVolumeElement()) {
+ composeString(t, "CitationCitedArtifactPublicationFormPeriodicReleaseComponent", "volume", element.getVolumeElement(), -1);
}
- if (element.hasLastPageElement()) {
- composeString(t, "CitationPaginationComponent", "lastPage", element.getLastPageElement(), -1);
+ if (element.hasIssueElement()) {
+ composeString(t, "CitationCitedArtifactPublicationFormPeriodicReleaseComponent", "issue", element.getIssueElement(), -1);
+ }
+ if (element.hasDateOfPublication()) {
+ composeCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent(t, "CitationCitedArtifactPublicationFormPeriodicReleaseComponent", "dateOfPublication", element.getDateOfPublication(), -1);
}
}
- protected void composeCitationArticleUrlComponent(Complex parent, String parentType, String name, Citation.CitationArticleUrlComponent element, int index) {
+ protected void composeCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -4934,16 +5161,46 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "articleUrl", name, element, index);
+ composeBackboneElement(t, "dateOfPublication", name, element, index);
+ if (element.hasDateElement()) {
+ composeDate(t, "CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent", "date", element.getDateElement(), -1);
+ }
+ if (element.hasYearElement()) {
+ composeString(t, "CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent", "year", element.getYearElement(), -1);
+ }
+ if (element.hasMonthElement()) {
+ composeString(t, "CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent", "month", element.getMonthElement(), -1);
+ }
+ if (element.hasDayElement()) {
+ composeString(t, "CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent", "day", element.getDayElement(), -1);
+ }
+ if (element.hasSeasonElement()) {
+ composeString(t, "CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent", "season", element.getSeasonElement(), -1);
+ }
+ if (element.hasTextElement()) {
+ composeString(t, "CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent", "text", element.getTextElement(), -1);
+ }
+ }
+
+ protected void composeCitationCitedArtifactWebLocationComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactWebLocationComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "webLocation", name, element, index);
if (element.hasType()) {
- composeCodeableConcept(t, "CitationArticleUrlComponent", "type", element.getType(), -1);
+ composeCodeableConcept(t, "CitationCitedArtifactWebLocationComponent", "type", element.getType(), -1);
}
if (element.hasUrlElement()) {
- composeUri(t, "CitationArticleUrlComponent", "url", element.getUrlElement(), -1);
+ composeUri(t, "CitationCitedArtifactWebLocationComponent", "url", element.getUrlElement(), -1);
}
}
- protected void composeCitationAlternativeAbstractComponent(Complex parent, String parentType, String name, Citation.CitationAlternativeAbstractComponent element, int index) {
+ protected void composeCitationCitedArtifactClassificationComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactClassificationComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -4952,22 +5209,46 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "alternativeAbstract", name, element, index);
+ composeBackboneElement(t, "classification", name, element, index);
if (element.hasType()) {
- composeCodeableConcept(t, "CitationAlternativeAbstractComponent", "type", element.getType(), -1);
+ composeCodeableConcept(t, "CitationCitedArtifactClassificationComponent", "type", element.getType(), -1);
}
- if (element.hasLanguage()) {
- composeCodeableConcept(t, "CitationAlternativeAbstractComponent", "language", element.getLanguage(), -1);
+ for (int i = 0; i < element.getClassifier().size(); i++) {
+ composeCodeableConcept(t, "CitationCitedArtifactClassificationComponent", "classifier", element.getClassifier().get(i), i);
}
- if (element.hasAbstractElement()) {
- composeMarkdown(t, "CitationAlternativeAbstractComponent", "abstract", element.getAbstractElement(), -1);
- }
- if (element.hasAbstractCopyrightElement()) {
- composeMarkdown(t, "CitationAlternativeAbstractComponent", "abstractCopyright", element.getAbstractCopyrightElement(), -1);
+ if (element.hasWhoClassified()) {
+ composeCitationCitedArtifactClassificationWhoClassifiedComponent(t, "CitationCitedArtifactClassificationComponent", "whoClassified", element.getWhoClassified(), -1);
}
}
- protected void composeCitationContributorshipComponent(Complex parent, String parentType, String name, Citation.CitationContributorshipComponent element, int index) {
+ protected void composeCitationCitedArtifactClassificationWhoClassifiedComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactClassificationWhoClassifiedComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "whoClassified", name, element, index);
+ if (element.hasPerson()) {
+ composeReference(t, "CitationCitedArtifactClassificationWhoClassifiedComponent", "person", element.getPerson(), -1);
+ }
+ if (element.hasOrganization()) {
+ composeReference(t, "CitationCitedArtifactClassificationWhoClassifiedComponent", "organization", element.getOrganization(), -1);
+ }
+ if (element.hasPublisher()) {
+ composeReference(t, "CitationCitedArtifactClassificationWhoClassifiedComponent", "publisher", element.getPublisher(), -1);
+ }
+ if (element.hasClassifierCopyrightElement()) {
+ composeString(t, "CitationCitedArtifactClassificationWhoClassifiedComponent", "classifierCopyright", element.getClassifierCopyrightElement(), -1);
+ }
+ if (element.hasFreeToShareElement()) {
+ composeBoolean(t, "CitationCitedArtifactClassificationWhoClassifiedComponent", "freeToShare", element.getFreeToShareElement(), -1);
+ }
+ }
+
+ protected void composeCitationCitedArtifactContributorshipComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactContributorshipComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -4978,17 +5259,17 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "contributorship", name, element, index);
if (element.hasCompleteElement()) {
- composeBoolean(t, "CitationContributorshipComponent", "complete", element.getCompleteElement(), -1);
+ composeBoolean(t, "CitationCitedArtifactContributorshipComponent", "complete", element.getCompleteElement(), -1);
}
for (int i = 0; i < element.getEntry().size(); i++) {
- composeCitationContributorshipEntryComponent(t, "CitationContributorshipComponent", "entry", element.getEntry().get(i), i);
+ composeCitationCitedArtifactContributorshipEntryComponent(t, "CitationCitedArtifactContributorshipComponent", "entry", element.getEntry().get(i), i);
}
for (int i = 0; i < element.getSummary().size(); i++) {
- composeCitationContributorshipSummaryComponent(t, "CitationContributorshipComponent", "summary", element.getSummary().get(i), i);
+ composeCitationCitedArtifactContributorshipSummaryComponent(t, "CitationCitedArtifactContributorshipComponent", "summary", element.getSummary().get(i), i);
}
}
- protected void composeCitationContributorshipEntryComponent(Complex parent, String parentType, String name, Citation.CitationContributorshipEntryComponent element, int index) {
+ protected void composeCitationCitedArtifactContributorshipEntryComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactContributorshipEntryComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -4999,41 +5280,44 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "entry", name, element, index);
if (element.hasName()) {
- composeHumanName(t, "CitationContributorshipEntryComponent", "name", element.getName(), -1);
+ composeHumanName(t, "CitationCitedArtifactContributorshipEntryComponent", "name", element.getName(), -1);
}
if (element.hasInitialsElement()) {
- composeString(t, "CitationContributorshipEntryComponent", "initials", element.getInitialsElement(), -1);
+ composeString(t, "CitationCitedArtifactContributorshipEntryComponent", "initials", element.getInitialsElement(), -1);
}
if (element.hasCollectiveNameElement()) {
- composeString(t, "CitationContributorshipEntryComponent", "collectiveName", element.getCollectiveNameElement(), -1);
+ composeString(t, "CitationCitedArtifactContributorshipEntryComponent", "collectiveName", element.getCollectiveNameElement(), -1);
}
for (int i = 0; i < element.getIdentifier().size(); i++) {
- composeIdentifier(t, "CitationContributorshipEntryComponent", "identifier", element.getIdentifier().get(i), i);
+ composeIdentifier(t, "CitationCitedArtifactContributorshipEntryComponent", "identifier", element.getIdentifier().get(i), i);
}
for (int i = 0; i < element.getAffiliationInfo().size(); i++) {
- composeCitationContributorshipEntryAffiliationInfoComponent(t, "CitationContributorshipEntryComponent", "affiliationInfo", element.getAffiliationInfo().get(i), i);
+ composeCitationCitedArtifactContributorshipEntryAffiliationInfoComponent(t, "CitationCitedArtifactContributorshipEntryComponent", "affiliationInfo", element.getAffiliationInfo().get(i), i);
}
for (int i = 0; i < element.getAddress().size(); i++) {
- composeAddress(t, "CitationContributorshipEntryComponent", "address", element.getAddress().get(i), i);
+ composeAddress(t, "CitationCitedArtifactContributorshipEntryComponent", "address", element.getAddress().get(i), i);
}
for (int i = 0; i < element.getTelecom().size(); i++) {
- composeContactPoint(t, "CitationContributorshipEntryComponent", "telecom", element.getTelecom().get(i), i);
+ composeContactPoint(t, "CitationCitedArtifactContributorshipEntryComponent", "telecom", element.getTelecom().get(i), i);
}
- for (int i = 0; i < element.getContribution().size(); i++) {
- composeCodeableConcept(t, "CitationContributorshipEntryComponent", "contribution", element.getContribution().get(i), i);
+ for (int i = 0; i < element.getContributionType().size(); i++) {
+ composeCodeableConcept(t, "CitationCitedArtifactContributorshipEntryComponent", "contributionType", element.getContributionType().get(i), i);
}
- if (element.hasNotAnAuthorElement()) {
- composeBoolean(t, "CitationContributorshipEntryComponent", "notAnAuthor", element.getNotAnAuthorElement(), -1);
+ if (element.hasRole()) {
+ composeCodeableConcept(t, "CitationCitedArtifactContributorshipEntryComponent", "role", element.getRole(), -1);
}
- if (element.hasCorrespondingAuthorElement()) {
- composeBoolean(t, "CitationContributorshipEntryComponent", "correspondingAuthor", element.getCorrespondingAuthorElement(), -1);
+ for (int i = 0; i < element.getContributionInstance().size(); i++) {
+ composeCitationCitedArtifactContributorshipEntryContributionInstanceComponent(t, "CitationCitedArtifactContributorshipEntryComponent", "contributionInstance", element.getContributionInstance().get(i), i);
+ }
+ if (element.hasCorrespondingContactElement()) {
+ composeBoolean(t, "CitationCitedArtifactContributorshipEntryComponent", "correspondingContact", element.getCorrespondingContactElement(), -1);
}
if (element.hasListOrderElement()) {
- composePositiveInt(t, "CitationContributorshipEntryComponent", "listOrder", element.getListOrderElement(), -1);
+ composePositiveInt(t, "CitationCitedArtifactContributorshipEntryComponent", "listOrder", element.getListOrderElement(), -1);
}
}
- protected void composeCitationContributorshipEntryAffiliationInfoComponent(Complex parent, String parentType, String name, Citation.CitationContributorshipEntryAffiliationInfoComponent element, int index) {
+ protected void composeCitationCitedArtifactContributorshipEntryAffiliationInfoComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -5044,17 +5328,35 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "affiliationInfo", name, element, index);
if (element.hasAffiliationElement()) {
- composeString(t, "CitationContributorshipEntryAffiliationInfoComponent", "affiliation", element.getAffiliationElement(), -1);
+ composeString(t, "CitationCitedArtifactContributorshipEntryAffiliationInfoComponent", "affiliation", element.getAffiliationElement(), -1);
}
if (element.hasRoleElement()) {
- composeString(t, "CitationContributorshipEntryAffiliationInfoComponent", "role", element.getRoleElement(), -1);
+ composeString(t, "CitationCitedArtifactContributorshipEntryAffiliationInfoComponent", "role", element.getRoleElement(), -1);
}
for (int i = 0; i < element.getIdentifier().size(); i++) {
- composeIdentifier(t, "CitationContributorshipEntryAffiliationInfoComponent", "identifier", element.getIdentifier().get(i), i);
+ composeIdentifier(t, "CitationCitedArtifactContributorshipEntryAffiliationInfoComponent", "identifier", element.getIdentifier().get(i), i);
}
}
- protected void composeCitationContributorshipSummaryComponent(Complex parent, String parentType, String name, Citation.CitationContributorshipSummaryComponent element, int index) {
+ protected void composeCitationCitedArtifactContributorshipEntryContributionInstanceComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "contributionInstance", name, element, index);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "CitationCitedArtifactContributorshipEntryContributionInstanceComponent", "type", element.getType(), -1);
+ }
+ if (element.hasTimeElement()) {
+ composeDateTime(t, "CitationCitedArtifactContributorshipEntryContributionInstanceComponent", "time", element.getTimeElement(), -1);
+ }
+ }
+
+ protected void composeCitationCitedArtifactContributorshipSummaryComponent(Complex parent, String parentType, String name, Citation.CitationCitedArtifactContributorshipSummaryComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -5065,286 +5367,16 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "summary", name, element, index);
if (element.hasType()) {
- composeCodeableConcept(t, "CitationContributorshipSummaryComponent", "type", element.getType(), -1);
+ composeCodeableConcept(t, "CitationCitedArtifactContributorshipSummaryComponent", "type", element.getType(), -1);
}
if (element.hasStyle()) {
- composeCodeableConcept(t, "CitationContributorshipSummaryComponent", "style", element.getStyle(), -1);
+ composeCodeableConcept(t, "CitationCitedArtifactContributorshipSummaryComponent", "style", element.getStyle(), -1);
}
if (element.hasSource()) {
- composeCodeableConcept(t, "CitationContributorshipSummaryComponent", "source", element.getSource(), -1);
+ composeCodeableConcept(t, "CitationCitedArtifactContributorshipSummaryComponent", "source", element.getSource(), -1);
}
if (element.hasValueElement()) {
- composeMarkdown(t, "CitationContributorshipSummaryComponent", "value", element.getValueElement(), -1);
- }
- }
-
- protected void composeCitationAlternativeFormComponent(Complex parent, String parentType, String name, Citation.CitationAlternativeFormComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "alternativeForm", name, element, index);
- if (element.hasPublishingModel()) {
- composeCodeableConcept(t, "CitationAlternativeFormComponent", "publishingModel", element.getPublishingModel(), -1);
- }
- if (element.hasLanguage()) {
- composeCodeableConcept(t, "CitationAlternativeFormComponent", "language", element.getLanguage(), -1);
- }
- if (element.hasJournalIssue()) {
- composeCitationAlternativeFormJournalIssueComponent(t, "CitationAlternativeFormComponent", "journalIssue", element.getJournalIssue(), -1);
- }
- if (element.hasPagination()) {
- composeCitationAlternativeFormPaginationComponent(t, "CitationAlternativeFormComponent", "pagination", element.getPagination(), -1);
- }
- if (element.hasPublicationInfo()) {
- composeCitationAlternativeFormPublicationInfoComponent(t, "CitationAlternativeFormComponent", "publicationInfo", element.getPublicationInfo(), -1);
- }
- }
-
- protected void composeCitationAlternativeFormJournalIssueComponent(Complex parent, String parentType, String name, Citation.CitationAlternativeFormJournalIssueComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "journalIssue", name, element, index);
- if (element.hasCitedMedium()) {
- composeCodeableConcept(t, "CitationAlternativeFormJournalIssueComponent", "citedMedium", element.getCitedMedium(), -1);
- }
- if (element.hasVolumeElement()) {
- composeString(t, "CitationAlternativeFormJournalIssueComponent", "volume", element.getVolumeElement(), -1);
- }
- if (element.hasIssueElement()) {
- composeString(t, "CitationAlternativeFormJournalIssueComponent", "issue", element.getIssueElement(), -1);
- }
- if (element.hasPublicationDate()) {
- composeCitationAlternativeFormJournalIssuePublicationDateComponent(t, "CitationAlternativeFormJournalIssueComponent", "publicationDate", element.getPublicationDate(), -1);
- }
- }
-
- protected void composeCitationAlternativeFormJournalIssuePublicationDateComponent(Complex parent, String parentType, String name, Citation.CitationAlternativeFormJournalIssuePublicationDateComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "publicationDate", name, element, index);
- if (element.hasDateElement()) {
- composeDate(t, "CitationAlternativeFormJournalIssuePublicationDateComponent", "date", element.getDateElement(), -1);
- }
- if (element.hasYearElement()) {
- composeString(t, "CitationAlternativeFormJournalIssuePublicationDateComponent", "year", element.getYearElement(), -1);
- }
- if (element.hasMonthElement()) {
- composeString(t, "CitationAlternativeFormJournalIssuePublicationDateComponent", "month", element.getMonthElement(), -1);
- }
- if (element.hasDayElement()) {
- composeString(t, "CitationAlternativeFormJournalIssuePublicationDateComponent", "day", element.getDayElement(), -1);
- }
- if (element.hasSeasonElement()) {
- composeString(t, "CitationAlternativeFormJournalIssuePublicationDateComponent", "season", element.getSeasonElement(), -1);
- }
- if (element.hasTextElement()) {
- composeString(t, "CitationAlternativeFormJournalIssuePublicationDateComponent", "text", element.getTextElement(), -1);
- }
- }
-
- protected void composeCitationAlternativeFormPaginationComponent(Complex parent, String parentType, String name, Citation.CitationAlternativeFormPaginationComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "pagination", name, element, index);
- if (element.hasPageStringElement()) {
- composeString(t, "CitationAlternativeFormPaginationComponent", "pageString", element.getPageStringElement(), -1);
- }
- if (element.hasFirstPageElement()) {
- composeString(t, "CitationAlternativeFormPaginationComponent", "firstPage", element.getFirstPageElement(), -1);
- }
- if (element.hasLastPageElement()) {
- composeString(t, "CitationAlternativeFormPaginationComponent", "lastPage", element.getLastPageElement(), -1);
- }
- }
-
- protected void composeCitationAlternativeFormPublicationInfoComponent(Complex parent, String parentType, String name, Citation.CitationAlternativeFormPublicationInfoComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "publicationInfo", name, element, index);
- if (element.hasPublishedIn()) {
- composeCitationAlternativeFormPublicationInfoPublishedInComponent(t, "CitationAlternativeFormPublicationInfoComponent", "publishedIn", element.getPublishedIn(), -1);
- }
- if (element.hasEntryDateElement()) {
- composeDateTime(t, "CitationAlternativeFormPublicationInfoComponent", "entryDate", element.getEntryDateElement(), -1);
- }
- if (element.hasRevisionDateElement()) {
- composeDateTime(t, "CitationAlternativeFormPublicationInfoComponent", "revisionDate", element.getRevisionDateElement(), -1);
- }
- if (element.hasPageCountElement()) {
- composeString(t, "CitationAlternativeFormPublicationInfoComponent", "pageCount", element.getPageCountElement(), -1);
- }
- }
-
- protected void composeCitationAlternativeFormPublicationInfoPublishedInComponent(Complex parent, String parentType, String name, Citation.CitationAlternativeFormPublicationInfoPublishedInComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "publishedIn", name, element, index);
- if (element.hasType()) {
- composeCodeableConcept(t, "CitationAlternativeFormPublicationInfoPublishedInComponent", "type", element.getType(), -1);
- }
- if (element.hasNameElement()) {
- composeString(t, "CitationAlternativeFormPublicationInfoPublishedInComponent", "name", element.getNameElement(), -1);
- }
- if (element.hasPublisher()) {
- composeReference(t, "CitationAlternativeFormPublicationInfoPublishedInComponent", "publisher", element.getPublisher(), -1);
- }
- if (element.hasPublisherLocationElement()) {
- composeString(t, "CitationAlternativeFormPublicationInfoPublishedInComponent", "publisherLocation", element.getPublisherLocationElement(), -1);
- }
- if (element.hasStartDateElement()) {
- composeDate(t, "CitationAlternativeFormPublicationInfoPublishedInComponent", "startDate", element.getStartDateElement(), -1);
- }
- }
-
- protected void composeCitationKeywordListComponent(Complex parent, String parentType, String name, Citation.CitationKeywordListComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "keywordList", name, element, index);
- if (element.hasOwnerElement()) {
- composeString(t, "CitationKeywordListComponent", "owner", element.getOwnerElement(), -1);
- }
- for (int i = 0; i < element.getKeyword().size(); i++) {
- composeCitationKeywordListKeywordComponent(t, "CitationKeywordListComponent", "keyword", element.getKeyword().get(i), i);
- }
- }
-
- protected void composeCitationKeywordListKeywordComponent(Complex parent, String parentType, String name, Citation.CitationKeywordListKeywordComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "keyword", name, element, index);
- if (element.hasMajorTopicElement()) {
- composeBoolean(t, "CitationKeywordListKeywordComponent", "majorTopic", element.getMajorTopicElement(), -1);
- }
- if (element.hasValueElement()) {
- composeString(t, "CitationKeywordListKeywordComponent", "value", element.getValueElement(), -1);
- }
- }
-
- protected void composeCitationMedlinePubMedComponent(Complex parent, String parentType, String name, Citation.CitationMedlinePubMedComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "medlinePubMed", name, element, index);
- if (element.hasMedlineState()) {
- composeCodeableConcept(t, "CitationMedlinePubMedComponent", "medlineState", element.getMedlineState(), -1);
- }
- if (element.hasOwner()) {
- composeCodeableConcept(t, "CitationMedlinePubMedComponent", "owner", element.getOwner(), -1);
- }
- if (element.hasPmidElement()) {
- composePositiveInt(t, "CitationMedlinePubMedComponent", "pmid", element.getPmidElement(), -1);
- }
- if (element.hasPmidVersionElement()) {
- composePositiveInt(t, "CitationMedlinePubMedComponent", "pmidVersion", element.getPmidVersionElement(), -1);
- }
- if (element.hasDateCreatedElement()) {
- composeDate(t, "CitationMedlinePubMedComponent", "dateCreated", element.getDateCreatedElement(), -1);
- }
- if (element.hasDateCompletedElement()) {
- composeDate(t, "CitationMedlinePubMedComponent", "dateCompleted", element.getDateCompletedElement(), -1);
- }
- if (element.hasDateRevisedElement()) {
- composeDate(t, "CitationMedlinePubMedComponent", "dateRevised", element.getDateRevisedElement(), -1);
- }
- for (int i = 0; i < element.getPubMedPubDate().size(); i++) {
- composeCitationMedlinePubMedPubMedPubDateComponent(t, "CitationMedlinePubMedComponent", "pubMedPubDate", element.getPubMedPubDate().get(i), i);
- }
- if (element.hasPublicationState()) {
- composeCodeableConcept(t, "CitationMedlinePubMedComponent", "publicationState", element.getPublicationState(), -1);
- }
- for (int i = 0; i < element.getRelatedArticle().size(); i++) {
- composeCitationMedlinePubMedRelatedArticleComponent(t, "CitationMedlinePubMedComponent", "relatedArticle", element.getRelatedArticle().get(i), i);
- }
- }
-
- protected void composeCitationMedlinePubMedPubMedPubDateComponent(Complex parent, String parentType, String name, Citation.CitationMedlinePubMedPubMedPubDateComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "pubMedPubDate", name, element, index);
- if (element.hasPublicationState()) {
- composeCodeableConcept(t, "CitationMedlinePubMedPubMedPubDateComponent", "publicationState", element.getPublicationState(), -1);
- }
- if (element.hasDateElement()) {
- composeDateTime(t, "CitationMedlinePubMedPubMedPubDateComponent", "date", element.getDateElement(), -1);
- }
- }
-
- protected void composeCitationMedlinePubMedRelatedArticleComponent(Complex parent, String parentType, String name, Citation.CitationMedlinePubMedRelatedArticleComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "relatedArticle", name, element, index);
- if (element.hasCitationReference()) {
- composeReference(t, "CitationMedlinePubMedRelatedArticleComponent", "citationReference", element.getCitationReference(), -1);
- }
- if (element.hasCitationMarkdownElement()) {
- composeMarkdown(t, "CitationMedlinePubMedRelatedArticleComponent", "citationMarkdown", element.getCitationMarkdownElement(), -1);
- }
- for (int i = 0; i < element.getIdentifier().size(); i++) {
- composeIdentifier(t, "CitationMedlinePubMedRelatedArticleComponent", "identifier", element.getIdentifier().get(i), i);
+ composeMarkdown(t, "CitationCitedArtifactContributorshipSummaryComponent", "value", element.getValueElement(), -1);
}
}
@@ -6403,13 +6435,13 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "contraindication", name, element, index);
if (element.hasDiseaseSymptomProcedure()) {
- composeCodeableConcept(t, "ClinicalUseIssueContraindicationComponent", "diseaseSymptomProcedure", element.getDiseaseSymptomProcedure(), -1);
+ composeCodeableReference(t, "ClinicalUseIssueContraindicationComponent", "diseaseSymptomProcedure", element.getDiseaseSymptomProcedure(), -1);
}
if (element.hasDiseaseStatus()) {
- composeCodeableConcept(t, "ClinicalUseIssueContraindicationComponent", "diseaseStatus", element.getDiseaseStatus(), -1);
+ composeCodeableReference(t, "ClinicalUseIssueContraindicationComponent", "diseaseStatus", element.getDiseaseStatus(), -1);
}
for (int i = 0; i < element.getComorbidity().size(); i++) {
- composeCodeableConcept(t, "ClinicalUseIssueContraindicationComponent", "comorbidity", element.getComorbidity().get(i), i);
+ composeCodeableReference(t, "ClinicalUseIssueContraindicationComponent", "comorbidity", element.getComorbidity().get(i), i);
}
for (int i = 0; i < element.getIndication().size(); i++) {
composeReference(t, "ClinicalUseIssueContraindicationComponent", "indication", element.getIndication().get(i), i);
@@ -6429,11 +6461,11 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeBackboneElement(t, "otherTherapy", name, element, index);
- if (element.hasTherapyRelationshipType()) {
- composeCodeableConcept(t, "ClinicalUseIssueContraindicationOtherTherapyComponent", "therapyRelationshipType", element.getTherapyRelationshipType(), -1);
+ if (element.hasRelationshipType()) {
+ composeCodeableConcept(t, "ClinicalUseIssueContraindicationOtherTherapyComponent", "relationshipType", element.getRelationshipType(), -1);
}
- if (element.hasMedication()) {
- composeType(t, "ClinicalUseIssueContraindicationOtherTherapyComponent", "medication", element.getMedication(), -1);
+ if (element.hasTherapy()) {
+ composeCodeableReference(t, "ClinicalUseIssueContraindicationOtherTherapyComponent", "therapy", element.getTherapy(), -1);
}
}
@@ -6448,16 +6480,16 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "indication", name, element, index);
if (element.hasDiseaseSymptomProcedure()) {
- composeCodeableConcept(t, "ClinicalUseIssueIndicationComponent", "diseaseSymptomProcedure", element.getDiseaseSymptomProcedure(), -1);
+ composeCodeableReference(t, "ClinicalUseIssueIndicationComponent", "diseaseSymptomProcedure", element.getDiseaseSymptomProcedure(), -1);
}
if (element.hasDiseaseStatus()) {
- composeCodeableConcept(t, "ClinicalUseIssueIndicationComponent", "diseaseStatus", element.getDiseaseStatus(), -1);
+ composeCodeableReference(t, "ClinicalUseIssueIndicationComponent", "diseaseStatus", element.getDiseaseStatus(), -1);
}
for (int i = 0; i < element.getComorbidity().size(); i++) {
- composeCodeableConcept(t, "ClinicalUseIssueIndicationComponent", "comorbidity", element.getComorbidity().get(i), i);
+ composeCodeableReference(t, "ClinicalUseIssueIndicationComponent", "comorbidity", element.getComorbidity().get(i), i);
}
if (element.hasIntendedEffect()) {
- composeCodeableConcept(t, "ClinicalUseIssueIndicationComponent", "intendedEffect", element.getIntendedEffect(), -1);
+ composeCodeableReference(t, "ClinicalUseIssueIndicationComponent", "intendedEffect", element.getIntendedEffect(), -1);
}
if (element.hasDuration()) {
composeQuantity(t, "ClinicalUseIssueIndicationComponent", "duration", element.getDuration(), -1);
@@ -6487,7 +6519,7 @@ public class RdfParser extends RdfParserBase {
composeCodeableConcept(t, "ClinicalUseIssueInteractionComponent", "type", element.getType(), -1);
}
if (element.hasEffect()) {
- composeCodeableConcept(t, "ClinicalUseIssueInteractionComponent", "effect", element.getEffect(), -1);
+ composeCodeableReference(t, "ClinicalUseIssueInteractionComponent", "effect", element.getEffect(), -1);
}
if (element.hasIncidence()) {
composeCodeableConcept(t, "ClinicalUseIssueInteractionComponent", "incidence", element.getIncidence(), -1);
@@ -6523,7 +6555,7 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "undesirableEffect", name, element, index);
if (element.hasSymptomConditionEffect()) {
- composeCodeableConcept(t, "ClinicalUseIssueUndesirableEffectComponent", "symptomConditionEffect", element.getSymptomConditionEffect(), -1);
+ composeCodeableReference(t, "ClinicalUseIssueUndesirableEffectComponent", "symptomConditionEffect", element.getSymptomConditionEffect(), -1);
}
if (element.hasClassification()) {
composeCodeableConcept(t, "ClinicalUseIssueUndesirableEffectComponent", "classification", element.getClassification(), -1);
@@ -6861,6 +6893,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasStatusReason()) {
composeCodeableConcept(t, "CommunicationRequest", "statusReason", element.getStatusReason(), -1);
}
+ if (element.hasIntentElement()) {
+ composeEnum(t, "CommunicationRequest", "intent", element.getIntentElement(), -1);
+ }
for (int i = 0; i < element.getCategory().size(); i++) {
composeCodeableConcept(t, "CommunicationRequest", "category", element.getCategory().get(i), i);
}
@@ -7170,8 +7205,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasUrlElement()) {
composeUri(t, "ConceptMap", "url", element.getUrlElement(), -1);
}
- if (element.hasIdentifier()) {
- composeIdentifier(t, "ConceptMap", "identifier", element.getIdentifierFirstRep(), -1);
+ for (int i = 0; i < element.getIdentifier().size(); i++) {
+ composeIdentifier(t, "ConceptMap", "identifier", element.getIdentifier().get(i), i);
}
if (element.hasVersionElement()) {
composeString(t, "ConceptMap", "version", element.getVersionElement(), -1);
@@ -7234,16 +7269,10 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "group", name, element, index);
if (element.hasSourceElement()) {
- composeUri(t, "ConceptMapGroupComponent", "source", element.getSourceElement(), -1);
- }
- if (element.hasSourceVersionElement()) {
- composeString(t, "ConceptMapGroupComponent", "sourceVersion", element.getSourceVersionElement(), -1);
+ composeCanonical(t, "ConceptMapGroupComponent", "source", element.getSourceElement(), -1);
}
if (element.hasTargetElement()) {
- composeUri(t, "ConceptMapGroupComponent", "target", element.getTargetElement(), -1);
- }
- if (element.hasTargetVersionElement()) {
- composeString(t, "ConceptMapGroupComponent", "targetVersion", element.getTargetVersionElement(), -1);
+ composeCanonical(t, "ConceptMapGroupComponent", "target", element.getTargetElement(), -1);
}
for (int i = 0; i < element.getElement().size(); i++) {
composeConceptMapSourceElementComponent(t, "ConceptMapGroupComponent", "element", element.getElement().get(i), i);
@@ -9135,11 +9164,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasType()) {
composeCodeableConcept(t, "DevicePropertyComponent", "type", element.getType(), -1);
}
- for (int i = 0; i < element.getValueQuantity().size(); i++) {
- composeQuantity(t, "DevicePropertyComponent", "valueQuantity", element.getValueQuantity().get(i), i);
- }
- for (int i = 0; i < element.getValueCode().size(); i++) {
- composeCodeableConcept(t, "DevicePropertyComponent", "valueCode", element.getValueCode().get(i), i);
+ if (element.hasValue()) {
+ composeType(t, "DevicePropertyComponent", "value", element.getValue(), -1);
}
}
@@ -9204,14 +9230,20 @@ public class RdfParser extends RdfParserBase {
if (element.hasModelNumberElement()) {
composeString(t, "DeviceDefinition", "modelNumber", element.getModelNumberElement(), -1);
}
- if (element.hasType()) {
- composeCodeableConcept(t, "DeviceDefinition", "type", element.getType(), -1);
+ for (int i = 0; i < element.getType().size(); i++) {
+ composeCodeableConcept(t, "DeviceDefinition", "type", element.getType().get(i), i);
}
for (int i = 0; i < element.getSpecialization().size(); i++) {
composeDeviceDefinitionSpecializationComponent(t, "DeviceDefinition", "specialization", element.getSpecialization().get(i), i);
}
+ for (int i = 0; i < element.getHasPart().size(); i++) {
+ composeDeviceDefinitionHasPartComponent(t, "DeviceDefinition", "hasPart", element.getHasPart().get(i), i);
+ }
+ for (int i = 0; i < element.getPackaging().size(); i++) {
+ composeDeviceDefinitionPackagingComponent(t, "DeviceDefinition", "packaging", element.getPackaging().get(i), i);
+ }
for (int i = 0; i < element.getVersion().size(); i++) {
- composeString(t, "DeviceDefinition", "version", element.getVersion().get(i), i);
+ composeDeviceDefinitionVersionComponent(t, "DeviceDefinition", "version", element.getVersion().get(i), i);
}
for (int i = 0; i < element.getSafety().size(); i++) {
composeCodeableConcept(t, "DeviceDefinition", "safety", element.getSafety().get(i), i);
@@ -9243,9 +9275,6 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getNote().size(); i++) {
composeAnnotation(t, "DeviceDefinition", "note", element.getNote().get(i), i);
}
- if (element.hasQuantity()) {
- composeQuantity(t, "DeviceDefinition", "quantity", element.getQuantity(), -1);
- }
if (element.hasParentDevice()) {
composeReference(t, "DeviceDefinition", "parentDevice", element.getParentDevice(), -1);
}
@@ -9311,6 +9340,114 @@ public class RdfParser extends RdfParserBase {
}
}
+ protected void composeDeviceDefinitionHasPartComponent(Complex parent, String parentType, String name, DeviceDefinition.DeviceDefinitionHasPartComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "hasPart", name, element, index);
+ if (element.hasReference()) {
+ composeReference(t, "DeviceDefinitionHasPartComponent", "reference", element.getReference(), -1);
+ }
+ if (element.hasCountElement()) {
+ composeInteger(t, "DeviceDefinitionHasPartComponent", "count", element.getCountElement(), -1);
+ }
+ }
+
+ protected void composeDeviceDefinitionPackagingComponent(Complex parent, String parentType, String name, DeviceDefinition.DeviceDefinitionPackagingComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "packaging", name, element, index);
+ if (element.hasIdentifier()) {
+ composeIdentifier(t, "DeviceDefinitionPackagingComponent", "identifier", element.getIdentifier(), -1);
+ }
+ if (element.hasType()) {
+ composeCodeableConcept(t, "DeviceDefinitionPackagingComponent", "type", element.getType(), -1);
+ }
+ if (element.hasCountElement()) {
+ composeInteger(t, "DeviceDefinitionPackagingComponent", "count", element.getCountElement(), -1);
+ }
+ for (int i = 0; i < element.getDistributor().size(); i++) {
+ composeDeviceDefinitionPackagingDistributorComponent(t, "DeviceDefinitionPackagingComponent", "distributor", element.getDistributor().get(i), i);
+ }
+ for (int i = 0; i < element.getUdiDeviceIdentifier().size(); i++) {
+ composeDeviceDefinitionPackagingUdiDeviceIdentifierComponent(t, "DeviceDefinitionPackagingComponent", "udiDeviceIdentifier", element.getUdiDeviceIdentifier().get(i), i);
+ }
+ for (int i = 0; i < element.getPackaging().size(); i++) {
+ composeDeviceDefinitionPackagingComponent(t, "DeviceDefinitionPackagingComponent", "packaging", element.getPackaging().get(i), i);
+ }
+ }
+
+ protected void composeDeviceDefinitionPackagingDistributorComponent(Complex parent, String parentType, String name, DeviceDefinition.DeviceDefinitionPackagingDistributorComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "distributor", name, element, index);
+ if (element.hasNameElement()) {
+ composeString(t, "DeviceDefinitionPackagingDistributorComponent", "name", element.getNameElement(), -1);
+ }
+ for (int i = 0; i < element.getOrganizationReference().size(); i++) {
+ composeReference(t, "DeviceDefinitionPackagingDistributorComponent", "organizationReference", element.getOrganizationReference().get(i), i);
+ }
+ }
+
+ protected void composeDeviceDefinitionPackagingUdiDeviceIdentifierComponent(Complex parent, String parentType, String name, DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "udiDeviceIdentifier", name, element, index);
+ if (element.hasDeviceIdentifierElement()) {
+ composeString(t, "DeviceDefinitionPackagingUdiDeviceIdentifierComponent", "deviceIdentifier", element.getDeviceIdentifierElement(), -1);
+ }
+ if (element.hasIssuerElement()) {
+ composeUri(t, "DeviceDefinitionPackagingUdiDeviceIdentifierComponent", "issuer", element.getIssuerElement(), -1);
+ }
+ if (element.hasJurisdictionElement()) {
+ composeUri(t, "DeviceDefinitionPackagingUdiDeviceIdentifierComponent", "jurisdiction", element.getJurisdictionElement(), -1);
+ }
+ }
+
+ protected void composeDeviceDefinitionVersionComponent(Complex parent, String parentType, String name, DeviceDefinition.DeviceDefinitionVersionComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "version", name, element, index);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "DeviceDefinitionVersionComponent", "type", element.getType(), -1);
+ }
+ if (element.hasComponent()) {
+ composeIdentifier(t, "DeviceDefinitionVersionComponent", "component", element.getComponent(), -1);
+ }
+ if (element.hasValueElement()) {
+ composeString(t, "DeviceDefinitionVersionComponent", "value", element.getValueElement(), -1);
+ }
+ }
+
protected void composeDeviceDefinitionCapabilityComponent(Complex parent, String parentType, String name, DeviceDefinition.DeviceDefinitionCapabilityComponent element, int index) {
if (element == null)
return;
@@ -9471,9 +9608,15 @@ public class RdfParser extends RdfParserBase {
if (element.hasPriorityElement()) {
composeEnum(t, "DeviceRequest", "priority", element.getPriorityElement(), -1);
}
+ if (element.hasDoNotPerformElement()) {
+ composeBoolean(t, "DeviceRequest", "doNotPerform", element.getDoNotPerformElement(), -1);
+ }
if (element.hasCode()) {
composeCodeableReference(t, "DeviceRequest", "code", element.getCode(), -1);
}
+ if (element.hasQuantityElement()) {
+ composeInteger(t, "DeviceRequest", "quantity", element.getQuantityElement(), -1);
+ }
for (int i = 0; i < element.getParameter().size(); i++) {
composeDeviceRequestParameterComponent(t, "DeviceRequest", "parameter", element.getParameter().get(i), i);
}
@@ -9533,7 +9676,7 @@ public class RdfParser extends RdfParserBase {
}
}
- protected void composeDeviceUseStatement(Complex parent, String parentType, String name, DeviceUseStatement element, int index) {
+ protected void composeDeviceUsage(Complex parent, String parentType, String name, DeviceUsage element, int index) {
if (element == null)
return;
Complex t;
@@ -9542,54 +9685,54 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeDomainResource(t, "DeviceUseStatement", name, element, index);
+ composeDomainResource(t, "DeviceUsage", name, element, index);
for (int i = 0; i < element.getIdentifier().size(); i++) {
- composeIdentifier(t, "DeviceUseStatement", "identifier", element.getIdentifier().get(i), i);
+ composeIdentifier(t, "DeviceUsage", "identifier", element.getIdentifier().get(i), i);
}
for (int i = 0; i < element.getBasedOn().size(); i++) {
- composeReference(t, "DeviceUseStatement", "basedOn", element.getBasedOn().get(i), i);
+ composeReference(t, "DeviceUsage", "basedOn", element.getBasedOn().get(i), i);
}
if (element.hasStatusElement()) {
- composeEnum(t, "DeviceUseStatement", "status", element.getStatusElement(), -1);
+ composeEnum(t, "DeviceUsage", "status", element.getStatusElement(), -1);
}
for (int i = 0; i < element.getCategory().size(); i++) {
- composeCodeableConcept(t, "DeviceUseStatement", "category", element.getCategory().get(i), i);
+ composeCodeableConcept(t, "DeviceUsage", "category", element.getCategory().get(i), i);
}
if (element.hasSubject()) {
- composeReference(t, "DeviceUseStatement", "subject", element.getSubject(), -1);
+ composeReference(t, "DeviceUsage", "subject", element.getSubject(), -1);
}
for (int i = 0; i < element.getDerivedFrom().size(); i++) {
- composeReference(t, "DeviceUseStatement", "derivedFrom", element.getDerivedFrom().get(i), i);
+ composeReference(t, "DeviceUsage", "derivedFrom", element.getDerivedFrom().get(i), i);
}
if (element.hasContext()) {
- composeReference(t, "DeviceUseStatement", "context", element.getContext(), -1);
+ composeReference(t, "DeviceUsage", "context", element.getContext(), -1);
}
if (element.hasTiming()) {
- composeType(t, "DeviceUseStatement", "timing", element.getTiming(), -1);
+ composeType(t, "DeviceUsage", "timing", element.getTiming(), -1);
}
if (element.hasDateAssertedElement()) {
- composeDateTime(t, "DeviceUseStatement", "dateAsserted", element.getDateAssertedElement(), -1);
+ composeDateTime(t, "DeviceUsage", "dateAsserted", element.getDateAssertedElement(), -1);
}
if (element.hasUsageStatus()) {
- composeCodeableConcept(t, "DeviceUseStatement", "usageStatus", element.getUsageStatus(), -1);
+ composeCodeableConcept(t, "DeviceUsage", "usageStatus", element.getUsageStatus(), -1);
}
for (int i = 0; i < element.getUsageReason().size(); i++) {
- composeCodeableConcept(t, "DeviceUseStatement", "usageReason", element.getUsageReason().get(i), i);
+ composeCodeableConcept(t, "DeviceUsage", "usageReason", element.getUsageReason().get(i), i);
}
if (element.hasInformationSource()) {
- composeReference(t, "DeviceUseStatement", "informationSource", element.getInformationSource(), -1);
+ composeReference(t, "DeviceUsage", "informationSource", element.getInformationSource(), -1);
}
if (element.hasDevice()) {
- composeCodeableReference(t, "DeviceUseStatement", "device", element.getDevice(), -1);
+ composeCodeableReference(t, "DeviceUsage", "device", element.getDevice(), -1);
}
for (int i = 0; i < element.getReason().size(); i++) {
- composeCodeableReference(t, "DeviceUseStatement", "reason", element.getReason().get(i), i);
+ composeCodeableReference(t, "DeviceUsage", "reason", element.getReason().get(i), i);
}
if (element.hasBodySite()) {
- composeCodeableReference(t, "DeviceUseStatement", "bodySite", element.getBodySite(), -1);
+ composeCodeableReference(t, "DeviceUsage", "bodySite", element.getBodySite(), -1);
}
for (int i = 0; i < element.getNote().size(); i++) {
- composeAnnotation(t, "DeviceUseStatement", "note", element.getNote().get(i), i);
+ composeAnnotation(t, "DeviceUsage", "note", element.getNote().get(i), i);
}
}
@@ -9648,6 +9791,9 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getMedia().size(); i++) {
composeDiagnosticReportMediaComponent(t, "DiagnosticReport", "media", element.getMedia().get(i), i);
}
+ if (element.hasComposition()) {
+ composeReference(t, "DiagnosticReport", "composition", element.getComposition(), -1);
+ }
if (element.hasConclusionElement()) {
composeString(t, "DiagnosticReport", "conclusion", element.getConclusionElement(), -1);
}
@@ -10422,6 +10568,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasTitleElement()) {
composeString(t, "Evidence", "title", element.getTitleElement(), -1);
}
+ if (element.hasCiteAs()) {
+ composeType(t, "Evidence", "citeAs", element.getCiteAs(), -1);
+ }
if (element.hasStatusElement()) {
composeEnum(t, "Evidence", "status", element.getStatusElement(), -1);
}
@@ -10533,35 +10682,17 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getNote().size(); i++) {
composeAnnotation(t, "EvidenceCertaintyComponent", "note", element.getNote().get(i), i);
}
- for (int i = 0; i < element.getRating().size(); i++) {
- composeCodeableConcept(t, "EvidenceCertaintyComponent", "rating", element.getRating().get(i), i);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "EvidenceCertaintyComponent", "type", element.getType(), -1);
}
- for (int i = 0; i < element.getCertaintySubcomponent().size(); i++) {
- composeEvidenceCertaintyCertaintySubcomponentComponent(t, "EvidenceCertaintyComponent", "certaintySubcomponent", element.getCertaintySubcomponent().get(i), i);
+ if (element.hasRating()) {
+ composeCodeableConcept(t, "EvidenceCertaintyComponent", "rating", element.getRating(), -1);
}
- }
-
- protected void composeEvidenceCertaintyCertaintySubcomponentComponent(Complex parent, String parentType, String name, Evidence.EvidenceCertaintyCertaintySubcomponentComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
+ if (element.hasRaterElement()) {
+ composeString(t, "EvidenceCertaintyComponent", "rater", element.getRaterElement(), -1);
}
- composeBackboneElement(t, "certaintySubcomponent", name, element, index);
- if (element.hasDescriptionElement()) {
- composeString(t, "EvidenceCertaintyCertaintySubcomponentComponent", "description", element.getDescriptionElement(), -1);
- }
- for (int i = 0; i < element.getNote().size(); i++) {
- composeAnnotation(t, "EvidenceCertaintyCertaintySubcomponentComponent", "note", element.getNote().get(i), i);
- }
- for (int i = 0; i < element.getType().size(); i++) {
- composeCodeableConcept(t, "EvidenceCertaintyCertaintySubcomponentComponent", "type", element.getType().get(i), i);
- }
- for (int i = 0; i < element.getRating().size(); i++) {
- composeCodeableConcept(t, "EvidenceCertaintyCertaintySubcomponentComponent", "rating", element.getRating().get(i), i);
+ for (int i = 0; i < element.getSubcomponent().size(); i++) {
+ composeEvidenceCertaintyComponent(t, "EvidenceCertaintyComponent", "subcomponent", element.getSubcomponent().get(i), i);
}
}
@@ -10591,7 +10722,7 @@ public class RdfParser extends RdfParserBase {
composeIdentifier(t, "EvidenceReport", "relatedIdentifier", element.getRelatedIdentifier().get(i), i);
}
if (element.hasCiteAs()) {
- composeReference(t, "EvidenceReport", "citeAs", element.getCiteAs(), -1);
+ composeType(t, "EvidenceReport", "citeAs", element.getCiteAs(), -1);
}
if (element.hasType()) {
composeCodeableConcept(t, "EvidenceReport", "type", element.getType(), -1);
@@ -10728,6 +10859,9 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getEntryReference().size(); i++) {
composeReference(t, "SectionComponent", "entryReference", element.getEntryReference().get(i), i);
}
+ for (int i = 0; i < element.getEntryQuantity().size(); i++) {
+ composeQuantity(t, "SectionComponent", "entryQuantity", element.getEntryQuantity().get(i), i);
+ }
if (element.hasEmptyReason()) {
composeCodeableConcept(t, "SectionComponent", "emptyReason", element.getEmptyReason(), -1);
}
@@ -12177,8 +12311,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasStatusReasonElement()) {
composeString(t, "Goal", "statusReason", element.getStatusReasonElement(), -1);
}
- if (element.hasExpressedBy()) {
- composeReference(t, "Goal", "expressedBy", element.getExpressedBy(), -1);
+ if (element.hasSource()) {
+ composeReference(t, "Goal", "source", element.getSource(), -1);
}
for (int i = 0; i < element.getAddresses().size(); i++) {
composeReference(t, "Goal", "addresses", element.getAddresses().get(i), i);
@@ -13488,6 +13622,9 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getFunction().size(); i++) {
composeCodeableConcept(t, "Ingredient", "function", element.getFunction().get(i), i);
}
+ if (element.hasGroup()) {
+ composeCodeableConcept(t, "Ingredient", "group", element.getGroup(), -1);
+ }
if (element.hasDescriptionElement()) {
composeMarkdown(t, "Ingredient", "description", element.getDescriptionElement(), -1);
}
@@ -13516,7 +13653,7 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "substance", name, element, index);
if (element.hasCode()) {
- composeType(t, "IngredientSubstanceComponent", "code", element.getCode(), -1);
+ composeCodeableReference(t, "IngredientSubstanceComponent", "code", element.getCode(), -1);
}
for (int i = 0; i < element.getStrength().size(); i++) {
composeIngredientSubstanceStrengthComponent(t, "IngredientSubstanceComponent", "strength", element.getStrength().get(i), i);
@@ -13534,23 +13671,26 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "strength", name, element, index);
if (element.hasPresentation()) {
- composeRatio(t, "IngredientSubstanceStrengthComponent", "presentation", element.getPresentation(), -1);
+ composeType(t, "IngredientSubstanceStrengthComponent", "presentation", element.getPresentation(), -1);
}
if (element.hasPresentationHighLimit()) {
- composeRatio(t, "IngredientSubstanceStrengthComponent", "presentationHighLimit", element.getPresentationHighLimit(), -1);
+ composeType(t, "IngredientSubstanceStrengthComponent", "presentationHighLimit", element.getPresentationHighLimit(), -1);
}
if (element.hasPresentationTextElement()) {
composeString(t, "IngredientSubstanceStrengthComponent", "presentationText", element.getPresentationTextElement(), -1);
}
if (element.hasConcentration()) {
- composeRatio(t, "IngredientSubstanceStrengthComponent", "concentration", element.getConcentration(), -1);
+ composeType(t, "IngredientSubstanceStrengthComponent", "concentration", element.getConcentration(), -1);
}
if (element.hasConcentrationHighLimit()) {
- composeRatio(t, "IngredientSubstanceStrengthComponent", "concentrationHighLimit", element.getConcentrationHighLimit(), -1);
+ composeType(t, "IngredientSubstanceStrengthComponent", "concentrationHighLimit", element.getConcentrationHighLimit(), -1);
}
if (element.hasConcentrationTextElement()) {
composeString(t, "IngredientSubstanceStrengthComponent", "concentrationText", element.getConcentrationTextElement(), -1);
}
+ if (element.hasBasis()) {
+ composeCodeableConcept(t, "IngredientSubstanceStrengthComponent", "basis", element.getBasis(), -1);
+ }
if (element.hasMeasurementPointElement()) {
composeString(t, "IngredientSubstanceStrengthComponent", "measurementPoint", element.getMeasurementPointElement(), -1);
}
@@ -13573,13 +13713,13 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "referenceStrength", name, element, index);
if (element.hasSubstance()) {
- composeType(t, "IngredientSubstanceStrengthReferenceStrengthComponent", "substance", element.getSubstance(), -1);
+ composeCodeableReference(t, "IngredientSubstanceStrengthReferenceStrengthComponent", "substance", element.getSubstance(), -1);
}
if (element.hasStrength()) {
- composeRatio(t, "IngredientSubstanceStrengthReferenceStrengthComponent", "strength", element.getStrength(), -1);
+ composeType(t, "IngredientSubstanceStrengthReferenceStrengthComponent", "strength", element.getStrength(), -1);
}
if (element.hasStrengthHighLimit()) {
- composeRatio(t, "IngredientSubstanceStrengthReferenceStrengthComponent", "strengthHighLimit", element.getStrengthHighLimit(), -1);
+ composeType(t, "IngredientSubstanceStrengthReferenceStrengthComponent", "strengthHighLimit", element.getStrengthHighLimit(), -1);
}
if (element.hasMeasurementPointElement()) {
composeString(t, "IngredientSubstanceStrengthReferenceStrengthComponent", "measurementPoint", element.getMeasurementPointElement(), -1);
@@ -13600,7 +13740,7 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "specifiedSubstance", name, element, index);
if (element.hasCode()) {
- composeType(t, "IngredientSpecifiedSubstanceComponent", "code", element.getCode(), -1);
+ composeCodeableReference(t, "IngredientSpecifiedSubstanceComponent", "code", element.getCode(), -1);
}
if (element.hasGroup()) {
composeCodeableConcept(t, "IngredientSpecifiedSubstanceComponent", "group", element.getGroup(), -1);
@@ -13865,6 +14005,105 @@ public class RdfParser extends RdfParserBase {
}
}
+ protected void composeInventoryReport(Complex parent, String parentType, String name, InventoryReport element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeDomainResource(t, "InventoryReport", name, element, index);
+ for (int i = 0; i < element.getIdentifier().size(); i++) {
+ composeIdentifier(t, "InventoryReport", "identifier", element.getIdentifier().get(i), i);
+ }
+ if (element.hasStatusElement()) {
+ composeEnum(t, "InventoryReport", "status", element.getStatusElement(), -1);
+ }
+ if (element.hasCountTypeElement()) {
+ composeEnum(t, "InventoryReport", "countType", element.getCountTypeElement(), -1);
+ }
+ if (element.hasOperationType()) {
+ composeCodeableConcept(t, "InventoryReport", "operationType", element.getOperationType(), -1);
+ }
+ if (element.hasOperationTypeReason()) {
+ composeCodeableConcept(t, "InventoryReport", "operationTypeReason", element.getOperationTypeReason(), -1);
+ }
+ if (element.hasReportedDateTimeElement()) {
+ composeDateTime(t, "InventoryReport", "reportedDateTime", element.getReportedDateTimeElement(), -1);
+ }
+ if (element.hasReporter()) {
+ composeReference(t, "InventoryReport", "reporter", element.getReporter(), -1);
+ }
+ if (element.hasReportingPeriod()) {
+ composePeriod(t, "InventoryReport", "reportingPeriod", element.getReportingPeriod(), -1);
+ }
+ for (int i = 0; i < element.getInventoryListing().size(); i++) {
+ composeInventoryReportInventoryListingComponent(t, "InventoryReport", "inventoryListing", element.getInventoryListing().get(i), i);
+ }
+ if (element.hasNote()) {
+ composeAnnotation(t, "InventoryReport", "note", element.getNote(), -1);
+ }
+ }
+
+ protected void composeInventoryReportInventoryListingComponent(Complex parent, String parentType, String name, InventoryReport.InventoryReportInventoryListingComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "inventoryListing", name, element, index);
+ if (element.hasLocation()) {
+ composeReference(t, "InventoryReportInventoryListingComponent", "location", element.getLocation(), -1);
+ }
+ if (element.hasItemStatus()) {
+ composeCodeableConcept(t, "InventoryReportInventoryListingComponent", "itemStatus", element.getItemStatus(), -1);
+ }
+ if (element.hasCountingDateTimeElement()) {
+ composeDateTime(t, "InventoryReportInventoryListingComponent", "countingDateTime", element.getCountingDateTimeElement(), -1);
+ }
+ for (int i = 0; i < element.getItems().size(); i++) {
+ composeInventoryReportInventoryListingItemsComponent(t, "InventoryReportInventoryListingComponent", "items", element.getItems().get(i), i);
+ }
+ }
+
+ protected void composeInventoryReportInventoryListingItemsComponent(Complex parent, String parentType, String name, InventoryReport.InventoryReportInventoryListingItemsComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "items", name, element, index);
+ if (element.hasCategory()) {
+ composeCodeableConcept(t, "InventoryReportInventoryListingItemsComponent", "category", element.getCategory(), -1);
+ }
+ if (element.hasQuantity()) {
+ composeQuantity(t, "InventoryReportInventoryListingItemsComponent", "quantity", element.getQuantity(), -1);
+ }
+ if (element.hasItem()) {
+ composeCodeableReference(t, "InventoryReportInventoryListingItemsComponent", "item", element.getItem(), -1);
+ }
+ if (element.hasLotElement()) {
+ composeString(t, "InventoryReportInventoryListingItemsComponent", "lot", element.getLotElement(), -1);
+ }
+ if (element.hasSerialElement()) {
+ composeString(t, "InventoryReportInventoryListingItemsComponent", "serial", element.getSerialElement(), -1);
+ }
+ if (element.hasExpiryElement()) {
+ composeDateTime(t, "InventoryReportInventoryListingItemsComponent", "expiry", element.getExpiryElement(), -1);
+ }
+ if (element.hasManufacturingDateElement()) {
+ composeDateTime(t, "InventoryReportInventoryListingItemsComponent", "manufacturingDate", element.getManufacturingDateElement(), -1);
+ }
+ }
+
protected void composeInvoice(Complex parent, String parentType, String name, Invoice element, int index) {
if (element == null)
return;
@@ -14338,7 +14577,7 @@ public class RdfParser extends RdfParserBase {
composeReference(t, "ManufacturedItemDefinition", "manufacturer", element.getManufacturer().get(i), i);
}
for (int i = 0; i < element.getIngredient().size(); i++) {
- composeReference(t, "ManufacturedItemDefinition", "ingredient", element.getIngredient().get(i), i);
+ composeCodeableReference(t, "ManufacturedItemDefinition", "ingredient", element.getIngredient().get(i), i);
}
for (int i = 0; i < element.getProperty().size(); i++) {
composeManufacturedItemDefinitionPropertyComponent(t, "ManufacturedItemDefinition", "property", element.getProperty().get(i), i);
@@ -14400,6 +14639,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasSubject()) {
composeType(t, "Measure", "subject", element.getSubject(), -1);
}
+ if (element.hasBasisElement()) {
+ composeEnum(t, "Measure", "basis", element.getBasisElement(), -1);
+ }
if (element.hasDateElement()) {
composeDateTime(t, "Measure", "date", element.getDateElement(), -1);
}
@@ -14463,6 +14705,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasScoring()) {
composeCodeableConcept(t, "Measure", "scoring", element.getScoring(), -1);
}
+ if (element.hasScoringUnit()) {
+ composeCodeableConcept(t, "Measure", "scoringUnit", element.getScoringUnit(), -1);
+ }
if (element.hasCompositeScoring()) {
composeCodeableConcept(t, "Measure", "compositeScoring", element.getCompositeScoring(), -1);
}
@@ -14514,6 +14759,21 @@ public class RdfParser extends RdfParserBase {
if (element.hasDescriptionElement()) {
composeString(t, "MeasureGroupComponent", "description", element.getDescriptionElement(), -1);
}
+ for (int i = 0; i < element.getType().size(); i++) {
+ composeCodeableConcept(t, "MeasureGroupComponent", "type", element.getType().get(i), i);
+ }
+ if (element.hasBasisElement()) {
+ composeEnum(t, "MeasureGroupComponent", "basis", element.getBasisElement(), -1);
+ }
+ if (element.hasScoring()) {
+ composeCodeableConcept(t, "MeasureGroupComponent", "scoring", element.getScoring(), -1);
+ }
+ if (element.hasScoringUnit()) {
+ composeCodeableConcept(t, "MeasureGroupComponent", "scoringUnit", element.getScoringUnit(), -1);
+ }
+ if (element.hasImprovementNotation()) {
+ composeCodeableConcept(t, "MeasureGroupComponent", "improvementNotation", element.getImprovementNotation(), -1);
+ }
for (int i = 0; i < element.getPopulation().size(); i++) {
composeMeasureGroupPopulationComponent(t, "MeasureGroupComponent", "population", element.getPopulation().get(i), i);
}
@@ -14541,6 +14801,12 @@ public class RdfParser extends RdfParserBase {
if (element.hasCriteria()) {
composeExpression(t, "MeasureGroupPopulationComponent", "criteria", element.getCriteria(), -1);
}
+ if (element.hasInputPopulationIdElement()) {
+ composeString(t, "MeasureGroupPopulationComponent", "inputPopulationId", element.getInputPopulationIdElement(), -1);
+ }
+ if (element.hasAggregateMethod()) {
+ composeCodeableConcept(t, "MeasureGroupPopulationComponent", "aggregateMethod", element.getAggregateMethod(), -1);
+ }
}
protected void composeMeasureGroupStratifierComponent(Complex parent, String parentType, String name, Measure.MeasureGroupStratifierComponent element, int index) {
@@ -14631,6 +14897,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasTypeElement()) {
composeEnum(t, "MeasureReport", "type", element.getTypeElement(), -1);
}
+ if (element.hasDataUpdateTypeElement()) {
+ composeEnum(t, "MeasureReport", "dataUpdateType", element.getDataUpdateTypeElement(), -1);
+ }
if (element.hasMeasureElement()) {
composeCanonical(t, "MeasureReport", "measure", element.getMeasureElement(), -1);
}
@@ -14643,9 +14912,15 @@ public class RdfParser extends RdfParserBase {
if (element.hasReporter()) {
composeReference(t, "MeasureReport", "reporter", element.getReporter(), -1);
}
+ if (element.hasReportingVendor()) {
+ composeReference(t, "MeasureReport", "reportingVendor", element.getReportingVendor(), -1);
+ }
if (element.hasPeriod()) {
composePeriod(t, "MeasureReport", "period", element.getPeriod(), -1);
}
+ if (element.hasScoring()) {
+ composeCodeableConcept(t, "MeasureReport", "scoring", element.getScoring(), -1);
+ }
if (element.hasImprovementNotation()) {
composeCodeableConcept(t, "MeasureReport", "improvementNotation", element.getImprovementNotation(), -1);
}
@@ -14674,7 +14949,7 @@ public class RdfParser extends RdfParserBase {
composeMeasureReportGroupPopulationComponent(t, "MeasureReportGroupComponent", "population", element.getPopulation().get(i), i);
}
if (element.hasMeasureScore()) {
- composeQuantity(t, "MeasureReportGroupComponent", "measureScore", element.getMeasureScore(), -1);
+ composeType(t, "MeasureReportGroupComponent", "measureScore", element.getMeasureScore(), -1);
}
for (int i = 0; i < element.getStratifier().size(); i++) {
composeMeasureReportGroupStratifierComponent(t, "MeasureReportGroupComponent", "stratifier", element.getStratifier().get(i), i);
@@ -14731,7 +15006,7 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "stratum", name, element, index);
if (element.hasValue()) {
- composeCodeableConcept(t, "StratifierGroupComponent", "value", element.getValue(), -1);
+ composeType(t, "StratifierGroupComponent", "value", element.getValue(), -1);
}
for (int i = 0; i < element.getComponent().size(); i++) {
composeMeasureReportStratifierGroupComponentComponent(t, "StratifierGroupComponent", "component", element.getComponent().get(i), i);
@@ -14740,7 +15015,7 @@ public class RdfParser extends RdfParserBase {
composeMeasureReportStratifierGroupPopulationComponent(t, "StratifierGroupComponent", "population", element.getPopulation().get(i), i);
}
if (element.hasMeasureScore()) {
- composeQuantity(t, "StratifierGroupComponent", "measureScore", element.getMeasureScore(), -1);
+ composeType(t, "StratifierGroupComponent", "measureScore", element.getMeasureScore(), -1);
}
}
@@ -14758,7 +15033,7 @@ public class RdfParser extends RdfParserBase {
composeCodeableConcept(t, "StratifierGroupComponentComponent", "code", element.getCode(), -1);
}
if (element.hasValue()) {
- composeCodeableConcept(t, "StratifierGroupComponentComponent", "value", element.getValue(), -1);
+ composeType(t, "StratifierGroupComponentComponent", "value", element.getValue(), -1);
}
}
@@ -14802,8 +15077,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasStatusElement()) {
composeEnum(t, "Medication", "status", element.getStatusElement(), -1);
}
- if (element.hasManufacturer()) {
- composeReference(t, "Medication", "manufacturer", element.getManufacturer(), -1);
+ if (element.hasSponsor()) {
+ composeReference(t, "Medication", "sponsor", element.getSponsor(), -1);
}
if (element.hasDoseForm()) {
composeCodeableConcept(t, "Medication", "doseForm", element.getDoseForm(), -1);
@@ -15135,8 +15410,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasAuthor()) {
composeReference(t, "MedicationKnowledge", "author", element.getAuthor(), -1);
}
- if (element.hasManufacturer()) {
- composeReference(t, "MedicationKnowledge", "manufacturer", element.getManufacturer(), -1);
+ if (element.hasSponsor()) {
+ composeReference(t, "MedicationKnowledge", "sponsor", element.getSponsor(), -1);
}
if (element.hasDoseForm()) {
composeCodeableConcept(t, "MedicationKnowledge", "doseForm", element.getDoseForm(), -1);
@@ -15180,8 +15455,8 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getMonitoringProgram().size(); i++) {
composeMedicationKnowledgeMonitoringProgramComponent(t, "MedicationKnowledge", "monitoringProgram", element.getMonitoringProgram().get(i), i);
}
- for (int i = 0; i < element.getAdministrationGuideline().size(); i++) {
- composeMedicationKnowledgeAdministrationGuidelineComponent(t, "MedicationKnowledge", "administrationGuideline", element.getAdministrationGuideline().get(i), i);
+ for (int i = 0; i < element.getIndicationGuideline().size(); i++) {
+ composeMedicationKnowledgeIndicationGuidelineComponent(t, "MedicationKnowledge", "indicationGuideline", element.getIndicationGuideline().get(i), i);
}
for (int i = 0; i < element.getMedicineClassification().size(); i++) {
composeMedicationKnowledgeMedicineClassificationComponent(t, "MedicationKnowledge", "medicineClassification", element.getMedicineClassification().get(i), i);
@@ -15252,8 +15527,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasItem()) {
composeCodeableReference(t, "MedicationKnowledgeIngredientComponent", "item", element.getItem(), -1);
}
- if (element.hasIsActiveElement()) {
- composeBoolean(t, "MedicationKnowledgeIngredientComponent", "isActive", element.getIsActiveElement(), -1);
+ if (element.hasIsActive()) {
+ composeCodeableConcept(t, "MedicationKnowledgeIngredientComponent", "isActive", element.getIsActive(), -1);
}
if (element.hasStrength()) {
composeType(t, "MedicationKnowledgeIngredientComponent", "strength", element.getStrength(), -1);
@@ -15302,7 +15577,7 @@ public class RdfParser extends RdfParserBase {
}
}
- protected void composeMedicationKnowledgeAdministrationGuidelineComponent(Complex parent, String parentType, String name, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent element, int index) {
+ protected void composeMedicationKnowledgeIndicationGuidelineComponent(Complex parent, String parentType, String name, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -15311,19 +15586,40 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "administrationGuideline", name, element, index);
- for (int i = 0; i < element.getDosage().size(); i++) {
- composeMedicationKnowledgeAdministrationGuidelineDosageComponent(t, "MedicationKnowledgeAdministrationGuidelineComponent", "dosage", element.getDosage().get(i), i);
+ composeBackboneElement(t, "indicationGuideline", name, element, index);
+ for (int i = 0; i < element.getIndication().size(); i++) {
+ composeCodeableReference(t, "MedicationKnowledgeIndicationGuidelineComponent", "indication", element.getIndication().get(i), i);
}
- if (element.hasIndication()) {
- composeCodeableReference(t, "MedicationKnowledgeAdministrationGuidelineComponent", "indication", element.getIndication(), -1);
- }
- for (int i = 0; i < element.getPatientCharacteristic().size(); i++) {
- composeMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent(t, "MedicationKnowledgeAdministrationGuidelineComponent", "patientCharacteristic", element.getPatientCharacteristic().get(i), i);
+ for (int i = 0; i < element.getDosingGuideline().size(); i++) {
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelineComponent(t, "MedicationKnowledgeIndicationGuidelineComponent", "dosingGuideline", element.getDosingGuideline().get(i), i);
}
}
- protected void composeMedicationKnowledgeAdministrationGuidelineDosageComponent(Complex parent, String parentType, String name, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent element, int index) {
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelineComponent(Complex parent, String parentType, String name, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "dosingGuideline", name, element, index);
+ if (element.hasTreatmentIntent()) {
+ composeCodeableConcept(t, "MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent", "treatmentIntent", element.getTreatmentIntent(), -1);
+ }
+ for (int i = 0; i < element.getDosage().size(); i++) {
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent(t, "MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent", "dosage", element.getDosage().get(i), i);
+ }
+ if (element.hasAdministrationTreatment()) {
+ composeCodeableConcept(t, "MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent", "administrationTreatment", element.getAdministrationTreatment(), -1);
+ }
+ for (int i = 0; i < element.getPatientCharacteristic().size(); i++) {
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent(t, "MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent", "patientCharacteristic", element.getPatientCharacteristic().get(i), i);
+ }
+ }
+
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent(Complex parent, String parentType, String name, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -15334,14 +15630,14 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "dosage", name, element, index);
if (element.hasType()) {
- composeCodeableConcept(t, "MedicationKnowledgeAdministrationGuidelineDosageComponent", "type", element.getType(), -1);
+ composeCodeableConcept(t, "MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent", "type", element.getType(), -1);
}
for (int i = 0; i < element.getDosage().size(); i++) {
- composeDosage(t, "MedicationKnowledgeAdministrationGuidelineDosageComponent", "dosage", element.getDosage().get(i), i);
+ composeDosage(t, "MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent", "dosage", element.getDosage().get(i), i);
}
}
- protected void composeMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent(Complex parent, String parentType, String name, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent element, int index) {
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent(Complex parent, String parentType, String name, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -15352,10 +15648,10 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "patientCharacteristic", name, element, index);
if (element.hasType()) {
- composeCodeableConcept(t, "MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent", "type", element.getType(), -1);
+ composeCodeableConcept(t, "MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent", "type", element.getType(), -1);
}
if (element.hasValue()) {
- composeType(t, "MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent", "value", element.getValue(), -1);
+ composeType(t, "MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent", "value", element.getValue(), -1);
}
}
@@ -15648,6 +15944,12 @@ public class RdfParser extends RdfParserBase {
if (element.hasDispenser()) {
composeReference(t, "MedicationRequestDispenseRequestComponent", "dispenser", element.getDispenser(), -1);
}
+ for (int i = 0; i < element.getDispenserInstruction().size(); i++) {
+ composeAnnotation(t, "MedicationRequestDispenseRequestComponent", "dispenserInstruction", element.getDispenserInstruction().get(i), i);
+ }
+ if (element.hasDoseAdministrationAid()) {
+ composeCodeableConcept(t, "MedicationRequestDispenseRequestComponent", "doseAdministrationAid", element.getDoseAdministrationAid(), -1);
+ }
}
protected void composeMedicationRequestDispenseRequestInitialFillComponent(Complex parent, String parentType, String name, MedicationRequest.MedicationRequestDispenseRequestInitialFillComponent element, int index) {
@@ -15747,8 +16049,8 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getDosage().size(); i++) {
composeDosage(t, "MedicationUsage", "dosage", element.getDosage().get(i), i);
}
- if (element.hasTakenAsOrderedElement()) {
- composeBoolean(t, "MedicationUsage", "takenAsOrdered", element.getTakenAsOrderedElement(), -1);
+ if (element.hasAdherence()) {
+ composeCodeableConcept(t, "MedicationUsage", "adherence", element.getAdherence(), -1);
}
}
@@ -15810,14 +16112,8 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getMarketingStatus().size(); i++) {
composeMarketingStatus(t, "MedicinalProductDefinition", "marketingStatus", element.getMarketingStatus().get(i), i);
}
- for (int i = 0; i < element.getPharmaceuticalProduct().size(); i++) {
- composeReference(t, "MedicinalProductDefinition", "pharmaceuticalProduct", element.getPharmaceuticalProduct().get(i), i);
- }
- for (int i = 0; i < element.getPackagedMedicinalProduct().size(); i++) {
- composeReference(t, "MedicinalProductDefinition", "packagedMedicinalProduct", element.getPackagedMedicinalProduct().get(i), i);
- }
for (int i = 0; i < element.getIngredient().size(); i++) {
- composeReference(t, "MedicinalProductDefinition", "ingredient", element.getIngredient().get(i), i);
+ composeCodeableReference(t, "MedicinalProductDefinition", "ingredient", element.getIngredient().get(i), i);
}
for (int i = 0; i < element.getImpurity().size(); i++) {
composeReference(t, "MedicinalProductDefinition", "impurity", element.getImpurity().get(i), i);
@@ -15840,8 +16136,14 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getCrossReference().size(); i++) {
composeMedicinalProductDefinitionCrossReferenceComponent(t, "MedicinalProductDefinition", "crossReference", element.getCrossReference().get(i), i);
}
- for (int i = 0; i < element.getManufacturingBusinessOperation().size(); i++) {
- composeMedicinalProductDefinitionManufacturingBusinessOperationComponent(t, "MedicinalProductDefinition", "manufacturingBusinessOperation", element.getManufacturingBusinessOperation().get(i), i);
+ for (int i = 0; i < element.getOperation().size(); i++) {
+ composeMedicinalProductDefinitionOperationComponent(t, "MedicinalProductDefinition", "operation", element.getOperation().get(i), i);
+ }
+ for (int i = 0; i < element.getPackage().size(); i++) {
+ composeMedicinalProductDefinitionPackageComponent(t, "MedicinalProductDefinition", "package", element.getPackage().get(i), i);
+ }
+ for (int i = 0; i < element.getAdministrableProduct().size(); i++) {
+ composeMedicinalProductDefinitionAdministrableProductComponent(t, "MedicinalProductDefinition", "administrableProduct", element.getAdministrableProduct().get(i), i);
}
}
@@ -15944,7 +16246,7 @@ public class RdfParser extends RdfParserBase {
}
}
- protected void composeMedicinalProductDefinitionManufacturingBusinessOperationComponent(Complex parent, String parentType, String name, MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent element, int index) {
+ protected void composeMedicinalProductDefinitionOperationComponent(Complex parent, String parentType, String name, MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -15953,21 +16255,60 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "manufacturingBusinessOperation", name, element, index);
+ composeBackboneElement(t, "operation", name, element, index);
if (element.hasType()) {
- composeCodeableReference(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "type", element.getType(), -1);
+ composeCodeableReference(t, "MedicinalProductDefinitionOperationComponent", "type", element.getType(), -1);
}
if (element.hasEffectiveDate()) {
- composePeriod(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "effectiveDate", element.getEffectiveDate(), -1);
+ composePeriod(t, "MedicinalProductDefinitionOperationComponent", "effectiveDate", element.getEffectiveDate(), -1);
}
- for (int i = 0; i < element.getManufacturer().size(); i++) {
- composeReference(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "manufacturer", element.getManufacturer().get(i), i);
+ for (int i = 0; i < element.getOrganization().size(); i++) {
+ composeReference(t, "MedicinalProductDefinitionOperationComponent", "organization", element.getOrganization().get(i), i);
}
if (element.hasAuthorization()) {
- composeReference(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "authorization", element.getAuthorization(), -1);
+ composeReference(t, "MedicinalProductDefinitionOperationComponent", "authorization", element.getAuthorization(), -1);
}
if (element.hasConfidentialityIndicator()) {
- composeCodeableConcept(t, "MedicinalProductDefinitionManufacturingBusinessOperationComponent", "confidentialityIndicator", element.getConfidentialityIndicator(), -1);
+ composeCodeableConcept(t, "MedicinalProductDefinitionOperationComponent", "confidentialityIndicator", element.getConfidentialityIndicator(), -1);
+ }
+ }
+
+ protected void composeMedicinalProductDefinitionPackageComponent(Complex parent, String parentType, String name, MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "package", name, element, index);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "MedicinalProductDefinitionPackageComponent", "type", element.getType(), -1);
+ }
+ if (element.hasSize()) {
+ composeType(t, "MedicinalProductDefinitionPackageComponent", "size", element.getSize(), -1);
+ }
+ if (element.hasPackage()) {
+ composeReference(t, "MedicinalProductDefinitionPackageComponent", "package", element.getPackage(), -1);
+ }
+ }
+
+ protected void composeMedicinalProductDefinitionAdministrableProductComponent(Complex parent, String parentType, String name, MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "administrableProduct", name, element, index);
+ for (int i = 0; i < element.getRoute().size(); i++) {
+ composeCodeableConcept(t, "MedicinalProductDefinitionAdministrableProductComponent", "route", element.getRoute().get(i), i);
+ }
+ if (element.hasProduct()) {
+ composeReference(t, "MedicinalProductDefinitionAdministrableProductComponent", "product", element.getProduct(), -1);
}
}
@@ -16545,6 +16886,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasNameElement()) {
composeString(t, "NamingSystem", "name", element.getNameElement(), -1);
}
+ if (element.hasTitleElement()) {
+ composeString(t, "NamingSystem", "title", element.getTitleElement(), -1);
+ }
if (element.hasStatusElement()) {
composeEnum(t, "NamingSystem", "status", element.getStatusElement(), -1);
}
@@ -16608,6 +16952,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasPeriod()) {
composePeriod(t, "NamingSystemUniqueIdComponent", "period", element.getPeriod(), -1);
}
+ if (element.hasAuthoritativeElement()) {
+ composeBoolean(t, "NamingSystemUniqueIdComponent", "authoritative", element.getAuthoritativeElement(), -1);
+ }
}
protected void composeNutritionIntake(Complex parent, String parentType, String name, NutritionIntake element, int index) {
@@ -17103,6 +17450,9 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getIdentifier().size(); i++) {
composeIdentifier(t, "Observation", "identifier", element.getIdentifier().get(i), i);
}
+ if (element.hasInstantiates()) {
+ composeType(t, "Observation", "instantiates", element.getInstantiates(), -1);
+ }
for (int i = 0; i < element.getBasedOn().size(); i++) {
composeReference(t, "Observation", "basedOn", element.getBasedOn().get(i), i);
}
@@ -17250,24 +17600,18 @@ public class RdfParser extends RdfParserBase {
if (element.hasVersionElement()) {
composeString(t, "ObservationDefinition", "version", element.getVersionElement(), -1);
}
+ if (element.hasNameElement()) {
+ composeString(t, "ObservationDefinition", "name", element.getNameElement(), -1);
+ }
if (element.hasTitleElement()) {
composeString(t, "ObservationDefinition", "title", element.getTitleElement(), -1);
}
- for (int i = 0; i < element.getDerivedFromCanonical().size(); i++) {
- composeCanonical(t, "ObservationDefinition", "derivedFromCanonical", element.getDerivedFromCanonical().get(i), i);
- }
- for (int i = 0; i < element.getDerivedFromUri().size(); i++) {
- composeUri(t, "ObservationDefinition", "derivedFromUri", element.getDerivedFromUri().get(i), i);
- }
if (element.hasStatusElement()) {
composeEnum(t, "ObservationDefinition", "status", element.getStatusElement(), -1);
}
if (element.hasExperimentalElement()) {
composeBoolean(t, "ObservationDefinition", "experimental", element.getExperimentalElement(), -1);
}
- if (element.hasSubject()) {
- composeType(t, "ObservationDefinition", "subject", element.getSubject(), -1);
- }
if (element.hasDateElement()) {
composeDateTime(t, "ObservationDefinition", "date", element.getDateElement(), -1);
}
@@ -17301,6 +17645,15 @@ public class RdfParser extends RdfParserBase {
if (element.hasEffectivePeriod()) {
composePeriod(t, "ObservationDefinition", "effectivePeriod", element.getEffectivePeriod(), -1);
}
+ for (int i = 0; i < element.getDerivedFromCanonical().size(); i++) {
+ composeCanonical(t, "ObservationDefinition", "derivedFromCanonical", element.getDerivedFromCanonical().get(i), i);
+ }
+ for (int i = 0; i < element.getDerivedFromUri().size(); i++) {
+ composeUri(t, "ObservationDefinition", "derivedFromUri", element.getDerivedFromUri().get(i), i);
+ }
+ if (element.hasSubject()) {
+ composeCodeableConcept(t, "ObservationDefinition", "subject", element.getSubject(), -1);
+ }
if (element.hasPerformerType()) {
composeCodeableConcept(t, "ObservationDefinition", "performerType", element.getPerformerType(), -1);
}
@@ -17322,11 +17675,11 @@ public class RdfParser extends RdfParserBase {
if (element.hasMethod()) {
composeCodeableConcept(t, "ObservationDefinition", "method", element.getMethod(), -1);
}
- if (element.hasSpecimen()) {
- composeReference(t, "ObservationDefinition", "specimen", element.getSpecimen(), -1);
+ for (int i = 0; i < element.getSpecimen().size(); i++) {
+ composeReference(t, "ObservationDefinition", "specimen", element.getSpecimen().get(i), i);
}
- if (element.hasDevice()) {
- composeReference(t, "ObservationDefinition", "device", element.getDevice(), -1);
+ for (int i = 0; i < element.getDevice().size(); i++) {
+ composeReference(t, "ObservationDefinition", "device", element.getDevice().get(i), i);
}
if (element.hasPreferredReportNameElement()) {
composeString(t, "ObservationDefinition", "preferredReportName", element.getPreferredReportNameElement(), -1);
@@ -17334,20 +17687,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasQuantitativeDetails()) {
composeObservationDefinitionQuantitativeDetailsComponent(t, "ObservationDefinition", "quantitativeDetails", element.getQuantitativeDetails(), -1);
}
- for (int i = 0; i < element.getQualifiedInterval().size(); i++) {
- composeObservationDefinitionQualifiedIntervalComponent(t, "ObservationDefinition", "qualifiedInterval", element.getQualifiedInterval().get(i), i);
- }
- if (element.hasValidCodedValueSet()) {
- composeReference(t, "ObservationDefinition", "validCodedValueSet", element.getValidCodedValueSet(), -1);
- }
- if (element.hasNormalCodedValueSet()) {
- composeReference(t, "ObservationDefinition", "normalCodedValueSet", element.getNormalCodedValueSet(), -1);
- }
- if (element.hasAbnormalCodedValueSet()) {
- composeReference(t, "ObservationDefinition", "abnormalCodedValueSet", element.getAbnormalCodedValueSet(), -1);
- }
- if (element.hasCriticalCodedValueSet()) {
- composeReference(t, "ObservationDefinition", "criticalCodedValueSet", element.getCriticalCodedValueSet(), -1);
+ for (int i = 0; i < element.getQualifiedValue().size(); i++) {
+ composeObservationDefinitionQualifiedValueComponent(t, "ObservationDefinition", "qualifiedValue", element.getQualifiedValue().get(i), i);
}
for (int i = 0; i < element.getHasMember().size(); i++) {
composeReference(t, "ObservationDefinition", "hasMember", element.getHasMember().get(i), i);
@@ -17367,12 +17708,12 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeBackboneElement(t, "quantitativeDetails", name, element, index);
- if (element.hasCustomaryUnit()) {
- composeCodeableConcept(t, "ObservationDefinitionQuantitativeDetailsComponent", "customaryUnit", element.getCustomaryUnit(), -1);
- }
if (element.hasUnit()) {
composeCodeableConcept(t, "ObservationDefinitionQuantitativeDetailsComponent", "unit", element.getUnit(), -1);
}
+ if (element.hasCustomaryUnit()) {
+ composeCodeableConcept(t, "ObservationDefinitionQuantitativeDetailsComponent", "customaryUnit", element.getCustomaryUnit(), -1);
+ }
if (element.hasConversionFactorElement()) {
composeDecimal(t, "ObservationDefinitionQuantitativeDetailsComponent", "conversionFactor", element.getConversionFactorElement(), -1);
}
@@ -17381,7 +17722,7 @@ public class RdfParser extends RdfParserBase {
}
}
- protected void composeObservationDefinitionQualifiedIntervalComponent(Complex parent, String parentType, String name, ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent element, int index) {
+ protected void composeObservationDefinitionQualifiedValueComponent(Complex parent, String parentType, String name, ObservationDefinition.ObservationDefinitionQualifiedValueComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -17390,30 +17731,42 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "qualifiedInterval", name, element, index);
- if (element.hasCategoryElement()) {
- composeEnum(t, "ObservationDefinitionQualifiedIntervalComponent", "category", element.getCategoryElement(), -1);
- }
- if (element.hasRange()) {
- composeRange(t, "ObservationDefinitionQualifiedIntervalComponent", "range", element.getRange(), -1);
- }
+ composeBackboneElement(t, "qualifiedValue", name, element, index);
if (element.hasContext()) {
- composeCodeableConcept(t, "ObservationDefinitionQualifiedIntervalComponent", "context", element.getContext(), -1);
+ composeCodeableConcept(t, "ObservationDefinitionQualifiedValueComponent", "context", element.getContext(), -1);
}
for (int i = 0; i < element.getAppliesTo().size(); i++) {
- composeCodeableConcept(t, "ObservationDefinitionQualifiedIntervalComponent", "appliesTo", element.getAppliesTo().get(i), i);
+ composeCodeableConcept(t, "ObservationDefinitionQualifiedValueComponent", "appliesTo", element.getAppliesTo().get(i), i);
}
if (element.hasGenderElement()) {
- composeEnum(t, "ObservationDefinitionQualifiedIntervalComponent", "gender", element.getGenderElement(), -1);
+ composeEnum(t, "ObservationDefinitionQualifiedValueComponent", "gender", element.getGenderElement(), -1);
}
if (element.hasAge()) {
- composeRange(t, "ObservationDefinitionQualifiedIntervalComponent", "age", element.getAge(), -1);
+ composeRange(t, "ObservationDefinitionQualifiedValueComponent", "age", element.getAge(), -1);
}
if (element.hasGestationalAge()) {
- composeRange(t, "ObservationDefinitionQualifiedIntervalComponent", "gestationalAge", element.getGestationalAge(), -1);
+ composeRange(t, "ObservationDefinitionQualifiedValueComponent", "gestationalAge", element.getGestationalAge(), -1);
}
if (element.hasConditionElement()) {
- composeString(t, "ObservationDefinitionQualifiedIntervalComponent", "condition", element.getConditionElement(), -1);
+ composeString(t, "ObservationDefinitionQualifiedValueComponent", "condition", element.getConditionElement(), -1);
+ }
+ if (element.hasRangeCategoryElement()) {
+ composeEnum(t, "ObservationDefinitionQualifiedValueComponent", "rangeCategory", element.getRangeCategoryElement(), -1);
+ }
+ if (element.hasRange()) {
+ composeRange(t, "ObservationDefinitionQualifiedValueComponent", "range", element.getRange(), -1);
+ }
+ if (element.hasValidCodedValueSetElement()) {
+ composeCanonical(t, "ObservationDefinitionQualifiedValueComponent", "validCodedValueSet", element.getValidCodedValueSetElement(), -1);
+ }
+ if (element.hasNormalCodedValueSetElement()) {
+ composeCanonical(t, "ObservationDefinitionQualifiedValueComponent", "normalCodedValueSet", element.getNormalCodedValueSetElement(), -1);
+ }
+ if (element.hasAbnormalCodedValueSetElement()) {
+ composeCanonical(t, "ObservationDefinitionQualifiedValueComponent", "abnormalCodedValueSet", element.getAbnormalCodedValueSetElement(), -1);
+ }
+ if (element.hasCriticalCodedValueSetElement()) {
+ composeCanonical(t, "ObservationDefinitionQualifiedValueComponent", "criticalCodedValueSet", element.getCriticalCodedValueSetElement(), -1);
}
}
@@ -17436,8 +17789,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasQuantitativeDetails()) {
composeObservationDefinitionQuantitativeDetailsComponent(t, "ObservationDefinitionComponentComponent", "quantitativeDetails", element.getQuantitativeDetails(), -1);
}
- for (int i = 0; i < element.getQualifiedInterval().size(); i++) {
- composeObservationDefinitionQualifiedIntervalComponent(t, "ObservationDefinitionComponentComponent", "qualifiedInterval", element.getQualifiedInterval().get(i), i);
+ for (int i = 0; i < element.getQualifiedValue().size(); i++) {
+ composeObservationDefinitionQualifiedValueComponent(t, "ObservationDefinitionComponentComponent", "qualifiedValue", element.getQualifiedValue().get(i), i);
}
}
@@ -17817,6 +18170,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasStatusDateElement()) {
composeDateTime(t, "PackagedProductDefinition", "statusDate", element.getStatusDateElement(), -1);
}
+ for (int i = 0; i < element.getContainedItemQuantity().size(); i++) {
+ composeQuantity(t, "PackagedProductDefinition", "containedItemQuantity", element.getContainedItemQuantity().get(i), i);
+ }
if (element.hasDescriptionElement()) {
composeMarkdown(t, "PackagedProductDefinition", "description", element.getDescriptionElement(), -1);
}
@@ -17838,29 +18194,11 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getManufacturer().size(); i++) {
composeReference(t, "PackagedProductDefinition", "manufacturer", element.getManufacturer().get(i), i);
}
- for (int i = 0; i < element.getBatchIdentifier().size(); i++) {
- composePackagedProductDefinitionBatchIdentifierComponent(t, "PackagedProductDefinition", "batchIdentifier", element.getBatchIdentifier().get(i), i);
+ for (int i = 0; i < element.getAttachedDocument().size(); i++) {
+ composeReference(t, "PackagedProductDefinition", "attachedDocument", element.getAttachedDocument().get(i), i);
}
- for (int i = 0; i < element.getPackage().size(); i++) {
- composePackagedProductDefinitionPackageComponent(t, "PackagedProductDefinition", "package", element.getPackage().get(i), i);
- }
- }
-
- protected void composePackagedProductDefinitionBatchIdentifierComponent(Complex parent, String parentType, String name, PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "batchIdentifier", name, element, index);
- if (element.hasOuterPackaging()) {
- composeIdentifier(t, "PackagedProductDefinitionBatchIdentifierComponent", "outerPackaging", element.getOuterPackaging(), -1);
- }
- if (element.hasImmediatePackaging()) {
- composeIdentifier(t, "PackagedProductDefinitionBatchIdentifierComponent", "immediatePackaging", element.getImmediatePackaging(), -1);
+ if (element.hasPackage()) {
+ composePackagedProductDefinitionPackageComponent(t, "PackagedProductDefinition", "package", element.getPackage(), -1);
}
}
@@ -17935,7 +18273,7 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "containedItem", name, element, index);
for (int i = 0; i < element.getItem().size(); i++) {
- composeReference(t, "PackagedProductDefinitionPackageContainedItemComponent", "item", element.getItem().get(i), i);
+ composeCodeableReference(t, "PackagedProductDefinitionPackageContainedItemComponent", "item", element.getItem().get(i), i);
}
if (element.hasAmount()) {
composeType(t, "PackagedProductDefinitionPackageContainedItemComponent", "amount", element.getAmount(), -1);
@@ -18516,6 +18854,9 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getGoal().size(); i++) {
composePlanDefinitionGoalComponent(t, "PlanDefinition", "goal", element.getGoal().get(i), i);
}
+ for (int i = 0; i < element.getActor().size(); i++) {
+ composePlanDefinitionActorComponent(t, "PlanDefinition", "actor", element.getActor().get(i), i);
+ }
for (int i = 0; i < element.getAction().size(); i++) {
composePlanDefinitionActionComponent(t, "PlanDefinition", "action", element.getAction().get(i), i);
}
@@ -18575,6 +18916,48 @@ public class RdfParser extends RdfParserBase {
}
}
+ protected void composePlanDefinitionActorComponent(Complex parent, String parentType, String name, PlanDefinition.PlanDefinitionActorComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "actor", name, element, index);
+ if (element.hasTitleElement()) {
+ composeString(t, "PlanDefinitionActorComponent", "title", element.getTitleElement(), -1);
+ }
+ if (element.hasDescriptionElement()) {
+ composeMarkdown(t, "PlanDefinitionActorComponent", "description", element.getDescriptionElement(), -1);
+ }
+ for (int i = 0; i < element.getOption().size(); i++) {
+ composePlanDefinitionActorOptionComponent(t, "PlanDefinitionActorComponent", "option", element.getOption().get(i), i);
+ }
+ }
+
+ protected void composePlanDefinitionActorOptionComponent(Complex parent, String parentType, String name, PlanDefinition.PlanDefinitionActorOptionComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "option", name, element, index);
+ if (element.hasTypeElement()) {
+ composeEnum(t, "PlanDefinitionActorOptionComponent", "type", element.getTypeElement(), -1);
+ }
+ if (element.hasTypeReference()) {
+ composeReference(t, "PlanDefinitionActorOptionComponent", "typeReference", element.getTypeReference(), -1);
+ }
+ if (element.hasRole()) {
+ composeCodeableConcept(t, "PlanDefinitionActorOptionComponent", "role", element.getRole(), -1);
+ }
+ }
+
protected void composePlanDefinitionActionComponent(Complex parent, String parentType, String name, PlanDefinition.PlanDefinitionActionComponent element, int index) {
if (element == null)
return;
@@ -18600,8 +18983,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasPriorityElement()) {
composeEnum(t, "PlanDefinitionActionComponent", "priority", element.getPriorityElement(), -1);
}
- for (int i = 0; i < element.getCode().size(); i++) {
- composeCodeableConcept(t, "PlanDefinitionActionComponent", "code", element.getCode().get(i), i);
+ if (element.hasCode()) {
+ composeCodeableConcept(t, "PlanDefinitionActionComponent", "code", element.getCode(), -1);
}
for (int i = 0; i < element.getReason().size(); i++) {
composeCodeableConcept(t, "PlanDefinitionActionComponent", "reason", element.getReason().get(i), i);
@@ -18622,10 +19005,10 @@ public class RdfParser extends RdfParserBase {
composePlanDefinitionActionConditionComponent(t, "PlanDefinitionActionComponent", "condition", element.getCondition().get(i), i);
}
for (int i = 0; i < element.getInput().size(); i++) {
- composeDataRequirement(t, "PlanDefinitionActionComponent", "input", element.getInput().get(i), i);
+ composePlanDefinitionActionInputComponent(t, "PlanDefinitionActionComponent", "input", element.getInput().get(i), i);
}
for (int i = 0; i < element.getOutput().size(); i++) {
- composeDataRequirement(t, "PlanDefinitionActionComponent", "output", element.getOutput().get(i), i);
+ composePlanDefinitionActionOutputComponent(t, "PlanDefinitionActionComponent", "output", element.getOutput().get(i), i);
}
for (int i = 0; i < element.getRelatedAction().size(); i++) {
composePlanDefinitionActionRelatedActionComponent(t, "PlanDefinitionActionComponent", "relatedAction", element.getRelatedAction().get(i), i);
@@ -18633,6 +19016,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasTiming()) {
composeType(t, "PlanDefinitionActionComponent", "timing", element.getTiming(), -1);
}
+ if (element.hasLocation()) {
+ composeCodeableReference(t, "PlanDefinitionActionComponent", "location", element.getLocation(), -1);
+ }
for (int i = 0; i < element.getParticipant().size(); i++) {
composePlanDefinitionActionParticipantComponent(t, "PlanDefinitionActionComponent", "participant", element.getParticipant().get(i), i);
}
@@ -18686,6 +19072,48 @@ public class RdfParser extends RdfParserBase {
}
}
+ protected void composePlanDefinitionActionInputComponent(Complex parent, String parentType, String name, PlanDefinition.PlanDefinitionActionInputComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "input", name, element, index);
+ if (element.hasTitleElement()) {
+ composeString(t, "PlanDefinitionActionInputComponent", "title", element.getTitleElement(), -1);
+ }
+ if (element.hasRequirement()) {
+ composeDataRequirement(t, "PlanDefinitionActionInputComponent", "requirement", element.getRequirement(), -1);
+ }
+ if (element.hasRelatedDataElement()) {
+ composeId(t, "PlanDefinitionActionInputComponent", "relatedData", element.getRelatedDataElement(), -1);
+ }
+ }
+
+ protected void composePlanDefinitionActionOutputComponent(Complex parent, String parentType, String name, PlanDefinition.PlanDefinitionActionOutputComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "output", name, element, index);
+ if (element.hasTitleElement()) {
+ composeString(t, "PlanDefinitionActionOutputComponent", "title", element.getTitleElement(), -1);
+ }
+ if (element.hasRequirement()) {
+ composeDataRequirement(t, "PlanDefinitionActionOutputComponent", "requirement", element.getRequirement(), -1);
+ }
+ if (element.hasRelatedDataElement()) {
+ composeString(t, "PlanDefinitionActionOutputComponent", "relatedData", element.getRelatedDataElement(), -1);
+ }
+ }
+
protected void composePlanDefinitionActionRelatedActionComponent(Complex parent, String parentType, String name, PlanDefinition.PlanDefinitionActionRelatedActionComponent element, int index) {
if (element == null)
return;
@@ -18696,8 +19124,8 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeBackboneElement(t, "relatedAction", name, element, index);
- if (element.hasActionIdElement()) {
- composeId(t, "PlanDefinitionActionRelatedActionComponent", "actionId", element.getActionIdElement(), -1);
+ if (element.hasTargetIdElement()) {
+ composeId(t, "PlanDefinitionActionRelatedActionComponent", "targetId", element.getTargetIdElement(), -1);
}
if (element.hasRelationshipElement()) {
composeEnum(t, "PlanDefinitionActionRelatedActionComponent", "relationship", element.getRelationshipElement(), -1);
@@ -18717,12 +19145,21 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeBackboneElement(t, "participant", name, element, index);
+ if (element.hasActorIdElement()) {
+ composeString(t, "PlanDefinitionActionParticipantComponent", "actorId", element.getActorIdElement(), -1);
+ }
if (element.hasTypeElement()) {
composeEnum(t, "PlanDefinitionActionParticipantComponent", "type", element.getTypeElement(), -1);
}
+ if (element.hasTypeReference()) {
+ composeReference(t, "PlanDefinitionActionParticipantComponent", "typeReference", element.getTypeReference(), -1);
+ }
if (element.hasRole()) {
composeCodeableConcept(t, "PlanDefinitionActionParticipantComponent", "role", element.getRole(), -1);
}
+ if (element.hasFunction()) {
+ composeCodeableConcept(t, "PlanDefinitionActionParticipantComponent", "function", element.getFunction(), -1);
+ }
}
protected void composePlanDefinitionActionDynamicValueComponent(Complex parent, String parentType, String name, PlanDefinition.PlanDefinitionActionDynamicValueComponent element, int index) {
@@ -18996,6 +19433,9 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getUsed().size(); i++) {
composeCodeableReference(t, "Procedure", "used", element.getUsed().get(i), i);
}
+ for (int i = 0; i < element.getSupportingInfo().size(); i++) {
+ composeReference(t, "Procedure", "supportingInfo", element.getSupportingInfo().get(i), i);
+ }
}
protected void composeProcedurePerformerComponent(Complex parent, String parentType, String name, Procedure.ProcedurePerformerComponent element, int index) {
@@ -19068,6 +19508,12 @@ public class RdfParser extends RdfParserBase {
if (element.hasActivity()) {
composeCodeableConcept(t, "Provenance", "activity", element.getActivity(), -1);
}
+ for (int i = 0; i < element.getBasedOn().size(); i++) {
+ composeReference(t, "Provenance", "basedOn", element.getBasedOn().get(i), i);
+ }
+ if (element.hasEncounter()) {
+ composeReference(t, "Provenance", "encounter", element.getEncounter(), -1);
+ }
for (int i = 0; i < element.getAgent().size(); i++) {
composeProvenanceAgentComponent(t, "Provenance", "agent", element.getAgent().get(i), i);
}
@@ -19225,7 +19671,7 @@ public class RdfParser extends RdfParserBase {
composeString(t, "QuestionnaireItemComponent", "prefix", element.getPrefixElement(), -1);
}
if (element.hasTextElement()) {
- composeString(t, "QuestionnaireItemComponent", "text", element.getTextElement(), -1);
+ composeMarkdown(t, "QuestionnaireItemComponent", "text", element.getTextElement(), -1);
}
if (element.hasTypeElement()) {
composeEnum(t, "QuestionnaireItemComponent", "type", element.getTypeElement(), -1);
@@ -19236,6 +19682,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasEnableBehaviorElement()) {
composeEnum(t, "QuestionnaireItemComponent", "enableBehavior", element.getEnableBehaviorElement(), -1);
}
+ if (element.hasDisabledDisplayElement()) {
+ composeEnum(t, "QuestionnaireItemComponent", "disabledDisplay", element.getDisabledDisplayElement(), -1);
+ }
if (element.hasRequiredElement()) {
composeBoolean(t, "QuestionnaireItemComponent", "required", element.getRequiredElement(), -1);
}
@@ -19248,6 +19697,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasMaxLengthElement()) {
composeInteger(t, "QuestionnaireItemComponent", "maxLength", element.getMaxLengthElement(), -1);
}
+ if (element.hasAnswerConstraintElement()) {
+ composeEnum(t, "QuestionnaireItemComponent", "answerConstraint", element.getAnswerConstraintElement(), -1);
+ }
if (element.hasAnswerValueSetElement()) {
composeCanonical(t, "QuestionnaireItemComponent", "answerValueSet", element.getAnswerValueSetElement(), -1);
}
@@ -19441,7 +19893,7 @@ public class RdfParser extends RdfParserBase {
composePeriod(t, "RegulatedAuthorization", "validityPeriod", element.getValidityPeriod(), -1);
}
if (element.hasIndication()) {
- composeType(t, "RegulatedAuthorization", "indication", element.getIndication(), -1);
+ composeCodeableReference(t, "RegulatedAuthorization", "indication", element.getIndication(), -1);
}
if (element.hasIntendedUse()) {
composeCodeableConcept(t, "RegulatedAuthorization", "intendedUse", element.getIntendedUse(), -1);
@@ -19461,6 +19913,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasRegulator()) {
composeReference(t, "RegulatedAuthorization", "regulator", element.getRegulator(), -1);
}
+ for (int i = 0; i < element.getAttachedDocument().size(); i++) {
+ composeReference(t, "RegulatedAuthorization", "attachedDocument", element.getAttachedDocument().get(i), i);
+ }
if (element.hasCase()) {
composeRegulatedAuthorizationCaseComponent(t, "RegulatedAuthorization", "case", element.getCase(), -1);
}
@@ -19680,8 +20135,11 @@ public class RdfParser extends RdfParserBase {
if (element.hasTiming()) {
composeType(t, "RequestGroupActionComponent", "timing", element.getTiming(), -1);
}
+ if (element.hasLocation()) {
+ composeCodeableReference(t, "RequestGroupActionComponent", "location", element.getLocation(), -1);
+ }
for (int i = 0; i < element.getParticipant().size(); i++) {
- composeReference(t, "RequestGroupActionComponent", "participant", element.getParticipant().get(i), i);
+ composeRequestGroupActionParticipantComponent(t, "RequestGroupActionComponent", "participant", element.getParticipant().get(i), i);
}
if (element.hasType()) {
composeCodeableConcept(t, "RequestGroupActionComponent", "type", element.getType(), -1);
@@ -19737,8 +20195,8 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeBackboneElement(t, "relatedAction", name, element, index);
- if (element.hasActionIdElement()) {
- composeId(t, "RequestGroupActionRelatedActionComponent", "actionId", element.getActionIdElement(), -1);
+ if (element.hasTargetIdElement()) {
+ composeId(t, "RequestGroupActionRelatedActionComponent", "targetId", element.getTargetIdElement(), -1);
}
if (element.hasRelationshipElement()) {
composeEnum(t, "RequestGroupActionRelatedActionComponent", "relationship", element.getRelationshipElement(), -1);
@@ -19748,6 +20206,33 @@ public class RdfParser extends RdfParserBase {
}
}
+ protected void composeRequestGroupActionParticipantComponent(Complex parent, String parentType, String name, RequestGroup.RequestGroupActionParticipantComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "participant", name, element, index);
+ if (element.hasTypeElement()) {
+ composeEnum(t, "RequestGroupActionParticipantComponent", "type", element.getTypeElement(), -1);
+ }
+ if (element.hasTypeReference()) {
+ composeReference(t, "RequestGroupActionParticipantComponent", "typeReference", element.getTypeReference(), -1);
+ }
+ if (element.hasRole()) {
+ composeCodeableConcept(t, "RequestGroupActionParticipantComponent", "role", element.getRole(), -1);
+ }
+ if (element.hasFunction()) {
+ composeCodeableConcept(t, "RequestGroupActionParticipantComponent", "function", element.getFunction(), -1);
+ }
+ if (element.hasActor()) {
+ composeReference(t, "RequestGroupActionParticipantComponent", "actor", element.getActor(), -1);
+ }
+ }
+
protected void composeResearchStudy(Complex parent, String parentType, String name, ResearchStudy element, int index) {
if (element == null)
return;
@@ -19758,18 +20243,36 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeDomainResource(t, "ResearchStudy", name, element, index);
+ if (element.hasUrlElement()) {
+ composeUri(t, "ResearchStudy", "url", element.getUrlElement(), -1);
+ }
for (int i = 0; i < element.getIdentifier().size(); i++) {
composeIdentifier(t, "ResearchStudy", "identifier", element.getIdentifier().get(i), i);
}
+ if (element.hasVersionElement()) {
+ composeString(t, "ResearchStudy", "version", element.getVersionElement(), -1);
+ }
+ if (element.hasNameElement()) {
+ composeString(t, "ResearchStudy", "name", element.getNameElement(), -1);
+ }
if (element.hasTitleElement()) {
composeString(t, "ResearchStudy", "title", element.getTitleElement(), -1);
}
+ for (int i = 0; i < element.getLabel().size(); i++) {
+ composeResearchStudyLabelComponent(t, "ResearchStudy", "label", element.getLabel().get(i), i);
+ }
for (int i = 0; i < element.getProtocol().size(); i++) {
composeReference(t, "ResearchStudy", "protocol", element.getProtocol().get(i), i);
}
for (int i = 0; i < element.getPartOf().size(); i++) {
composeReference(t, "ResearchStudy", "partOf", element.getPartOf().get(i), i);
}
+ for (int i = 0; i < element.getRelatedArtifact().size(); i++) {
+ composeRelatedArtifact(t, "ResearchStudy", "relatedArtifact", element.getRelatedArtifact().get(i), i);
+ }
+ if (element.hasDateElement()) {
+ composeDateTime(t, "ResearchStudy", "date", element.getDateElement(), -1);
+ }
if (element.hasStatusElement()) {
composeEnum(t, "ResearchStudy", "status", element.getStatusElement(), -1);
}
@@ -19783,32 +20286,29 @@ public class RdfParser extends RdfParserBase {
composeCodeableConcept(t, "ResearchStudy", "category", element.getCategory().get(i), i);
}
for (int i = 0; i < element.getFocus().size(); i++) {
- composeCodeableConcept(t, "ResearchStudy", "focus", element.getFocus().get(i), i);
+ composeResearchStudyFocusComponent(t, "ResearchStudy", "focus", element.getFocus().get(i), i);
}
for (int i = 0; i < element.getCondition().size(); i++) {
composeCodeableConcept(t, "ResearchStudy", "condition", element.getCondition().get(i), i);
}
- for (int i = 0; i < element.getContact().size(); i++) {
- composeContactDetail(t, "ResearchStudy", "contact", element.getContact().get(i), i);
- }
- for (int i = 0; i < element.getRelatedArtifact().size(); i++) {
- composeRelatedArtifact(t, "ResearchStudy", "relatedArtifact", element.getRelatedArtifact().get(i), i);
- }
for (int i = 0; i < element.getKeyword().size(); i++) {
composeCodeableConcept(t, "ResearchStudy", "keyword", element.getKeyword().get(i), i);
}
for (int i = 0; i < element.getLocation().size(); i++) {
composeCodeableConcept(t, "ResearchStudy", "location", element.getLocation().get(i), i);
}
+ if (element.hasDescriptionSummaryElement()) {
+ composeMarkdown(t, "ResearchStudy", "descriptionSummary", element.getDescriptionSummaryElement(), -1);
+ }
if (element.hasDescriptionElement()) {
composeMarkdown(t, "ResearchStudy", "description", element.getDescriptionElement(), -1);
}
- for (int i = 0; i < element.getEnrollment().size(); i++) {
- composeReference(t, "ResearchStudy", "enrollment", element.getEnrollment().get(i), i);
- }
if (element.hasPeriod()) {
composePeriod(t, "ResearchStudy", "period", element.getPeriod(), -1);
}
+ for (int i = 0; i < element.getContact().size(); i++) {
+ composeContactDetail(t, "ResearchStudy", "contact", element.getContact().get(i), i);
+ }
if (element.hasSponsor()) {
composeReference(t, "ResearchStudy", "sponsor", element.getSponsor(), -1);
}
@@ -19818,21 +20318,45 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getSite().size(); i++) {
composeReference(t, "ResearchStudy", "site", element.getSite().get(i), i);
}
- if (element.hasReasonStopped()) {
- composeCodeableConcept(t, "ResearchStudy", "reasonStopped", element.getReasonStopped(), -1);
- }
for (int i = 0; i < element.getNote().size(); i++) {
composeAnnotation(t, "ResearchStudy", "note", element.getNote().get(i), i);
}
- for (int i = 0; i < element.getArm().size(); i++) {
- composeResearchStudyArmComponent(t, "ResearchStudy", "arm", element.getArm().get(i), i);
+ for (int i = 0; i < element.getClassification().size(); i++) {
+ composeResearchStudyClassificationComponent(t, "ResearchStudy", "classification", element.getClassification().get(i), i);
+ }
+ for (int i = 0; i < element.getAssociatedParty().size(); i++) {
+ composeResearchStudyAssociatedPartyComponent(t, "ResearchStudy", "associatedParty", element.getAssociatedParty().get(i), i);
+ }
+ for (int i = 0; i < element.getCurrentState().size(); i++) {
+ composeCodeableConcept(t, "ResearchStudy", "currentState", element.getCurrentState().get(i), i);
+ }
+ for (int i = 0; i < element.getStatusDate().size(); i++) {
+ composeResearchStudyStatusDateComponent(t, "ResearchStudy", "statusDate", element.getStatusDate().get(i), i);
+ }
+ if (element.hasWhyStopped()) {
+ composeCodeableConcept(t, "ResearchStudy", "whyStopped", element.getWhyStopped(), -1);
+ }
+ if (element.hasRecruitment()) {
+ composeResearchStudyRecruitmentComponent(t, "ResearchStudy", "recruitment", element.getRecruitment(), -1);
+ }
+ for (int i = 0; i < element.getComparisonGroup().size(); i++) {
+ composeResearchStudyComparisonGroupComponent(t, "ResearchStudy", "comparisonGroup", element.getComparisonGroup().get(i), i);
}
for (int i = 0; i < element.getObjective().size(); i++) {
composeResearchStudyObjectiveComponent(t, "ResearchStudy", "objective", element.getObjective().get(i), i);
}
+ for (int i = 0; i < element.getOutcomeMeasure().size(); i++) {
+ composeResearchStudyOutcomeMeasureComponent(t, "ResearchStudy", "outcomeMeasure", element.getOutcomeMeasure().get(i), i);
+ }
+ for (int i = 0; i < element.getResult().size(); i++) {
+ composeReference(t, "ResearchStudy", "result", element.getResult().get(i), i);
+ }
+ for (int i = 0; i < element.getWebLocation().size(); i++) {
+ composeResearchStudyWebLocationComponent(t, "ResearchStudy", "webLocation", element.getWebLocation().get(i), i);
+ }
}
- protected void composeResearchStudyArmComponent(Complex parent, String parentType, String name, ResearchStudy.ResearchStudyArmComponent element, int index) {
+ protected void composeResearchStudyLabelComponent(Complex parent, String parentType, String name, ResearchStudy.ResearchStudyLabelComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -19841,15 +20365,150 @@ public class RdfParser extends RdfParserBase {
else {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
- composeBackboneElement(t, "arm", name, element, index);
+ composeBackboneElement(t, "label", name, element, index);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "ResearchStudyLabelComponent", "type", element.getType(), -1);
+ }
+ if (element.hasValueElement()) {
+ composeString(t, "ResearchStudyLabelComponent", "value", element.getValueElement(), -1);
+ }
+ }
+
+ protected void composeResearchStudyFocusComponent(Complex parent, String parentType, String name, ResearchStudy.ResearchStudyFocusComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "focus", name, element, index);
+ if (element.hasProductCode()) {
+ composeCodeableConcept(t, "ResearchStudyFocusComponent", "productCode", element.getProductCode(), -1);
+ }
+ for (int i = 0; i < element.getFocusType().size(); i++) {
+ composeCodeableConcept(t, "ResearchStudyFocusComponent", "focusType", element.getFocusType().get(i), i);
+ }
+ if (element.hasFactorElement()) {
+ composeMarkdown(t, "ResearchStudyFocusComponent", "factor", element.getFactorElement(), -1);
+ }
+ }
+
+ protected void composeResearchStudyClassificationComponent(Complex parent, String parentType, String name, ResearchStudy.ResearchStudyClassificationComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "classification", name, element, index);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "ResearchStudyClassificationComponent", "type", element.getType(), -1);
+ }
+ for (int i = 0; i < element.getClassifier().size(); i++) {
+ composeCodeableConcept(t, "ResearchStudyClassificationComponent", "classifier", element.getClassifier().get(i), i);
+ }
+ }
+
+ protected void composeResearchStudyAssociatedPartyComponent(Complex parent, String parentType, String name, ResearchStudy.ResearchStudyAssociatedPartyComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "associatedParty", name, element, index);
if (element.hasNameElement()) {
- composeString(t, "ResearchStudyArmComponent", "name", element.getNameElement(), -1);
+ composeString(t, "ResearchStudyAssociatedPartyComponent", "name", element.getNameElement(), -1);
+ }
+ if (element.hasRole()) {
+ composeCodeableConcept(t, "ResearchStudyAssociatedPartyComponent", "role", element.getRole(), -1);
+ }
+ for (int i = 0; i < element.getClassifier().size(); i++) {
+ composeCodeableConcept(t, "ResearchStudyAssociatedPartyComponent", "classifier", element.getClassifier().get(i), i);
+ }
+ if (element.hasParty()) {
+ composeReference(t, "ResearchStudyAssociatedPartyComponent", "party", element.getParty(), -1);
+ }
+ }
+
+ protected void composeResearchStudyStatusDateComponent(Complex parent, String parentType, String name, ResearchStudy.ResearchStudyStatusDateComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "statusDate", name, element, index);
+ if (element.hasActivity()) {
+ composeCodeableConcept(t, "ResearchStudyStatusDateComponent", "activity", element.getActivity(), -1);
+ }
+ if (element.hasActualElement()) {
+ composeBoolean(t, "ResearchStudyStatusDateComponent", "actual", element.getActualElement(), -1);
+ }
+ if (element.hasPeriod()) {
+ composePeriod(t, "ResearchStudyStatusDateComponent", "period", element.getPeriod(), -1);
+ }
+ }
+
+ protected void composeResearchStudyRecruitmentComponent(Complex parent, String parentType, String name, ResearchStudy.ResearchStudyRecruitmentComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "recruitment", name, element, index);
+ if (element.hasTargetNumberElement()) {
+ composeUnsignedInt(t, "ResearchStudyRecruitmentComponent", "targetNumber", element.getTargetNumberElement(), -1);
+ }
+ if (element.hasActualNumberElement()) {
+ composeUnsignedInt(t, "ResearchStudyRecruitmentComponent", "actualNumber", element.getActualNumberElement(), -1);
+ }
+ if (element.hasEligibility()) {
+ composeReference(t, "ResearchStudyRecruitmentComponent", "eligibility", element.getEligibility(), -1);
+ }
+ if (element.hasActualGroup()) {
+ composeReference(t, "ResearchStudyRecruitmentComponent", "actualGroup", element.getActualGroup(), -1);
+ }
+ }
+
+ protected void composeResearchStudyComparisonGroupComponent(Complex parent, String parentType, String name, ResearchStudy.ResearchStudyComparisonGroupComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "comparisonGroup", name, element, index);
+ if (element.hasIdentifier()) {
+ composeType(t, "ResearchStudyComparisonGroupComponent", "identifier", element.getIdentifier(), -1);
+ }
+ if (element.hasNameElement()) {
+ composeString(t, "ResearchStudyComparisonGroupComponent", "name", element.getNameElement(), -1);
}
if (element.hasType()) {
- composeCodeableConcept(t, "ResearchStudyArmComponent", "type", element.getType(), -1);
+ composeCodeableConcept(t, "ResearchStudyComparisonGroupComponent", "type", element.getType(), -1);
}
if (element.hasDescriptionElement()) {
- composeString(t, "ResearchStudyArmComponent", "description", element.getDescriptionElement(), -1);
+ composeMarkdown(t, "ResearchStudyComparisonGroupComponent", "description", element.getDescriptionElement(), -1);
+ }
+ for (int i = 0; i < element.getIntendedExposure().size(); i++) {
+ composeReference(t, "ResearchStudyComparisonGroupComponent", "intendedExposure", element.getIntendedExposure().get(i), i);
+ }
+ if (element.hasObservedGroup()) {
+ composeReference(t, "ResearchStudyComparisonGroupComponent", "observedGroup", element.getObservedGroup(), -1);
}
}
@@ -19869,6 +20528,51 @@ public class RdfParser extends RdfParserBase {
if (element.hasType()) {
composeCodeableConcept(t, "ResearchStudyObjectiveComponent", "type", element.getType(), -1);
}
+ if (element.hasDescriptionElement()) {
+ composeMarkdown(t, "ResearchStudyObjectiveComponent", "description", element.getDescriptionElement(), -1);
+ }
+ }
+
+ protected void composeResearchStudyOutcomeMeasureComponent(Complex parent, String parentType, String name, ResearchStudy.ResearchStudyOutcomeMeasureComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "outcomeMeasure", name, element, index);
+ if (element.hasNameElement()) {
+ composeString(t, "ResearchStudyOutcomeMeasureComponent", "name", element.getNameElement(), -1);
+ }
+ for (int i = 0; i < element.getType().size(); i++) {
+ composeCodeableConcept(t, "ResearchStudyOutcomeMeasureComponent", "type", element.getType().get(i), i);
+ }
+ if (element.hasDescriptionElement()) {
+ composeMarkdown(t, "ResearchStudyOutcomeMeasureComponent", "description", element.getDescriptionElement(), -1);
+ }
+ if (element.hasReference()) {
+ composeReference(t, "ResearchStudyOutcomeMeasureComponent", "reference", element.getReference(), -1);
+ }
+ }
+
+ protected void composeResearchStudyWebLocationComponent(Complex parent, String parentType, String name, ResearchStudy.ResearchStudyWebLocationComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "webLocation", name, element, index);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "ResearchStudyWebLocationComponent", "type", element.getType(), -1);
+ }
+ if (element.hasUrlElement()) {
+ composeUri(t, "ResearchStudyWebLocationComponent", "url", element.getUrlElement(), -1);
+ }
}
protected void composeResearchSubject(Complex parent, String parentType, String name, ResearchSubject element, int index) {
@@ -19896,8 +20600,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasStudy()) {
composeReference(t, "ResearchSubject", "study", element.getStudy(), -1);
}
- if (element.hasIndividual()) {
- composeReference(t, "ResearchSubject", "individual", element.getIndividual(), -1);
+ if (element.hasSubject()) {
+ composeReference(t, "ResearchSubject", "subject", element.getSubject(), -1);
}
if (element.hasAssignedArmElement()) {
composeString(t, "ResearchSubject", "assignedArm", element.getAssignedArmElement(), -1);
@@ -19923,8 +20627,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasType()) {
composeCodeableConcept(t, "ResearchSubjectProgressComponent", "type", element.getType(), -1);
}
- if (element.hasState()) {
- composeCodeableConcept(t, "ResearchSubjectProgressComponent", "state", element.getState(), -1);
+ if (element.hasSubjectState()) {
+ composeCodeableConcept(t, "ResearchSubjectProgressComponent", "subjectState", element.getSubjectState(), -1);
}
if (element.hasMilestone()) {
composeCodeableConcept(t, "ResearchSubjectProgressComponent", "milestone", element.getMilestone(), -1);
@@ -19935,6 +20639,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasStartDateElement()) {
composeDateTime(t, "ResearchSubjectProgressComponent", "startDate", element.getStartDateElement(), -1);
}
+ if (element.hasEndDateElement()) {
+ composeDateTime(t, "ResearchSubjectProgressComponent", "endDate", element.getEndDateElement(), -1);
+ }
}
protected void composeRiskAssessment(Complex parent, String parentType, String name, RiskAssessment element, int index) {
@@ -21060,9 +21767,6 @@ public class RdfParser extends RdfParserBase {
if (element.hasContextElement()) {
composeId(t, "StructureMapGroupRuleTargetComponent", "context", element.getContextElement(), -1);
}
- if (element.hasContextTypeElement()) {
- composeEnum(t, "StructureMapGroupRuleTargetComponent", "contextType", element.getContextTypeElement(), -1);
- }
if (element.hasElementElement()) {
composeString(t, "StructureMapGroupRuleTargetComponent", "element", element.getElementElement(), -1);
}
@@ -21135,8 +21839,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasStatusElement()) {
composeEnum(t, "Subscription", "status", element.getStatusElement(), -1);
}
- if (element.hasTopic()) {
- composeReference(t, "Subscription", "topic", element.getTopic(), -1);
+ if (element.hasTopicElement()) {
+ composeCanonical(t, "Subscription", "topic", element.getTopicElement(), -1);
}
for (int i = 0; i < element.getContact().size(); i++) {
composeContactPoint(t, "Subscription", "contact", element.getContact().get(i), i);
@@ -21171,6 +21875,12 @@ public class RdfParser extends RdfParserBase {
if (element.hasContentElement()) {
composeEnum(t, "Subscription", "content", element.getContentElement(), -1);
}
+ if (element.hasNotificationUrlLocationElement()) {
+ composeEnum(t, "Subscription", "notificationUrlLocation", element.getNotificationUrlLocationElement(), -1);
+ }
+ if (element.hasMaxCountElement()) {
+ composePositiveInt(t, "Subscription", "maxCount", element.getMaxCountElement(), -1);
+ }
}
protected void composeSubscriptionFilterByComponent(Complex parent, String parentType, String name, Subscription.SubscriptionFilterByComponent element, int index) {
@@ -21183,6 +21893,9 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeBackboneElement(t, "filterBy", name, element, index);
+ if (element.hasResourceTypeElement()) {
+ composeUri(t, "SubscriptionFilterByComponent", "resourceType", element.getResourceTypeElement(), -1);
+ }
if (element.hasSearchParamNameElement()) {
composeString(t, "SubscriptionFilterByComponent", "searchParamName", element.getSearchParamNameElement(), -1);
}
@@ -21204,6 +21917,9 @@ public class RdfParser extends RdfParserBase {
t = parent.predicate("fhir:"+parentType+'.'+name);
}
composeDomainResource(t, "SubscriptionStatus", name, element, index);
+ if (element.hasStatusElement()) {
+ composeEnum(t, "SubscriptionStatus", "status", element.getStatusElement(), -1);
+ }
if (element.hasTypeElement()) {
composeEnum(t, "SubscriptionStatus", "type", element.getTypeElement(), -1);
}
@@ -21216,9 +21932,6 @@ public class RdfParser extends RdfParserBase {
if (element.hasSubscription()) {
composeReference(t, "SubscriptionStatus", "subscription", element.getSubscription(), -1);
}
- if (element.hasStatusElement()) {
- composeEnum(t, "SubscriptionStatus", "status", element.getStatusElement(), -1);
- }
if (element.hasTopicElement()) {
composeCanonical(t, "SubscriptionStatus", "topic", element.getTopicElement(), -1);
}
@@ -21291,11 +22004,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasEffectivePeriod()) {
composePeriod(t, "SubscriptionTopic", "effectivePeriod", element.getEffectivePeriod(), -1);
}
- if (element.hasResourceTrigger()) {
- composeSubscriptionTopicResourceTriggerComponent(t, "SubscriptionTopic", "resourceTrigger", element.getResourceTrigger(), -1);
- }
- for (int i = 0; i < element.getCanFilterBy().size(); i++) {
- composeSubscriptionTopicCanFilterByComponent(t, "SubscriptionTopic", "canFilterBy", element.getCanFilterBy().get(i), i);
+ for (int i = 0; i < element.getResourceTrigger().size(); i++) {
+ composeSubscriptionTopicResourceTriggerComponent(t, "SubscriptionTopic", "resourceTrigger", element.getResourceTrigger().get(i), i);
}
}
@@ -21312,8 +22022,8 @@ public class RdfParser extends RdfParserBase {
if (element.hasDescriptionElement()) {
composeString(t, "SubscriptionTopicResourceTriggerComponent", "description", element.getDescriptionElement(), -1);
}
- for (int i = 0; i < element.getResourceType().size(); i++) {
- composeCode(t, "SubscriptionTopicResourceTriggerComponent", "resourceType", element.getResourceType().get(i), i);
+ if (element.hasResourceTypeElement()) {
+ composeUri(t, "SubscriptionTopicResourceTriggerComponent", "resourceType", element.getResourceTypeElement(), -1);
}
for (int i = 0; i < element.getMethodCriteria().size(); i++) {
composeEnum(t, "SubscriptionTopicResourceTriggerComponent", "methodCriteria", element.getMethodCriteria().get(i), i);
@@ -21324,6 +22034,9 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getFhirPathCriteria().size(); i++) {
composeString(t, "SubscriptionTopicResourceTriggerComponent", "fhirPathCriteria", element.getFhirPathCriteria().get(i), i);
}
+ for (int i = 0; i < element.getCanFilterBy().size(); i++) {
+ composeSubscriptionTopicResourceTriggerCanFilterByComponent(t, "SubscriptionTopicResourceTriggerComponent", "canFilterBy", element.getCanFilterBy().get(i), i);
+ }
}
protected void composeSubscriptionTopicResourceTriggerQueryCriteriaComponent(Complex parent, String parentType, String name, SubscriptionTopic.SubscriptionTopicResourceTriggerQueryCriteriaComponent element, int index) {
@@ -21339,15 +22052,21 @@ public class RdfParser extends RdfParserBase {
if (element.hasPreviousElement()) {
composeString(t, "SubscriptionTopicResourceTriggerQueryCriteriaComponent", "previous", element.getPreviousElement(), -1);
}
+ if (element.hasResultForCreateElement()) {
+ composeEnum(t, "SubscriptionTopicResourceTriggerQueryCriteriaComponent", "resultForCreate", element.getResultForCreateElement(), -1);
+ }
if (element.hasCurrentElement()) {
composeString(t, "SubscriptionTopicResourceTriggerQueryCriteriaComponent", "current", element.getCurrentElement(), -1);
}
+ if (element.hasResultForDeleteElement()) {
+ composeEnum(t, "SubscriptionTopicResourceTriggerQueryCriteriaComponent", "resultForDelete", element.getResultForDeleteElement(), -1);
+ }
if (element.hasRequireBothElement()) {
composeBoolean(t, "SubscriptionTopicResourceTriggerQueryCriteriaComponent", "requireBoth", element.getRequireBothElement(), -1);
}
}
- protected void composeSubscriptionTopicCanFilterByComponent(Complex parent, String parentType, String name, SubscriptionTopic.SubscriptionTopicCanFilterByComponent element, int index) {
+ protected void composeSubscriptionTopicResourceTriggerCanFilterByComponent(Complex parent, String parentType, String name, SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent element, int index) {
if (element == null)
return;
Complex t;
@@ -21358,13 +22077,13 @@ public class RdfParser extends RdfParserBase {
}
composeBackboneElement(t, "canFilterBy", name, element, index);
if (element.hasSearchParamNameElement()) {
- composeString(t, "SubscriptionTopicCanFilterByComponent", "searchParamName", element.getSearchParamNameElement(), -1);
+ composeString(t, "SubscriptionTopicResourceTriggerCanFilterByComponent", "searchParamName", element.getSearchParamNameElement(), -1);
}
for (int i = 0; i < element.getSearchModifier().size(); i++) {
- composeEnum(t, "SubscriptionTopicCanFilterByComponent", "searchModifier", element.getSearchModifier().get(i), i);
+ composeEnum(t, "SubscriptionTopicResourceTriggerCanFilterByComponent", "searchModifier", element.getSearchModifier().get(i), i);
}
if (element.hasDocumentationElement()) {
- composeMarkdown(t, "SubscriptionTopicCanFilterByComponent", "documentation", element.getDocumentationElement(), -1);
+ composeMarkdown(t, "SubscriptionTopicResourceTriggerCanFilterByComponent", "documentation", element.getDocumentationElement(), -1);
}
}
@@ -21381,6 +22100,9 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getIdentifier().size(); i++) {
composeIdentifier(t, "Substance", "identifier", element.getIdentifier().get(i), i);
}
+ if (element.hasInstanceElement()) {
+ composeBoolean(t, "Substance", "instance", element.getInstanceElement(), -1);
+ }
if (element.hasStatusElement()) {
composeEnum(t, "Substance", "status", element.getStatusElement(), -1);
}
@@ -21388,40 +22110,22 @@ public class RdfParser extends RdfParserBase {
composeCodeableConcept(t, "Substance", "category", element.getCategory().get(i), i);
}
if (element.hasCode()) {
- composeCodeableConcept(t, "Substance", "code", element.getCode(), -1);
+ composeCodeableReference(t, "Substance", "code", element.getCode(), -1);
}
if (element.hasDescriptionElement()) {
composeString(t, "Substance", "description", element.getDescriptionElement(), -1);
}
- for (int i = 0; i < element.getInstance().size(); i++) {
- composeSubstanceInstanceComponent(t, "Substance", "instance", element.getInstance().get(i), i);
+ if (element.hasExpiryElement()) {
+ composeDateTime(t, "Substance", "expiry", element.getExpiryElement(), -1);
+ }
+ if (element.hasQuantity()) {
+ composeQuantity(t, "Substance", "quantity", element.getQuantity(), -1);
}
for (int i = 0; i < element.getIngredient().size(); i++) {
composeSubstanceIngredientComponent(t, "Substance", "ingredient", element.getIngredient().get(i), i);
}
}
- protected void composeSubstanceInstanceComponent(Complex parent, String parentType, String name, Substance.SubstanceInstanceComponent element, int index) {
- if (element == null)
- return;
- Complex t;
- if (Utilities.noString(parentType))
- t = parent;
- else {
- t = parent.predicate("fhir:"+parentType+'.'+name);
- }
- composeBackboneElement(t, "instance", name, element, index);
- if (element.hasIdentifier()) {
- composeIdentifier(t, "SubstanceInstanceComponent", "identifier", element.getIdentifier(), -1);
- }
- if (element.hasExpiryElement()) {
- composeDateTime(t, "SubstanceInstanceComponent", "expiry", element.getExpiryElement(), -1);
- }
- if (element.hasQuantity()) {
- composeQuantity(t, "SubstanceInstanceComponent", "quantity", element.getQuantity(), -1);
- }
- }
-
protected void composeSubstanceIngredientComponent(Complex parent, String parentType, String name, Substance.SubstanceIngredientComponent element, int index) {
if (element == null)
return;
@@ -21468,6 +22172,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasDomain()) {
composeCodeableConcept(t, "SubstanceDefinition", "domain", element.getDomain(), -1);
}
+ for (int i = 0; i < element.getGrade().size(); i++) {
+ composeCodeableConcept(t, "SubstanceDefinition", "grade", element.getGrade().get(i), i);
+ }
if (element.hasDescriptionElement()) {
composeMarkdown(t, "SubstanceDefinition", "description", element.getDescriptionElement(), -1);
}
@@ -21517,7 +22224,7 @@ public class RdfParser extends RdfParserBase {
composeReference(t, "SubstanceDefinition", "protein", element.getProtein(), -1);
}
if (element.hasSourceMaterial()) {
- composeReference(t, "SubstanceDefinition", "sourceMaterial", element.getSourceMaterial(), -1);
+ composeSubstanceDefinitionSourceMaterialComponent(t, "SubstanceDefinition", "sourceMaterial", element.getSourceMaterial(), -1);
}
}
@@ -21827,6 +22534,33 @@ public class RdfParser extends RdfParserBase {
}
}
+ protected void composeSubstanceDefinitionSourceMaterialComponent(Complex parent, String parentType, String name, SubstanceDefinition.SubstanceDefinitionSourceMaterialComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "sourceMaterial", name, element, index);
+ if (element.hasType()) {
+ composeCodeableConcept(t, "SubstanceDefinitionSourceMaterialComponent", "type", element.getType(), -1);
+ }
+ if (element.hasGenus()) {
+ composeCodeableConcept(t, "SubstanceDefinitionSourceMaterialComponent", "genus", element.getGenus(), -1);
+ }
+ if (element.hasSpecies()) {
+ composeCodeableConcept(t, "SubstanceDefinitionSourceMaterialComponent", "species", element.getSpecies(), -1);
+ }
+ if (element.hasPart()) {
+ composeCodeableConcept(t, "SubstanceDefinitionSourceMaterialComponent", "part", element.getPart(), -1);
+ }
+ for (int i = 0; i < element.getCountryOfOrigin().size(); i++) {
+ composeCodeableConcept(t, "SubstanceDefinitionSourceMaterialComponent", "countryOfOrigin", element.getCountryOfOrigin().get(i), i);
+ }
+ }
+
protected void composeSubstanceNucleicAcid(Complex parent, String parentType, String name, SubstanceNucleicAcid element, int index) {
if (element == null)
return;
@@ -23316,6 +24050,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasMetadata()) {
composeTestScriptMetadataComponent(t, "TestScript", "metadata", element.getMetadata(), -1);
}
+ for (int i = 0; i < element.getScope().size(); i++) {
+ composeTestScriptScopeComponent(t, "TestScript", "scope", element.getScope().get(i), i);
+ }
for (int i = 0; i < element.getFixture().size(); i++) {
composeTestScriptFixtureComponent(t, "TestScript", "fixture", element.getFixture().get(i), i);
}
@@ -23441,6 +24178,27 @@ public class RdfParser extends RdfParserBase {
}
}
+ protected void composeTestScriptScopeComponent(Complex parent, String parentType, String name, TestScript.TestScriptScopeComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "scope", name, element, index);
+ if (element.hasArtifactElement()) {
+ composeCanonical(t, "TestScriptScopeComponent", "artifact", element.getArtifactElement(), -1);
+ }
+ if (element.hasConformance()) {
+ composeCodeableConcept(t, "TestScriptScopeComponent", "conformance", element.getConformance(), -1);
+ }
+ if (element.hasPhase()) {
+ composeCodeableConcept(t, "TestScriptScopeComponent", "phase", element.getPhase(), -1);
+ }
+ }
+
protected void composeTestScriptFixtureComponent(Complex parent, String parentType, String name, TestScript.TestScriptFixtureComponent element, int index) {
if (element == null)
return;
@@ -23679,6 +24437,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasSourceIdElement()) {
composeId(t, "SetupActionAssertComponent", "sourceId", element.getSourceIdElement(), -1);
}
+ if (element.hasStopTestOnFailElement()) {
+ composeBoolean(t, "SetupActionAssertComponent", "stopTestOnFail", element.getStopTestOnFailElement(), -1);
+ }
if (element.hasValidateProfileIdElement()) {
composeId(t, "SetupActionAssertComponent", "validateProfileId", element.getValidateProfileIdElement(), -1);
}
@@ -23823,6 +24584,9 @@ public class RdfParser extends RdfParserBase {
if (element.hasExpansion()) {
composeValueSetExpansionComponent(t, "ValueSet", "expansion", element.getExpansion(), -1);
}
+ if (element.hasScope()) {
+ composeValueSetScopeComponent(t, "ValueSet", "scope", element.getScope(), -1);
+ }
}
protected void composeValueSetComposeComponent(Complex parent, String parentType, String name, ValueSet.ValueSetComposeComponent element, int index) {
@@ -23877,6 +24641,9 @@ public class RdfParser extends RdfParserBase {
for (int i = 0; i < element.getValueSet().size(); i++) {
composeCanonical(t, "ConceptSetComponent", "valueSet", element.getValueSet().get(i), i);
}
+ if (element.hasCopyrightElement()) {
+ composeString(t, "ConceptSetComponent", "copyright", element.getCopyrightElement(), -1);
+ }
}
protected void composeValueSetConceptReferenceComponent(Complex parent, String parentType, String name, ValueSet.ConceptReferenceComponent element, int index) {
@@ -24068,6 +24835,27 @@ public class RdfParser extends RdfParserBase {
}
}
+ protected void composeValueSetScopeComponent(Complex parent, String parentType, String name, ValueSet.ValueSetScopeComponent element, int index) {
+ if (element == null)
+ return;
+ Complex t;
+ if (Utilities.noString(parentType))
+ t = parent;
+ else {
+ t = parent.predicate("fhir:"+parentType+'.'+name);
+ }
+ composeBackboneElement(t, "scope", name, element, index);
+ if (element.hasFocusElement()) {
+ composeString(t, "ValueSetScopeComponent", "focus", element.getFocusElement(), -1);
+ }
+ if (element.hasInclusionCriteriaElement()) {
+ composeString(t, "ValueSetScopeComponent", "inclusionCriteria", element.getInclusionCriteriaElement(), -1);
+ }
+ if (element.hasExclusionCriteriaElement()) {
+ composeString(t, "ValueSetScopeComponent", "exclusionCriteria", element.getExclusionCriteriaElement(), -1);
+ }
+ }
+
protected void composeVerificationResult(Complex parent, String parentType, String name, VerificationResult element, int index) {
if (element == null)
return;
@@ -24415,8 +25203,8 @@ public class RdfParser extends RdfParserBase {
composeDeviceMetric(parent, null, "DeviceMetric", (DeviceMetric)resource, -1);
} else if (resource instanceof DeviceRequest) {
composeDeviceRequest(parent, null, "DeviceRequest", (DeviceRequest)resource, -1);
- } else if (resource instanceof DeviceUseStatement) {
- composeDeviceUseStatement(parent, null, "DeviceUseStatement", (DeviceUseStatement)resource, -1);
+ } else if (resource instanceof DeviceUsage) {
+ composeDeviceUsage(parent, null, "DeviceUsage", (DeviceUsage)resource, -1);
} else if (resource instanceof DiagnosticReport) {
composeDiagnosticReport(parent, null, "DiagnosticReport", (DiagnosticReport)resource, -1);
} else if (resource instanceof DocumentManifest) {
@@ -24473,6 +25261,8 @@ public class RdfParser extends RdfParserBase {
composeIngredient(parent, null, "Ingredient", (Ingredient)resource, -1);
} else if (resource instanceof InsurancePlan) {
composeInsurancePlan(parent, null, "InsurancePlan", (InsurancePlan)resource, -1);
+ } else if (resource instanceof InventoryReport) {
+ composeInventoryReport(parent, null, "InventoryReport", (InventoryReport)resource, -1);
} else if (resource instanceof Invoice) {
composeInvoice(parent, null, "Invoice", (Invoice)resource, -1);
} else if (resource instanceof Library) {
@@ -24744,6 +25534,8 @@ public class RdfParser extends RdfParserBase {
composeRange(parent, parentType, name, (Range)value, index);
} else if (value instanceof Ratio) {
composeRatio(parent, parentType, name, (Ratio)value, index);
+ } else if (value instanceof RatioRange) {
+ composeRatioRange(parent, parentType, name, (RatioRange)value, index);
} else if (value instanceof Reference) {
composeReference(parent, parentType, name, (Reference)value, index);
} else if (value instanceof RelatedArtifact) {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/XmlParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/XmlParser.java
index 3fcd374bc..be8a0348d 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/XmlParser.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/XmlParser.java
@@ -2,8 +2,6 @@ package org.hl7.fhir.r5.formats;
// generated
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -32,7 +30,7 @@ package org.hl7.fhir.r5.formats;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
@@ -1864,6 +1862,34 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected RatioRange parseRatioRange(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ RatioRange res = new RatioRange();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseRatioRangeContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseRatioRangeContent(int eventType, XmlPullParser xpp, RatioRange res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lowNumerator")) {
+ res.setLowNumerator(parseQuantity(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("highNumerator")) {
+ res.setHighNumerator(parseQuantity(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("denominator")) {
+ res.setDenominator(parseQuantity(xpp));
+ } else if (!parseDataTypeContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected Reference parseReference(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
Reference res = new Reference();
parseElementAttributes(xpp, res);
@@ -2024,10 +2050,14 @@ public class XmlParser extends XmlParserBase {
res.getNote().add(parseAnnotation(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("statisticType")) {
res.setStatisticType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("category")) {
+ res.setCategory(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("quantity")) {
res.setQuantity(parseQuantity(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("numberOfEvents")) {
- res.setNumberOfEventsElement(parseInteger(xpp));
+ res.setNumberOfEventsElement(parseUnsignedInt(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("numberAffected")) {
+ res.setNumberAffectedElement(parseUnsignedInt(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("sampleSize")) {
res.setSampleSize(parseStatisticSampleSizeComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("attributeEstimate")) {
@@ -2061,11 +2091,11 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
res.getNote().add(parseAnnotation(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("numberOfStudies")) {
- res.setNumberOfStudiesElement(parseInteger(xpp));
+ res.setNumberOfStudiesElement(parseUnsignedInt(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("numberOfParticipants")) {
- res.setNumberOfParticipantsElement(parseInteger(xpp));
+ res.setNumberOfParticipantsElement(parseUnsignedInt(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("knownDataCount")) {
- res.setKnownDataCountElement(parseInteger(xpp));
+ res.setKnownDataCountElement(parseUnsignedInt(xpp));
} else if (!parseElementContent(eventType, xpp, res)){
return false;
}
@@ -2160,8 +2190,8 @@ public class XmlParser extends XmlParserBase {
protected boolean parseStatisticModelCharacteristicComponentContent(int eventType, XmlPullParser xpp, Statistic.StatisticModelCharacteristicComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("code")) {
res.setCode(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "value")) {
- res.setValue(parseType("value", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("value")) {
+ res.setValue(parseQuantity(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("variable")) {
res.getVariable().add(parseStatisticModelCharacteristicVariableComponent(xpp));
} else if (!parseElementContent(eventType, xpp, res)){
@@ -2569,7 +2599,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "timing")) {
res.setTiming(parseType("timing", xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("location")) {
- res.setLocation(parseReference(xpp));
+ res.setLocation(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("participant")) {
res.getParticipant().add(parseActivityDefinitionParticipantComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "product")) {
@@ -2614,8 +2644,12 @@ public class XmlParser extends XmlParserBase {
protected boolean parseActivityDefinitionParticipantComponentContent(int eventType, XmlPullParser xpp, ActivityDefinition.ActivityDefinitionParticipantComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setTypeElement(parseEnumeration(xpp, Enumerations.ActionParticipantType.NULL, new Enumerations.ActionParticipantTypeEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("typeReference")) {
+ res.setTypeReference(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("role")) {
res.setRole(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("function")) {
+ res.setFunction(parseCodeableConcept(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -2849,7 +2883,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("seriousness")) {
res.setSeriousness(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("outcome")) {
- res.setOutcome(parseCodeableConcept(xpp));
+ res.getOutcome().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("recorder")) {
res.setRecorder(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("participant")) {
@@ -3121,7 +3155,7 @@ public class XmlParser extends XmlParserBase {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("substance")) {
res.setSubstance(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("manifestation")) {
- res.getManifestation().add(parseCodeableConcept(xpp));
+ res.getManifestation().add(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("onset")) {
@@ -3171,7 +3205,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) {
res.getReason().add(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("priority")) {
- res.setPriorityElement(parseUnsignedInt(xpp));
+ res.setPriority(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("supportingInformation")) {
@@ -3304,6 +3338,10 @@ public class XmlParser extends XmlParserBase {
res.setOutcome(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("purposeOfEvent")) {
res.getPurposeOfEvent().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("basedOn")) {
+ res.getBasedOn().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("encounter")) {
+ res.setEncounter(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("agent")) {
res.getAgent().add(parseAuditEventAgentComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("source")) {
@@ -4540,6 +4578,8 @@ public class XmlParser extends XmlParserBase {
res.setModeElement(parseEnumeration(xpp, Enumerations.RestfulCapabilityMode.NULL, new Enumerations.RestfulCapabilityModeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("documentation")) {
res.setDocumentationElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("feature")) {
+ res.getFeature().add(parseCapabilityStatement2RestFeatureComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("resource")) {
res.getResource().add(parseCapabilityStatement2RestResourceComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("interaction")) {
@@ -4556,6 +4596,32 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected CapabilityStatement2.CapabilityStatement2RestFeatureComponent parseCapabilityStatement2RestFeatureComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ CapabilityStatement2.CapabilityStatement2RestFeatureComponent res = new CapabilityStatement2.CapabilityStatement2RestFeatureComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCapabilityStatement2RestFeatureComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCapabilityStatement2RestFeatureComponentContent(int eventType, XmlPullParser xpp, CapabilityStatement2.CapabilityStatement2RestFeatureComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("code")) {
+ res.setCodeElement(parseEnumeration(xpp, CapabilityStatement2.CapabilityFeature.NULL, new CapabilityStatement2.CapabilityFeatureEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("value")) {
+ res.setValueElement(parseEnumeration(xpp, CapabilityStatement2.CapabilityFeatureValue.NULL, new CapabilityStatement2.CapabilityFeatureValueEnumFactory()));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected CapabilityStatement2.CapabilityStatement2RestResourceComponent parseCapabilityStatement2RestResourceComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
CapabilityStatement2.CapabilityStatement2RestResourceComponent res = new CapabilityStatement2.CapabilityStatement2RestResourceComponent();
parseElementAttributes(xpp, res);
@@ -4580,6 +4646,8 @@ public class XmlParser extends XmlParserBase {
res.getSupportedProfile().add(parseCanonical(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("documentation")) {
res.setDocumentationElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("feature")) {
+ res.getFeature().add(parseCapabilityStatement2RestFeatureComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("interaction")) {
res.getInteraction().add(parseCapabilityStatement2ResourceInteractionComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("searchParam")) {
@@ -4612,6 +4680,8 @@ public class XmlParser extends XmlParserBase {
res.setCodeElement(parseEnumeration(xpp, CapabilityStatement2.TypeRestfulInteraction.NULL, new CapabilityStatement2.TypeRestfulInteractionEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("documentation")) {
res.setDocumentationElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("feature")) {
+ res.getFeature().add(parseCapabilityStatement2RestFeatureComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -4642,6 +4712,8 @@ public class XmlParser extends XmlParserBase {
res.setTypeElement(parseEnumeration(xpp, Enumerations.SearchParamType.NULL, new Enumerations.SearchParamTypeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("documentation")) {
res.setDocumentationElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("feature")) {
+ res.getFeature().add(parseCapabilityStatement2RestFeatureComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -4670,6 +4742,8 @@ public class XmlParser extends XmlParserBase {
res.setDefinitionElement(parseCanonical(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("documentation")) {
res.setDocumentationElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("feature")) {
+ res.getFeature().add(parseCapabilityStatement2RestFeatureComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -4696,6 +4770,8 @@ public class XmlParser extends XmlParserBase {
res.setCodeElement(parseEnumeration(xpp, CapabilityStatement2.SystemRestfulInteraction.NULL, new CapabilityStatement2.SystemRestfulInteractionEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("documentation")) {
res.setDocumentationElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("feature")) {
+ res.getFeature().add(parseCapabilityStatement2RestFeatureComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -4786,27 +4862,27 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseCarePlanActivityComponentContent(int eventType, XmlPullParser xpp, CarePlan.CarePlanActivityComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("outcome")) {
- res.getOutcome().add(parseCodeableReference(xpp));
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("performedActivity")) {
+ res.getPerformedActivity().add(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("progress")) {
res.getProgress().add(parseAnnotation(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reference")) {
- res.setReference(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("detail")) {
- res.setDetail(parseCarePlanActivityDetailComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("plannedActivityReference")) {
+ res.setPlannedActivityReference(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("plannedActivityDetail")) {
+ res.setPlannedActivityDetail(parseCarePlanActivityPlannedActivityDetailComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
return true;
}
- protected CarePlan.CarePlanActivityDetailComponent parseCarePlanActivityDetailComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- CarePlan.CarePlanActivityDetailComponent res = new CarePlan.CarePlanActivityDetailComponent();
+ protected CarePlan.CarePlanActivityPlannedActivityDetailComponent parseCarePlanActivityPlannedActivityDetailComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ CarePlan.CarePlanActivityPlannedActivityDetailComponent res = new CarePlan.CarePlanActivityPlannedActivityDetailComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCarePlanActivityDetailComponentContent(eventType, xpp, res))
+ if (!parseCarePlanActivityPlannedActivityDetailComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -4815,7 +4891,7 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCarePlanActivityDetailComponentContent(int eventType, XmlPullParser xpp, CarePlan.CarePlanActivityDetailComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseCarePlanActivityPlannedActivityDetailComponentContent(int eventType, XmlPullParser xpp, CarePlan.CarePlanActivityPlannedActivityDetailComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("kind")) {
res.setKindElement(parseEnumeration(xpp, CarePlan.CarePlanActivityKind.NULL, new CarePlan.CarePlanActivityKindEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("instantiatesCanonical")) {
@@ -5280,69 +5356,75 @@ public class XmlParser extends XmlParserBase {
protected boolean parseCitationContent(int eventType, XmlPullParser xpp, Citation res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("url")) {
res.setUrlElement(parseUri(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
- res.setStatusElement(parseEnumeration(xpp, Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("useContext")) {
- res.getUseContext().add(parseUsageContext(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
res.getIdentifier().add(parseIdentifier(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedIdentifier")) {
- res.getRelatedIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("version")) {
+ res.setVersionElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
+ res.setNameElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
+ res.setTitleElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
+ res.setStatusElement(parseEnumeration(xpp, Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("experimental")) {
+ res.setExperimentalElement(parseBoolean(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
+ res.setDateElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisher")) {
+ res.setPublisherElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contact")) {
+ res.getContact().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
+ res.setDescriptionElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("useContext")) {
+ res.getUseContext().add(parseUsageContext(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("jurisdiction")) {
+ res.getJurisdiction().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("purpose")) {
+ res.setPurposeElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("copyright")) {
+ res.setCopyrightElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("approvalDate")) {
+ res.setApprovalDateElement(parseDate(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lastReviewDate")) {
+ res.setLastReviewDateElement(parseDate(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("effectivePeriod")) {
+ res.setEffectivePeriod(parsePeriod(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("author")) {
+ res.getAuthor().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("editor")) {
+ res.getEditor().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reviewer")) {
+ res.getReviewer().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("endorser")) {
+ res.getEndorser().add(parseContactDetail(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("summary")) {
- res.getSummary().add(parseCitationSummaryComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dateCited")) {
- res.setDateCitedElement(parseDateTime(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("variantCitation")) {
- res.setVariantCitation(parseCitationVariantCitationComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publishingModel")) {
- res.setPublishingModel(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("journal")) {
- res.setJournal(parseCitationJournalComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publicationInfo")) {
- res.setPublicationInfo(parseCitationPublicationInfoComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("articleTitle")) {
- res.setArticleTitleElement(parseMarkdown(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("alternativeTitle")) {
- res.getAlternativeTitle().add(parseCitationAlternativeTitleComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pagination")) {
- res.setPagination(parseCitationPaginationComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("articleUrl")) {
- res.getArticleUrl().add(parseCitationArticleUrlComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("abstract")) {
- res.setAbstractElement(parseMarkdown(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("abstractCopyright")) {
- res.setAbstractCopyrightElement(parseMarkdown(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("alternativeAbstract")) {
- res.getAlternativeAbstract().add(parseCitationAlternativeAbstractComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contributorship")) {
- res.setContributorship(parseCitationContributorshipComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("articleLanguage")) {
- res.setArticleLanguage(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("alternativeForm")) {
- res.getAlternativeForm().add(parseCitationAlternativeFormComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classifier")) {
- res.getClassifier().add(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("keywordList")) {
- res.getKeywordList().add(parseCitationKeywordListComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedArtifact")) {
- res.getRelatedArtifact().add(parseRelatedArtifact(xpp));
+ res.getSummary().add(parseContactDetail(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classification")) {
+ res.getClassification().add(parseCitationClassificationComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
res.getNote().add(parseAnnotation(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("medlinePubMed")) {
- res.setMedlinePubMed(parseCitationMedlinePubMedComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("currentState")) {
+ res.getCurrentState().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("statusDate")) {
+ res.getStatusDate().add(parseCitationStatusDateComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatesTo")) {
+ res.getRelatesTo().add(parseCitationRelatesToComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("citedArtifact")) {
+ res.setCitedArtifact(parseCitationCitedArtifactComponent(xpp));
} else if (!parseMetadataResourceContent(eventType, xpp, res)){
return false;
}
return true;
}
- protected Citation.CitationSummaryComponent parseCitationSummaryComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationSummaryComponent res = new Citation.CitationSummaryComponent();
+ protected Citation.CitationClassificationComponent parseCitationClassificationComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationClassificationComponent res = new Citation.CitationClassificationComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationSummaryComponentContent(eventType, xpp, res))
+ if (!parseCitationClassificationComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5351,9 +5433,199 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationSummaryComponentContent(int eventType, XmlPullParser xpp, Citation.CitationSummaryComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("style")) {
- res.setStyle(parseCodeableConcept(xpp));
+ protected boolean parseCitationClassificationComponentContent(int eventType, XmlPullParser xpp, Citation.CitationClassificationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classifier")) {
+ res.getClassifier().add(parseCodeableConcept(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationStatusDateComponent parseCitationStatusDateComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationStatusDateComponent res = new Citation.CitationStatusDateComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationStatusDateComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationStatusDateComponentContent(int eventType, XmlPullParser xpp, Citation.CitationStatusDateComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("activity")) {
+ res.setActivity(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("actual")) {
+ res.setActualElement(parseBoolean(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("period")) {
+ res.setPeriod(parsePeriod(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationRelatesToComponent parseCitationRelatesToComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationRelatesToComponent res = new Citation.CitationRelatesToComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationRelatesToComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationRelatesToComponentContent(int eventType, XmlPullParser xpp, Citation.CitationRelatesToComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relationshipType")) {
+ res.setRelationshipType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("targetClassifier")) {
+ res.getTargetClassifier().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "target")) {
+ res.setTarget(parseType("target", xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationCitedArtifactComponent parseCitationCitedArtifactComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactComponent res = new Citation.CitationCitedArtifactComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationCitedArtifactComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationCitedArtifactComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
+ res.getIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedIdentifier")) {
+ res.getRelatedIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dateAccessed")) {
+ res.setDateAccessedElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("version")) {
+ res.setVersion(parseCitationCitedArtifactVersionComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("currentState")) {
+ res.getCurrentState().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("statusDate")) {
+ res.getStatusDate().add(parseCitationCitedArtifactStatusDateComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
+ res.getTitle().add(parseCitationCitedArtifactTitleComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("abstract")) {
+ res.getAbstract().add(parseCitationCitedArtifactAbstractComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("part")) {
+ res.setPart(parseCitationCitedArtifactPartComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatesTo")) {
+ res.getRelatesTo().add(parseCitationCitedArtifactRelatesToComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publicationForm")) {
+ res.getPublicationForm().add(parseCitationCitedArtifactPublicationFormComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("webLocation")) {
+ res.getWebLocation().add(parseCitationCitedArtifactWebLocationComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classification")) {
+ res.getClassification().add(parseCitationCitedArtifactClassificationComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contributorship")) {
+ res.setContributorship(parseCitationCitedArtifactContributorshipComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
+ res.getNote().add(parseAnnotation(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationCitedArtifactVersionComponent parseCitationCitedArtifactVersionComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactVersionComponent res = new Citation.CitationCitedArtifactVersionComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationCitedArtifactVersionComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationCitedArtifactVersionComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactVersionComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("value")) {
+ res.setValueElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("baseCitation")) {
+ res.setBaseCitation(parseReference(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationCitedArtifactStatusDateComponent parseCitationCitedArtifactStatusDateComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactStatusDateComponent res = new Citation.CitationCitedArtifactStatusDateComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationCitedArtifactStatusDateComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationCitedArtifactStatusDateComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactStatusDateComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("activity")) {
+ res.setActivity(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("actual")) {
+ res.setActualElement(parseBoolean(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("period")) {
+ res.setPeriod(parsePeriod(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationCitedArtifactTitleComponent parseCitationCitedArtifactTitleComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactTitleComponent res = new Citation.CitationCitedArtifactTitleComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationCitedArtifactTitleComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationCitedArtifactTitleComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactTitleComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("language")) {
+ res.setLanguage(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("text")) {
res.setTextElement(parseMarkdown(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
@@ -5362,13 +5634,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected Citation.CitationVariantCitationComponent parseCitationVariantCitationComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationVariantCitationComponent res = new Citation.CitationVariantCitationComponent();
+ protected Citation.CitationCitedArtifactAbstractComponent parseCitationCitedArtifactAbstractComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactAbstractComponent res = new Citation.CitationCitedArtifactAbstractComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationVariantCitationComponentContent(eventType, xpp, res))
+ if (!parseCitationCitedArtifactAbstractComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5377,7 +5649,37 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationVariantCitationComponentContent(int eventType, XmlPullParser xpp, Citation.CitationVariantCitationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseCitationCitedArtifactAbstractComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactAbstractComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("language")) {
+ res.setLanguage(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("text")) {
+ res.setTextElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("copyright")) {
+ res.setCopyrightElement(parseMarkdown(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationCitedArtifactPartComponent parseCitationCitedArtifactPartComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactPartComponent res = new Citation.CitationCitedArtifactPartComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationCitedArtifactPartComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationCitedArtifactPartComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactPartComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("value")) {
@@ -5390,13 +5692,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected Citation.CitationJournalComponent parseCitationJournalComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationJournalComponent res = new Citation.CitationJournalComponent();
+ protected Citation.CitationCitedArtifactRelatesToComponent parseCitationCitedArtifactRelatesToComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactRelatesToComponent res = new Citation.CitationCitedArtifactRelatesToComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationJournalComponentContent(eventType, xpp, res))
+ if (!parseCitationCitedArtifactRelatesToComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5405,28 +5707,26 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationJournalComponentContent(int eventType, XmlPullParser xpp, Citation.CitationJournalComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
- res.getIdentifier().add(parseIdentifier(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("country")) {
- res.setCountryElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("journalIssue")) {
- res.setJournalIssue(parseCitationJournalJournalIssueComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
- res.setTitleElement(parseString(xpp));
+ protected boolean parseCitationCitedArtifactRelatesToComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactRelatesToComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relationshipType")) {
+ res.setRelationshipType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("targetClassifier")) {
+ res.getTargetClassifier().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "target")) {
+ res.setTarget(parseType("target", xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
return true;
}
- protected Citation.CitationJournalJournalIssueComponent parseCitationJournalJournalIssueComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationJournalJournalIssueComponent res = new Citation.CitationJournalJournalIssueComponent();
+ protected Citation.CitationCitedArtifactPublicationFormComponent parseCitationCitedArtifactPublicationFormComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactPublicationFormComponent res = new Citation.CitationCitedArtifactPublicationFormComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationJournalJournalIssueComponentContent(eventType, xpp, res))
+ if (!parseCitationCitedArtifactPublicationFormComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5435,28 +5735,104 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationJournalJournalIssueComponentContent(int eventType, XmlPullParser xpp, Citation.CitationJournalJournalIssueComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseCitationCitedArtifactPublicationFormComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactPublicationFormComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publishedIn")) {
+ res.setPublishedIn(parseCitationCitedArtifactPublicationFormPublishedInComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("periodicRelease")) {
+ res.setPeriodicRelease(parseCitationCitedArtifactPublicationFormPeriodicReleaseComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("articleDate")) {
+ res.setArticleDateElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lastRevisionDate")) {
+ res.setLastRevisionDateElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("language")) {
+ res.getLanguage().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("accessionNumber")) {
+ res.setAccessionNumberElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pageString")) {
+ res.setPageStringElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("firstPage")) {
+ res.setFirstPageElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lastPage")) {
+ res.setLastPageElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pageCount")) {
+ res.setPageCountElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("copyright")) {
+ res.setCopyrightElement(parseMarkdown(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationCitedArtifactPublicationFormPublishedInComponent parseCitationCitedArtifactPublicationFormPublishedInComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactPublicationFormPublishedInComponent res = new Citation.CitationCitedArtifactPublicationFormPublishedInComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationCitedArtifactPublicationFormPublishedInComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationCitedArtifactPublicationFormPublishedInComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactPublicationFormPublishedInComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
+ res.getIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
+ res.setTitleElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisher")) {
+ res.setPublisher(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisherLocation")) {
+ res.setPublisherLocationElement(parseString(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationCitedArtifactPublicationFormPeriodicReleaseComponent parseCitationCitedArtifactPublicationFormPeriodicReleaseComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactPublicationFormPeriodicReleaseComponent res = new Citation.CitationCitedArtifactPublicationFormPeriodicReleaseComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationCitedArtifactPublicationFormPeriodicReleaseComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationCitedArtifactPublicationFormPeriodicReleaseComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactPublicationFormPeriodicReleaseComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("citedMedium")) {
res.setCitedMedium(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("volume")) {
res.setVolumeElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("issue")) {
res.setIssueElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publicationDate")) {
- res.setPublicationDate(parseCitationJournalJournalIssuePublicationDateComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dateOfPublication")) {
+ res.setDateOfPublication(parseCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
return true;
}
- protected Citation.CitationJournalJournalIssuePublicationDateComponent parseCitationJournalJournalIssuePublicationDateComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationJournalJournalIssuePublicationDateComponent res = new Citation.CitationJournalJournalIssuePublicationDateComponent();
+ protected Citation.CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent parseCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent res = new Citation.CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationJournalJournalIssuePublicationDateComponentContent(eventType, xpp, res))
+ if (!parseCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5465,7 +5841,7 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationJournalJournalIssuePublicationDateComponentContent(int eventType, XmlPullParser xpp, Citation.CitationJournalJournalIssuePublicationDateComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
res.setDateElement(parseDate(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("year")) {
@@ -5484,13 +5860,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected Citation.CitationPublicationInfoComponent parseCitationPublicationInfoComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationPublicationInfoComponent res = new Citation.CitationPublicationInfoComponent();
+ protected Citation.CitationCitedArtifactWebLocationComponent parseCitationCitedArtifactWebLocationComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactWebLocationComponent res = new Citation.CitationCitedArtifactWebLocationComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationPublicationInfoComponentContent(eventType, xpp, res))
+ if (!parseCitationCitedArtifactWebLocationComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5499,127 +5875,7 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationPublicationInfoComponentContent(int eventType, XmlPullParser xpp, Citation.CitationPublicationInfoComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publishedIn")) {
- res.setPublishedIn(parseCitationPublicationInfoPublishedInComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("entryDate")) {
- res.setEntryDateElement(parseDateTime(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("revisionDate")) {
- res.setRevisionDateElement(parseDateTime(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pageCount")) {
- res.setPageCountElement(parseString(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationPublicationInfoPublishedInComponent parseCitationPublicationInfoPublishedInComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationPublicationInfoPublishedInComponent res = new Citation.CitationPublicationInfoPublishedInComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationPublicationInfoPublishedInComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationPublicationInfoPublishedInComponentContent(int eventType, XmlPullParser xpp, Citation.CitationPublicationInfoPublishedInComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
- res.setType(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
- res.getIdentifier().add(parseIdentifier(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
- res.setNameElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisher")) {
- res.setPublisher(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisherLocation")) {
- res.setPublisherLocationElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("startDate")) {
- res.setStartDateElement(parseDate(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationAlternativeTitleComponent parseCitationAlternativeTitleComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationAlternativeTitleComponent res = new Citation.CitationAlternativeTitleComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationAlternativeTitleComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationAlternativeTitleComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAlternativeTitleComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
- res.setType(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("language")) {
- res.setLanguage(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
- res.setTitleElement(parseMarkdown(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationPaginationComponent parseCitationPaginationComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationPaginationComponent res = new Citation.CitationPaginationComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationPaginationComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationPaginationComponentContent(int eventType, XmlPullParser xpp, Citation.CitationPaginationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pageString")) {
- res.setPageStringElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("firstPage")) {
- res.setFirstPageElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lastPage")) {
- res.setLastPageElement(parseString(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationArticleUrlComponent parseCitationArticleUrlComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationArticleUrlComponent res = new Citation.CitationArticleUrlComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationArticleUrlComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationArticleUrlComponentContent(int eventType, XmlPullParser xpp, Citation.CitationArticleUrlComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseCitationCitedArtifactWebLocationComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactWebLocationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("url")) {
@@ -5630,13 +5886,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected Citation.CitationAlternativeAbstractComponent parseCitationAlternativeAbstractComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationAlternativeAbstractComponent res = new Citation.CitationAlternativeAbstractComponent();
+ protected Citation.CitationCitedArtifactClassificationComponent parseCitationCitedArtifactClassificationComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactClassificationComponent res = new Citation.CitationCitedArtifactClassificationComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationAlternativeAbstractComponentContent(eventType, xpp, res))
+ if (!parseCitationCitedArtifactClassificationComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5645,28 +5901,26 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationAlternativeAbstractComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAlternativeAbstractComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseCitationCitedArtifactClassificationComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactClassificationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("language")) {
- res.setLanguage(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("abstract")) {
- res.setAbstractElement(parseMarkdown(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("abstractCopyright")) {
- res.setAbstractCopyrightElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classifier")) {
+ res.getClassifier().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("whoClassified")) {
+ res.setWhoClassified(parseCitationCitedArtifactClassificationWhoClassifiedComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
return true;
}
- protected Citation.CitationContributorshipComponent parseCitationContributorshipComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationContributorshipComponent res = new Citation.CitationContributorshipComponent();
+ protected Citation.CitationCitedArtifactClassificationWhoClassifiedComponent parseCitationCitedArtifactClassificationWhoClassifiedComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactClassificationWhoClassifiedComponent res = new Citation.CitationCitedArtifactClassificationWhoClassifiedComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationContributorshipComponentContent(eventType, xpp, res))
+ if (!parseCitationCitedArtifactClassificationWhoClassifiedComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5675,26 +5929,58 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationContributorshipComponentContent(int eventType, XmlPullParser xpp, Citation.CitationContributorshipComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseCitationCitedArtifactClassificationWhoClassifiedComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactClassificationWhoClassifiedComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("person")) {
+ res.setPerson(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("organization")) {
+ res.setOrganization(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisher")) {
+ res.setPublisher(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classifierCopyright")) {
+ res.setClassifierCopyrightElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("freeToShare")) {
+ res.setFreeToShareElement(parseBoolean(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationCitedArtifactContributorshipComponent parseCitationCitedArtifactContributorshipComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactContributorshipComponent res = new Citation.CitationCitedArtifactContributorshipComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationCitedArtifactContributorshipComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationCitedArtifactContributorshipComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactContributorshipComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("complete")) {
res.setCompleteElement(parseBoolean(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("entry")) {
- res.getEntry().add(parseCitationContributorshipEntryComponent(xpp));
+ res.getEntry().add(parseCitationCitedArtifactContributorshipEntryComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("summary")) {
- res.getSummary().add(parseCitationContributorshipSummaryComponent(xpp));
+ res.getSummary().add(parseCitationCitedArtifactContributorshipSummaryComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
return true;
}
- protected Citation.CitationContributorshipEntryComponent parseCitationContributorshipEntryComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationContributorshipEntryComponent res = new Citation.CitationContributorshipEntryComponent();
+ protected Citation.CitationCitedArtifactContributorshipEntryComponent parseCitationCitedArtifactContributorshipEntryComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactContributorshipEntryComponent res = new Citation.CitationCitedArtifactContributorshipEntryComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationContributorshipEntryComponentContent(eventType, xpp, res))
+ if (!parseCitationCitedArtifactContributorshipEntryComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5703,7 +5989,7 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationContributorshipEntryComponentContent(int eventType, XmlPullParser xpp, Citation.CitationContributorshipEntryComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseCitationCitedArtifactContributorshipEntryComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactContributorshipEntryComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
res.setName(parseHumanName(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("initials")) {
@@ -5713,17 +5999,19 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
res.getIdentifier().add(parseIdentifier(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("affiliationInfo")) {
- res.getAffiliationInfo().add(parseCitationContributorshipEntryAffiliationInfoComponent(xpp));
+ res.getAffiliationInfo().add(parseCitationCitedArtifactContributorshipEntryAffiliationInfoComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("address")) {
res.getAddress().add(parseAddress(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("telecom")) {
res.getTelecom().add(parseContactPoint(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contribution")) {
- res.getContribution().add(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("notAnAuthor")) {
- res.setNotAnAuthorElement(parseBoolean(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("correspondingAuthor")) {
- res.setCorrespondingAuthorElement(parseBoolean(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contributionType")) {
+ res.getContributionType().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("role")) {
+ res.setRole(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contributionInstance")) {
+ res.getContributionInstance().add(parseCitationCitedArtifactContributorshipEntryContributionInstanceComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("correspondingContact")) {
+ res.setCorrespondingContactElement(parseBoolean(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("listOrder")) {
res.setListOrderElement(parsePositiveInt(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
@@ -5732,13 +6020,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected Citation.CitationContributorshipEntryAffiliationInfoComponent parseCitationContributorshipEntryAffiliationInfoComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationContributorshipEntryAffiliationInfoComponent res = new Citation.CitationContributorshipEntryAffiliationInfoComponent();
+ protected Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent parseCitationCitedArtifactContributorshipEntryAffiliationInfoComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent res = new Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationContributorshipEntryAffiliationInfoComponentContent(eventType, xpp, res))
+ if (!parseCitationCitedArtifactContributorshipEntryAffiliationInfoComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5747,7 +6035,7 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationContributorshipEntryAffiliationInfoComponentContent(int eventType, XmlPullParser xpp, Citation.CitationContributorshipEntryAffiliationInfoComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseCitationCitedArtifactContributorshipEntryAffiliationInfoComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("affiliation")) {
res.setAffiliationElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("role")) {
@@ -5760,13 +6048,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected Citation.CitationContributorshipSummaryComponent parseCitationContributorshipSummaryComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationContributorshipSummaryComponent res = new Citation.CitationContributorshipSummaryComponent();
+ protected Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent parseCitationCitedArtifactContributorshipEntryContributionInstanceComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent res = new Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationContributorshipSummaryComponentContent(eventType, xpp, res))
+ if (!parseCitationCitedArtifactContributorshipEntryContributionInstanceComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -5775,7 +6063,33 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseCitationContributorshipSummaryComponentContent(int eventType, XmlPullParser xpp, Citation.CitationContributorshipSummaryComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseCitationCitedArtifactContributorshipEntryContributionInstanceComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("time")) {
+ res.setTimeElement(parseDateTime(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected Citation.CitationCitedArtifactContributorshipSummaryComponent parseCitationCitedArtifactContributorshipSummaryComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ Citation.CitationCitedArtifactContributorshipSummaryComponent res = new Citation.CitationCitedArtifactContributorshipSummaryComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseCitationCitedArtifactContributorshipSummaryComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseCitationCitedArtifactContributorshipSummaryComponentContent(int eventType, XmlPullParser xpp, Citation.CitationCitedArtifactContributorshipSummaryComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("style")) {
@@ -5790,340 +6104,6 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected Citation.CitationAlternativeFormComponent parseCitationAlternativeFormComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationAlternativeFormComponent res = new Citation.CitationAlternativeFormComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationAlternativeFormComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationAlternativeFormComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAlternativeFormComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publishingModel")) {
- res.setPublishingModel(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("language")) {
- res.setLanguage(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("journalIssue")) {
- res.setJournalIssue(parseCitationAlternativeFormJournalIssueComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pagination")) {
- res.setPagination(parseCitationAlternativeFormPaginationComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publicationInfo")) {
- res.setPublicationInfo(parseCitationAlternativeFormPublicationInfoComponent(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationAlternativeFormJournalIssueComponent parseCitationAlternativeFormJournalIssueComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationAlternativeFormJournalIssueComponent res = new Citation.CitationAlternativeFormJournalIssueComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationAlternativeFormJournalIssueComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationAlternativeFormJournalIssueComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAlternativeFormJournalIssueComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("citedMedium")) {
- res.setCitedMedium(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("volume")) {
- res.setVolumeElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("issue")) {
- res.setIssueElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publicationDate")) {
- res.setPublicationDate(parseCitationAlternativeFormJournalIssuePublicationDateComponent(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationAlternativeFormJournalIssuePublicationDateComponent parseCitationAlternativeFormJournalIssuePublicationDateComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationAlternativeFormJournalIssuePublicationDateComponent res = new Citation.CitationAlternativeFormJournalIssuePublicationDateComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationAlternativeFormJournalIssuePublicationDateComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationAlternativeFormJournalIssuePublicationDateComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAlternativeFormJournalIssuePublicationDateComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
- res.setDateElement(parseDate(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("year")) {
- res.setYearElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("month")) {
- res.setMonthElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("day")) {
- res.setDayElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("season")) {
- res.setSeasonElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("text")) {
- res.setTextElement(parseString(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationAlternativeFormPaginationComponent parseCitationAlternativeFormPaginationComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationAlternativeFormPaginationComponent res = new Citation.CitationAlternativeFormPaginationComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationAlternativeFormPaginationComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationAlternativeFormPaginationComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAlternativeFormPaginationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pageString")) {
- res.setPageStringElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("firstPage")) {
- res.setFirstPageElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lastPage")) {
- res.setLastPageElement(parseString(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationAlternativeFormPublicationInfoComponent parseCitationAlternativeFormPublicationInfoComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationAlternativeFormPublicationInfoComponent res = new Citation.CitationAlternativeFormPublicationInfoComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationAlternativeFormPublicationInfoComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationAlternativeFormPublicationInfoComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAlternativeFormPublicationInfoComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publishedIn")) {
- res.setPublishedIn(parseCitationAlternativeFormPublicationInfoPublishedInComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("entryDate")) {
- res.setEntryDateElement(parseDateTime(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("revisionDate")) {
- res.setRevisionDateElement(parseDateTime(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pageCount")) {
- res.setPageCountElement(parseString(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationAlternativeFormPublicationInfoPublishedInComponent parseCitationAlternativeFormPublicationInfoPublishedInComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationAlternativeFormPublicationInfoPublishedInComponent res = new Citation.CitationAlternativeFormPublicationInfoPublishedInComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationAlternativeFormPublicationInfoPublishedInComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationAlternativeFormPublicationInfoPublishedInComponentContent(int eventType, XmlPullParser xpp, Citation.CitationAlternativeFormPublicationInfoPublishedInComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
- res.setType(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
- res.setNameElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisher")) {
- res.setPublisher(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisherLocation")) {
- res.setPublisherLocationElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("startDate")) {
- res.setStartDateElement(parseDate(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationKeywordListComponent parseCitationKeywordListComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationKeywordListComponent res = new Citation.CitationKeywordListComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationKeywordListComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationKeywordListComponentContent(int eventType, XmlPullParser xpp, Citation.CitationKeywordListComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("owner")) {
- res.setOwnerElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("keyword")) {
- res.getKeyword().add(parseCitationKeywordListKeywordComponent(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationKeywordListKeywordComponent parseCitationKeywordListKeywordComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationKeywordListKeywordComponent res = new Citation.CitationKeywordListKeywordComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationKeywordListKeywordComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationKeywordListKeywordComponentContent(int eventType, XmlPullParser xpp, Citation.CitationKeywordListKeywordComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("majorTopic")) {
- res.setMajorTopicElement(parseBoolean(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("value")) {
- res.setValueElement(parseString(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationMedlinePubMedComponent parseCitationMedlinePubMedComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationMedlinePubMedComponent res = new Citation.CitationMedlinePubMedComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationMedlinePubMedComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationMedlinePubMedComponentContent(int eventType, XmlPullParser xpp, Citation.CitationMedlinePubMedComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("medlineState")) {
- res.setMedlineState(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("owner")) {
- res.setOwner(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pmid")) {
- res.setPmidElement(parsePositiveInt(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pmidVersion")) {
- res.setPmidVersionElement(parsePositiveInt(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dateCreated")) {
- res.setDateCreatedElement(parseDate(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dateCompleted")) {
- res.setDateCompletedElement(parseDate(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dateRevised")) {
- res.setDateRevisedElement(parseDate(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pubMedPubDate")) {
- res.getPubMedPubDate().add(parseCitationMedlinePubMedPubMedPubDateComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publicationState")) {
- res.setPublicationState(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedArticle")) {
- res.getRelatedArticle().add(parseCitationMedlinePubMedRelatedArticleComponent(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationMedlinePubMedPubMedPubDateComponent parseCitationMedlinePubMedPubMedPubDateComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationMedlinePubMedPubMedPubDateComponent res = new Citation.CitationMedlinePubMedPubMedPubDateComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationMedlinePubMedPubMedPubDateComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationMedlinePubMedPubMedPubDateComponentContent(int eventType, XmlPullParser xpp, Citation.CitationMedlinePubMedPubMedPubDateComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publicationState")) {
- res.setPublicationState(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
- res.setDateElement(parseDateTime(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Citation.CitationMedlinePubMedRelatedArticleComponent parseCitationMedlinePubMedRelatedArticleComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Citation.CitationMedlinePubMedRelatedArticleComponent res = new Citation.CitationMedlinePubMedRelatedArticleComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseCitationMedlinePubMedRelatedArticleComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseCitationMedlinePubMedRelatedArticleComponentContent(int eventType, XmlPullParser xpp, Citation.CitationMedlinePubMedRelatedArticleComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("citationReference")) {
- res.setCitationReference(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("citationMarkdown")) {
- res.setCitationMarkdownElement(parseMarkdown(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
- res.getIdentifier().add(parseIdentifier(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
protected Claim parseClaim(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
Claim res = new Claim();
parseResourceAttributes(xpp, res);
@@ -7229,11 +7209,11 @@ public class XmlParser extends XmlParserBase {
protected boolean parseClinicalUseIssueContraindicationComponentContent(int eventType, XmlPullParser xpp, ClinicalUseIssue.ClinicalUseIssueContraindicationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("diseaseSymptomProcedure")) {
- res.setDiseaseSymptomProcedure(parseCodeableConcept(xpp));
+ res.setDiseaseSymptomProcedure(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("diseaseStatus")) {
- res.setDiseaseStatus(parseCodeableConcept(xpp));
+ res.setDiseaseStatus(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("comorbidity")) {
- res.getComorbidity().add(parseCodeableConcept(xpp));
+ res.getComorbidity().add(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("indication")) {
res.getIndication().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("otherTherapy")) {
@@ -7260,10 +7240,10 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseClinicalUseIssueContraindicationOtherTherapyComponentContent(int eventType, XmlPullParser xpp, ClinicalUseIssue.ClinicalUseIssueContraindicationOtherTherapyComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("therapyRelationshipType")) {
- res.setTherapyRelationshipType(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "medication")) {
- res.setMedication(parseType("medication", xpp));
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relationshipType")) {
+ res.setRelationshipType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("therapy")) {
+ res.setTherapy(parseCodeableReference(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -7287,13 +7267,13 @@ public class XmlParser extends XmlParserBase {
protected boolean parseClinicalUseIssueIndicationComponentContent(int eventType, XmlPullParser xpp, ClinicalUseIssue.ClinicalUseIssueIndicationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("diseaseSymptomProcedure")) {
- res.setDiseaseSymptomProcedure(parseCodeableConcept(xpp));
+ res.setDiseaseSymptomProcedure(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("diseaseStatus")) {
- res.setDiseaseStatus(parseCodeableConcept(xpp));
+ res.setDiseaseStatus(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("comorbidity")) {
- res.getComorbidity().add(parseCodeableConcept(xpp));
+ res.getComorbidity().add(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("intendedEffect")) {
- res.setIntendedEffect(parseCodeableConcept(xpp));
+ res.setIntendedEffect(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("duration")) {
res.setDuration(parseQuantity(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("undesirableEffect")) {
@@ -7327,7 +7307,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("effect")) {
- res.setEffect(parseCodeableConcept(xpp));
+ res.setEffect(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("incidence")) {
res.setIncidence(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("management")) {
@@ -7379,7 +7359,7 @@ public class XmlParser extends XmlParserBase {
protected boolean parseClinicalUseIssueUndesirableEffectComponentContent(int eventType, XmlPullParser xpp, ClinicalUseIssue.ClinicalUseIssueUndesirableEffectComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("symptomConditionEffect")) {
- res.setSymptomConditionEffect(parseCodeableConcept(xpp));
+ res.setSymptomConditionEffect(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classification")) {
res.setClassification(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("frequencyOfOccurrence")) {
@@ -7730,6 +7710,8 @@ public class XmlParser extends XmlParserBase {
res.setStatusElement(parseEnumeration(xpp, Enumerations.RequestStatus.NULL, new Enumerations.RequestStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("statusReason")) {
res.setStatusReason(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("intent")) {
+ res.setIntentElement(parseEnumeration(xpp, Enumerations.RequestIntent.NULL, new Enumerations.RequestIntentEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("category")) {
res.getCategory().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("priority")) {
@@ -8063,7 +8045,7 @@ public class XmlParser extends XmlParserBase {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("url")) {
res.setUrlElement(parseUri(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
- res.addIdentifier(parseIdentifier(xpp));
+ res.getIdentifier().add(parseIdentifier(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("version")) {
res.setVersionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
@@ -8119,13 +8101,9 @@ public class XmlParser extends XmlParserBase {
protected boolean parseConceptMapGroupComponentContent(int eventType, XmlPullParser xpp, ConceptMap.ConceptMapGroupComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("source")) {
- res.setSourceElement(parseUri(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("sourceVersion")) {
- res.setSourceVersionElement(parseString(xpp));
+ res.setSourceElement(parseCanonical(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("target")) {
- res.setTargetElement(parseUri(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("targetVersion")) {
- res.setTargetVersionElement(parseString(xpp));
+ res.setTargetElement(parseCanonical(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("element")) {
res.getElement().add(parseConceptMapSourceElementComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("unmapped")) {
@@ -9735,7 +9713,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("request")) {
res.setRequest(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("outcome")) {
- res.setOutcomeElement(parseEnumeration(xpp, Enumerations.ClaimProcessingCodes.NULL, new Enumerations.ClaimProcessingCodesEnumFactory()));
+ res.setOutcomeElement(parseEnumeration(xpp, CoverageEligibilityResponse.EligibilityOutcome.NULL, new CoverageEligibilityResponse.EligibilityOutcomeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("disposition")) {
res.setDispositionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("insurer")) {
@@ -10198,10 +10176,8 @@ public class XmlParser extends XmlParserBase {
protected boolean parseDevicePropertyComponentContent(int eventType, XmlPullParser xpp, Device.DevicePropertyComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("valueQuantity")) {
- res.getValueQuantity().add(parseQuantity(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("valueCode")) {
- res.getValueCode().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "value")) {
+ res.setValue(parseType("value", xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -10287,11 +10263,15 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("modelNumber")) {
res.setModelNumberElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
- res.setType(parseCodeableConcept(xpp));
+ res.getType().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("specialization")) {
res.getSpecialization().add(parseDeviceDefinitionSpecializationComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("hasPart")) {
+ res.getHasPart().add(parseDeviceDefinitionHasPartComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("packaging")) {
+ res.getPackaging().add(parseDeviceDefinitionPackagingComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("version")) {
- res.getVersion().add(parseString(xpp));
+ res.getVersion().add(parseDeviceDefinitionVersionComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("safety")) {
res.getSafety().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("shelfLifeStorage")) {
@@ -10312,8 +10292,6 @@ public class XmlParser extends XmlParserBase {
res.setOnlineInformationElement(parseUri(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
res.getNote().add(parseAnnotation(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("quantity")) {
- res.setQuantity(parseQuantity(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("parentDevice")) {
res.setParentDevice(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("material")) {
@@ -10404,6 +10382,148 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected DeviceDefinition.DeviceDefinitionHasPartComponent parseDeviceDefinitionHasPartComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ DeviceDefinition.DeviceDefinitionHasPartComponent res = new DeviceDefinition.DeviceDefinitionHasPartComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseDeviceDefinitionHasPartComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseDeviceDefinitionHasPartComponentContent(int eventType, XmlPullParser xpp, DeviceDefinition.DeviceDefinitionHasPartComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reference")) {
+ res.setReference(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("count")) {
+ res.setCountElement(parseInteger(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected DeviceDefinition.DeviceDefinitionPackagingComponent parseDeviceDefinitionPackagingComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ DeviceDefinition.DeviceDefinitionPackagingComponent res = new DeviceDefinition.DeviceDefinitionPackagingComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseDeviceDefinitionPackagingComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseDeviceDefinitionPackagingComponentContent(int eventType, XmlPullParser xpp, DeviceDefinition.DeviceDefinitionPackagingComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
+ res.setIdentifier(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("count")) {
+ res.setCountElement(parseInteger(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("distributor")) {
+ res.getDistributor().add(parseDeviceDefinitionPackagingDistributorComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("udiDeviceIdentifier")) {
+ res.getUdiDeviceIdentifier().add(parseDeviceDefinitionPackagingUdiDeviceIdentifierComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("packaging")) {
+ res.getPackaging().add(parseDeviceDefinitionPackagingComponent(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected DeviceDefinition.DeviceDefinitionPackagingDistributorComponent parseDeviceDefinitionPackagingDistributorComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ DeviceDefinition.DeviceDefinitionPackagingDistributorComponent res = new DeviceDefinition.DeviceDefinitionPackagingDistributorComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseDeviceDefinitionPackagingDistributorComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseDeviceDefinitionPackagingDistributorComponentContent(int eventType, XmlPullParser xpp, DeviceDefinition.DeviceDefinitionPackagingDistributorComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
+ res.setNameElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("organizationReference")) {
+ res.getOrganizationReference().add(parseReference(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent parseDeviceDefinitionPackagingUdiDeviceIdentifierComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent res = new DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseDeviceDefinitionPackagingUdiDeviceIdentifierComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseDeviceDefinitionPackagingUdiDeviceIdentifierComponentContent(int eventType, XmlPullParser xpp, DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("deviceIdentifier")) {
+ res.setDeviceIdentifierElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("issuer")) {
+ res.setIssuerElement(parseUri(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("jurisdiction")) {
+ res.setJurisdictionElement(parseUri(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected DeviceDefinition.DeviceDefinitionVersionComponent parseDeviceDefinitionVersionComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ DeviceDefinition.DeviceDefinitionVersionComponent res = new DeviceDefinition.DeviceDefinitionVersionComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseDeviceDefinitionVersionComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseDeviceDefinitionVersionComponentContent(int eventType, XmlPullParser xpp, DeviceDefinition.DeviceDefinitionVersionComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("component")) {
+ res.setComponent(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("value")) {
+ res.setValueElement(parseString(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected DeviceDefinition.DeviceDefinitionCapabilityComponent parseDeviceDefinitionCapabilityComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
DeviceDefinition.DeviceDefinitionCapabilityComponent res = new DeviceDefinition.DeviceDefinitionCapabilityComponent();
parseElementAttributes(xpp, res);
@@ -10590,8 +10710,12 @@ public class XmlParser extends XmlParserBase {
res.setIntentElement(parseEnumeration(xpp, Enumerations.RequestIntent.NULL, new Enumerations.RequestIntentEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("priority")) {
res.setPriorityElement(parseEnumeration(xpp, Enumerations.RequestPriority.NULL, new Enumerations.RequestPriorityEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("doNotPerform")) {
+ res.setDoNotPerformElement(parseBoolean(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("code")) {
res.setCode(parseCodeableReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("quantity")) {
+ res.setQuantityElement(parseInteger(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("parameter")) {
res.getParameter().add(parseDeviceRequestParameterComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("subject")) {
@@ -10650,13 +10774,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected DeviceUseStatement parseDeviceUseStatement(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- DeviceUseStatement res = new DeviceUseStatement();
+ protected DeviceUsage parseDeviceUsage(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ DeviceUsage res = new DeviceUsage();
parseResourceAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseDeviceUseStatementContent(eventType, xpp, res))
+ if (!parseDeviceUsageContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -10665,13 +10789,13 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseDeviceUseStatementContent(int eventType, XmlPullParser xpp, DeviceUseStatement res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseDeviceUsageContent(int eventType, XmlPullParser xpp, DeviceUsage res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
res.getIdentifier().add(parseIdentifier(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("basedOn")) {
res.getBasedOn().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
- res.setStatusElement(parseEnumeration(xpp, DeviceUseStatement.DeviceUseStatementStatus.NULL, new DeviceUseStatement.DeviceUseStatementStatusEnumFactory()));
+ res.setStatusElement(parseEnumeration(xpp, DeviceUsage.DeviceUsageStatus.NULL, new DeviceUsage.DeviceUsageStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("category")) {
res.getCategory().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("subject")) {
@@ -10750,6 +10874,8 @@ public class XmlParser extends XmlParserBase {
res.getImagingStudy().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("media")) {
res.getMedia().add(parseDiagnosticReportMediaComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("composition")) {
+ res.setComposition(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("conclusion")) {
res.setConclusionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("conclusionCode")) {
@@ -11357,7 +11483,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("request")) {
res.setRequest(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("outcome")) {
- res.setOutcomeElement(parseEnumeration(xpp, Enumerations.ClaimProcessingCodes.NULL, new Enumerations.ClaimProcessingCodesEnumFactory()));
+ res.setOutcomeElement(parseEnumeration(xpp, EnrollmentResponse.EnrollmentOutcome.NULL, new EnrollmentResponse.EnrollmentOutcomeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("disposition")) {
res.setDispositionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("created")) {
@@ -11574,6 +11700,8 @@ public class XmlParser extends XmlParserBase {
res.setVersionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
res.setTitleElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "citeAs")) {
+ res.setCiteAs(parseType("citeAs", xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
res.setStatusElement(parseEnumeration(xpp, Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
@@ -11672,44 +11800,18 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseEvidenceCertaintyComponentContent(int eventType, XmlPullParser xpp, Evidence.EvidenceCertaintyComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
- res.setDescriptionElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
- res.getNote().add(parseAnnotation(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("rating")) {
- res.getRating().add(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("certaintySubcomponent")) {
- res.getCertaintySubcomponent().add(parseEvidenceCertaintyCertaintySubcomponentComponent(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Evidence.EvidenceCertaintyCertaintySubcomponentComponent parseEvidenceCertaintyCertaintySubcomponentComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Evidence.EvidenceCertaintyCertaintySubcomponentComponent res = new Evidence.EvidenceCertaintyCertaintySubcomponentComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseEvidenceCertaintyCertaintySubcomponentComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseEvidenceCertaintyCertaintySubcomponentComponentContent(int eventType, XmlPullParser xpp, Evidence.EvidenceCertaintyCertaintySubcomponentComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
res.getNote().add(parseAnnotation(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
- res.getType().add(parseCodeableConcept(xpp));
+ res.setType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("rating")) {
- res.getRating().add(parseCodeableConcept(xpp));
+ res.setRating(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("rater")) {
+ res.setRaterElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("subcomponent")) {
+ res.getSubcomponent().add(parseEvidenceCertaintyComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -11742,8 +11844,8 @@ public class XmlParser extends XmlParserBase {
res.getIdentifier().add(parseIdentifier(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedIdentifier")) {
res.getRelatedIdentifier().add(parseIdentifier(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("citeAs")) {
- res.setCiteAs(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "citeAs")) {
+ res.setCiteAs(parseType("citeAs", xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
@@ -11890,6 +11992,8 @@ public class XmlParser extends XmlParserBase {
res.getEntryClassifier().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("entryReference")) {
res.getEntryReference().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("entryQuantity")) {
+ res.getEntryQuantity().add(parseQuantity(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("emptyReason")) {
res.setEmptyReason(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("section")) {
@@ -13402,8 +13506,8 @@ public class XmlParser extends XmlParserBase {
res.setStatusDateElement(parseDate(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("statusReason")) {
res.setStatusReasonElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("expressedBy")) {
- res.setExpressedBy(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("source")) {
+ res.setSource(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("addresses")) {
res.getAddresses().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
@@ -14836,6 +14940,8 @@ public class XmlParser extends XmlParserBase {
res.setRole(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("function")) {
res.getFunction().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("group")) {
+ res.setGroup(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseMarkdown(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("allergenicIndicator")) {
@@ -14868,8 +14974,8 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseIngredientSubstanceComponentContent(int eventType, XmlPullParser xpp, Ingredient.IngredientSubstanceComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "code")) {
- res.setCode(parseType("code", xpp));
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("code")) {
+ res.setCode(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("strength")) {
res.getStrength().add(parseIngredientSubstanceStrengthComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
@@ -14894,18 +15000,20 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseIngredientSubstanceStrengthComponentContent(int eventType, XmlPullParser xpp, Ingredient.IngredientSubstanceStrengthComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("presentation")) {
- res.setPresentation(parseRatio(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("presentationHighLimit")) {
- res.setPresentationHighLimit(parseRatio(xpp));
+ if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "presentation")) {
+ res.setPresentation(parseType("presentation", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "presentationHighLimit")) {
+ res.setPresentationHighLimit(parseType("presentationHighLimit", xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("presentationText")) {
res.setPresentationTextElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("concentration")) {
- res.setConcentration(parseRatio(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("concentrationHighLimit")) {
- res.setConcentrationHighLimit(parseRatio(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "concentration")) {
+ res.setConcentration(parseType("concentration", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "concentrationHighLimit")) {
+ res.setConcentrationHighLimit(parseType("concentrationHighLimit", xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("concentrationText")) {
res.setConcentrationTextElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("basis")) {
+ res.setBasis(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("measurementPoint")) {
res.setMeasurementPointElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("country")) {
@@ -14934,12 +15042,12 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseIngredientSubstanceStrengthReferenceStrengthComponentContent(int eventType, XmlPullParser xpp, Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "substance")) {
- res.setSubstance(parseType("substance", xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("strength")) {
- res.setStrength(parseRatio(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("strengthHighLimit")) {
- res.setStrengthHighLimit(parseRatio(xpp));
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("substance")) {
+ res.setSubstance(parseCodeableReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "strength")) {
+ res.setStrength(parseType("strength", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "strengthHighLimit")) {
+ res.setStrengthHighLimit(parseType("strengthHighLimit", xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("measurementPoint")) {
res.setMeasurementPointElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("country")) {
@@ -14966,8 +15074,8 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseIngredientSpecifiedSubstanceComponentContent(int eventType, XmlPullParser xpp, Ingredient.IngredientSpecifiedSubstanceComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "code")) {
- res.setCode(parseType("code", xpp));
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("code")) {
+ res.setCode(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("group")) {
res.setGroup(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("confidentiality")) {
@@ -15288,6 +15396,114 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected InventoryReport parseInventoryReport(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ InventoryReport res = new InventoryReport();
+ parseResourceAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseInventoryReportContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseInventoryReportContent(int eventType, XmlPullParser xpp, InventoryReport res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
+ res.getIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
+ res.setStatusElement(parseEnumeration(xpp, InventoryReport.InventoryReportStatus.NULL, new InventoryReport.InventoryReportStatusEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("countType")) {
+ res.setCountTypeElement(parseEnumeration(xpp, InventoryReport.InventoryCountType.NULL, new InventoryReport.InventoryCountTypeEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("operationType")) {
+ res.setOperationType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("operationTypeReason")) {
+ res.setOperationTypeReason(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reportedDateTime")) {
+ res.setReportedDateTimeElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reporter")) {
+ res.setReporter(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reportingPeriod")) {
+ res.setReportingPeriod(parsePeriod(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("inventoryListing")) {
+ res.getInventoryListing().add(parseInventoryReportInventoryListingComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
+ res.setNote(parseAnnotation(xpp));
+ } else if (!parseDomainResourceContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected InventoryReport.InventoryReportInventoryListingComponent parseInventoryReportInventoryListingComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ InventoryReport.InventoryReportInventoryListingComponent res = new InventoryReport.InventoryReportInventoryListingComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseInventoryReportInventoryListingComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseInventoryReportInventoryListingComponentContent(int eventType, XmlPullParser xpp, InventoryReport.InventoryReportInventoryListingComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("location")) {
+ res.setLocation(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("itemStatus")) {
+ res.setItemStatus(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("countingDateTime")) {
+ res.setCountingDateTimeElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("items")) {
+ res.getItems().add(parseInventoryReportInventoryListingItemsComponent(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected InventoryReport.InventoryReportInventoryListingItemsComponent parseInventoryReportInventoryListingItemsComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ InventoryReport.InventoryReportInventoryListingItemsComponent res = new InventoryReport.InventoryReportInventoryListingItemsComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseInventoryReportInventoryListingItemsComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseInventoryReportInventoryListingItemsComponentContent(int eventType, XmlPullParser xpp, InventoryReport.InventoryReportInventoryListingItemsComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("category")) {
+ res.setCategory(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("quantity")) {
+ res.setQuantity(parseQuantity(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("item")) {
+ res.setItem(parseCodeableReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("lot")) {
+ res.setLotElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("serial")) {
+ res.setSerialElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("expiry")) {
+ res.setExpiryElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("manufacturingDate")) {
+ res.setManufacturingDateElement(parseDateTime(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected Invoice parseInvoice(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
Invoice res = new Invoice();
parseResourceAttributes(xpp, res);
@@ -15781,7 +15997,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("manufacturer")) {
res.getManufacturer().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("ingredient")) {
- res.getIngredient().add(parseReference(xpp));
+ res.getIngredient().add(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("property")) {
res.getProperty().add(parseManufacturedItemDefinitionPropertyComponent(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
@@ -15850,6 +16066,8 @@ public class XmlParser extends XmlParserBase {
res.setExperimentalElement(parseBoolean(xpp));
} else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "subject")) {
res.setSubject(parseType("subject", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("basis")) {
+ res.setBasisElement(parseEnumeration(xpp, Enumerations.FHIRAllTypes.NULL, new Enumerations.FHIRAllTypesEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
res.setDateElement(parseDateTime(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisher")) {
@@ -15892,6 +16110,8 @@ public class XmlParser extends XmlParserBase {
res.setDisclaimerElement(parseMarkdown(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("scoring")) {
res.setScoring(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("scoringUnit")) {
+ res.setScoringUnit(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("compositeScoring")) {
res.setCompositeScoring(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
@@ -15940,6 +16160,16 @@ public class XmlParser extends XmlParserBase {
res.setCode(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.getType().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("basis")) {
+ res.setBasisElement(parseEnumeration(xpp, Enumerations.FHIRAllTypes.NULL, new Enumerations.FHIRAllTypesEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("scoring")) {
+ res.setScoring(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("scoringUnit")) {
+ res.setScoringUnit(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("improvementNotation")) {
+ res.setImprovementNotation(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("population")) {
res.getPopulation().add(parseMeasureGroupPopulationComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("stratifier")) {
@@ -15972,6 +16202,10 @@ public class XmlParser extends XmlParserBase {
res.setDescriptionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("criteria")) {
res.setCriteria(parseExpression(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("inputPopulationId")) {
+ res.setInputPopulationIdElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("aggregateMethod")) {
+ res.setAggregateMethod(parseCodeableConcept(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -16088,6 +16322,8 @@ public class XmlParser extends XmlParserBase {
res.setStatusElement(parseEnumeration(xpp, MeasureReport.MeasureReportStatus.NULL, new MeasureReport.MeasureReportStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setTypeElement(parseEnumeration(xpp, MeasureReport.MeasureReportType.NULL, new MeasureReport.MeasureReportTypeEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dataUpdateType")) {
+ res.setDataUpdateTypeElement(parseEnumeration(xpp, MeasureReport.SubmitDataUpdateType.NULL, new MeasureReport.SubmitDataUpdateTypeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("measure")) {
res.setMeasureElement(parseCanonical(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("subject")) {
@@ -16096,8 +16332,12 @@ public class XmlParser extends XmlParserBase {
res.setDateElement(parseDateTime(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reporter")) {
res.setReporter(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reportingVendor")) {
+ res.setReportingVendor(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("period")) {
res.setPeriod(parsePeriod(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("scoring")) {
+ res.setScoring(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("improvementNotation")) {
res.setImprovementNotation(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("group")) {
@@ -16130,8 +16370,8 @@ public class XmlParser extends XmlParserBase {
res.setCode(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("population")) {
res.getPopulation().add(parseMeasureReportGroupPopulationComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("measureScore")) {
- res.setMeasureScore(parseQuantity(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "measureScore")) {
+ res.setMeasureScore(parseType("measureScore", xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("stratifier")) {
res.getStratifier().add(parseMeasureReportGroupStratifierComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
@@ -16210,14 +16450,14 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseMeasureReportStratifierGroupComponentContent(int eventType, XmlPullParser xpp, MeasureReport.StratifierGroupComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("value")) {
- res.setValue(parseCodeableConcept(xpp));
+ if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "value")) {
+ res.setValue(parseType("value", xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("component")) {
res.getComponent().add(parseMeasureReportStratifierGroupComponentComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("population")) {
res.getPopulation().add(parseMeasureReportStratifierGroupPopulationComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("measureScore")) {
- res.setMeasureScore(parseQuantity(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "measureScore")) {
+ res.setMeasureScore(parseType("measureScore", xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -16242,8 +16482,8 @@ public class XmlParser extends XmlParserBase {
protected boolean parseMeasureReportStratifierGroupComponentComponentContent(int eventType, XmlPullParser xpp, MeasureReport.StratifierGroupComponentComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("code")) {
res.setCode(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("value")) {
- res.setValue(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "value")) {
+ res.setValue(parseType("value", xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -16300,8 +16540,8 @@ public class XmlParser extends XmlParserBase {
res.setCode(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
res.setStatusElement(parseEnumeration(xpp, Medication.MedicationStatusCodes.NULL, new Medication.MedicationStatusCodesEnumFactory()));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("manufacturer")) {
- res.setManufacturer(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("sponsor")) {
+ res.setSponsor(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("doseForm")) {
res.setDoseForm(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("amount")) {
@@ -16648,8 +16888,8 @@ public class XmlParser extends XmlParserBase {
res.setStatusElement(parseEnumeration(xpp, MedicationKnowledge.MedicationKnowledgeStatusCodes.NULL, new MedicationKnowledge.MedicationKnowledgeStatusCodesEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("author")) {
res.setAuthor(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("manufacturer")) {
- res.setManufacturer(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("sponsor")) {
+ res.setSponsor(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("doseForm")) {
res.setDoseForm(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("amount")) {
@@ -16678,8 +16918,8 @@ public class XmlParser extends XmlParserBase {
res.getCost().add(parseMedicationKnowledgeCostComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("monitoringProgram")) {
res.getMonitoringProgram().add(parseMedicationKnowledgeMonitoringProgramComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("administrationGuideline")) {
- res.getAdministrationGuideline().add(parseMedicationKnowledgeAdministrationGuidelineComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("indicationGuideline")) {
+ res.getIndicationGuideline().add(parseMedicationKnowledgeIndicationGuidelineComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("medicineClassification")) {
res.getMedicineClassification().add(parseMedicationKnowledgeMedicineClassificationComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("packaging")) {
@@ -16769,7 +17009,7 @@ public class XmlParser extends XmlParserBase {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("item")) {
res.setItem(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("isActive")) {
- res.setIsActiveElement(parseBoolean(xpp));
+ res.setIsActive(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "strength")) {
res.setStrength(parseType("strength", xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
@@ -16834,13 +17074,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent parseMedicationKnowledgeAdministrationGuidelineComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent res = new MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent();
+ protected MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent parseMedicationKnowledgeIndicationGuidelineComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent res = new MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseMedicationKnowledgeAdministrationGuidelineComponentContent(eventType, xpp, res))
+ if (!parseMedicationKnowledgeIndicationGuidelineComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -16849,26 +17089,24 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseMedicationKnowledgeAdministrationGuidelineComponentContent(int eventType, XmlPullParser xpp, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dosage")) {
- res.getDosage().add(parseMedicationKnowledgeAdministrationGuidelineDosageComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("indication")) {
- res.setIndication(parseCodeableReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("patientCharacteristic")) {
- res.getPatientCharacteristic().add(parseMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent(xpp));
+ protected boolean parseMedicationKnowledgeIndicationGuidelineComponentContent(int eventType, XmlPullParser xpp, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("indication")) {
+ res.getIndication().add(parseCodeableReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dosingGuideline")) {
+ res.getDosingGuideline().add(parseMedicationKnowledgeIndicationGuidelineDosingGuidelineComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
return true;
}
- protected MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent parseMedicationKnowledgeAdministrationGuidelineDosageComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent res = new MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent();
+ protected MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent parseMedicationKnowledgeIndicationGuidelineDosingGuidelineComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent res = new MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseMedicationKnowledgeAdministrationGuidelineDosageComponentContent(eventType, xpp, res))
+ if (!parseMedicationKnowledgeIndicationGuidelineDosingGuidelineComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -16877,7 +17115,37 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseMedicationKnowledgeAdministrationGuidelineDosageComponentContent(int eventType, XmlPullParser xpp, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseMedicationKnowledgeIndicationGuidelineDosingGuidelineComponentContent(int eventType, XmlPullParser xpp, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("treatmentIntent")) {
+ res.setTreatmentIntent(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dosage")) {
+ res.getDosage().add(parseMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("administrationTreatment")) {
+ res.setAdministrationTreatment(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("patientCharacteristic")) {
+ res.getPatientCharacteristic().add(parseMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent parseMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent res = new MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponentContent(int eventType, XmlPullParser xpp, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dosage")) {
@@ -16888,13 +17156,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent parseMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent res = new MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent();
+ protected MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent parseMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent res = new MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponentContent(eventType, xpp, res))
+ if (!parseMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -16903,7 +17171,7 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponentContent(int eventType, XmlPullParser xpp, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponentContent(int eventType, XmlPullParser xpp, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "value")) {
@@ -17228,6 +17496,10 @@ public class XmlParser extends XmlParserBase {
res.setExpectedSupplyDuration(parseDuration(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dispenser")) {
res.setDispenser(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dispenserInstruction")) {
+ res.getDispenserInstruction().add(parseAnnotation(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("doseAdministrationAid")) {
+ res.setDoseAdministrationAid(parseCodeableConcept(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -17336,8 +17608,8 @@ public class XmlParser extends XmlParserBase {
res.setRenderedDosageInstructionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("dosage")) {
res.getDosage().add(parseDosage(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("takenAsOrdered")) {
- res.setTakenAsOrderedElement(parseBoolean(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("adherence")) {
+ res.setAdherence(parseCodeableConcept(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
return false;
}
@@ -17392,12 +17664,8 @@ public class XmlParser extends XmlParserBase {
res.getCharacteristic().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("marketingStatus")) {
res.getMarketingStatus().add(parseMarketingStatus(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("pharmaceuticalProduct")) {
- res.getPharmaceuticalProduct().add(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("packagedMedicinalProduct")) {
- res.getPackagedMedicinalProduct().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("ingredient")) {
- res.getIngredient().add(parseReference(xpp));
+ res.getIngredient().add(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("impurity")) {
res.getImpurity().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("attachedDocument")) {
@@ -17412,8 +17680,12 @@ public class XmlParser extends XmlParserBase {
res.getName().add(parseMedicinalProductDefinitionNameComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("crossReference")) {
res.getCrossReference().add(parseMedicinalProductDefinitionCrossReferenceComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("manufacturingBusinessOperation")) {
- res.getManufacturingBusinessOperation().add(parseMedicinalProductDefinitionManufacturingBusinessOperationComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("operation")) {
+ res.getOperation().add(parseMedicinalProductDefinitionOperationComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("package")) {
+ res.getPackage().add(parseMedicinalProductDefinitionPackageComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("administrableProduct")) {
+ res.getAdministrableProduct().add(parseMedicinalProductDefinitionAdministrableProductComponent(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
return false;
}
@@ -17556,13 +17828,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent parseMedicinalProductDefinitionManufacturingBusinessOperationComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent res = new MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent();
+ protected MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent parseMedicinalProductDefinitionOperationComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent res = new MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseMedicinalProductDefinitionManufacturingBusinessOperationComponentContent(eventType, xpp, res))
+ if (!parseMedicinalProductDefinitionOperationComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -17571,13 +17843,13 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseMedicinalProductDefinitionManufacturingBusinessOperationComponentContent(int eventType, XmlPullParser xpp, MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseMedicinalProductDefinitionOperationComponentContent(int eventType, XmlPullParser xpp, MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("effectiveDate")) {
res.setEffectiveDate(parsePeriod(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("manufacturer")) {
- res.getManufacturer().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("organization")) {
+ res.getOrganization().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("authorization")) {
res.setAuthorization(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("confidentialityIndicator")) {
@@ -17588,6 +17860,60 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent parseMedicinalProductDefinitionPackageComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent res = new MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseMedicinalProductDefinitionPackageComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseMedicinalProductDefinitionPackageComponentContent(int eventType, XmlPullParser xpp, MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "size")) {
+ res.setSize(parseType("size", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("package")) {
+ res.setPackage(parseReference(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent parseMedicinalProductDefinitionAdministrableProductComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent res = new MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseMedicinalProductDefinitionAdministrableProductComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseMedicinalProductDefinitionAdministrableProductComponentContent(int eventType, XmlPullParser xpp, MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("route")) {
+ res.getRoute().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("product")) {
+ res.setProduct(parseReference(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected MessageDefinition parseMessageDefinition(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
MessageDefinition res = new MessageDefinition();
parseResourceAttributes(xpp, res);
@@ -18204,6 +18530,8 @@ public class XmlParser extends XmlParserBase {
res.setVersionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
res.setNameElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
+ res.setTitleElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
res.setStatusElement(parseEnumeration(xpp, Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("kind")) {
@@ -18260,6 +18588,8 @@ public class XmlParser extends XmlParserBase {
res.setCommentElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("period")) {
res.setPeriod(parsePeriod(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("authoritative")) {
+ res.setAuthoritativeElement(parseBoolean(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -18828,6 +19158,8 @@ public class XmlParser extends XmlParserBase {
protected boolean parseObservationContent(int eventType, XmlPullParser xpp, Observation res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
res.getIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "instantiates")) {
+ res.setInstantiates(parseType("instantiates", xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("basedOn")) {
res.getBasedOn().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("partOf")) {
@@ -18968,18 +19300,14 @@ public class XmlParser extends XmlParserBase {
res.setIdentifier(parseIdentifier(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("version")) {
res.setVersionElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
+ res.setNameElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
res.setTitleElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("derivedFromCanonical")) {
- res.getDerivedFromCanonical().add(parseCanonical(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("derivedFromUri")) {
- res.getDerivedFromUri().add(parseUri(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
res.setStatusElement(parseEnumeration(xpp, Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("experimental")) {
res.setExperimentalElement(parseBoolean(xpp));
- } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "subject")) {
- res.setSubject(parseType("subject", xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
res.setDateElement(parseDateTime(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("publisher")) {
@@ -19002,6 +19330,12 @@ public class XmlParser extends XmlParserBase {
res.setLastReviewDateElement(parseDate(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("effectivePeriod")) {
res.setEffectivePeriod(parsePeriod(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("derivedFromCanonical")) {
+ res.getDerivedFromCanonical().add(parseCanonical(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("derivedFromUri")) {
+ res.getDerivedFromUri().add(parseUri(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("subject")) {
+ res.setSubject(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("performerType")) {
res.setPerformerType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("category")) {
@@ -19017,23 +19351,15 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("method")) {
res.setMethod(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("specimen")) {
- res.setSpecimen(parseReference(xpp));
+ res.getSpecimen().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("device")) {
- res.setDevice(parseReference(xpp));
+ res.getDevice().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("preferredReportName")) {
res.setPreferredReportNameElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("quantitativeDetails")) {
res.setQuantitativeDetails(parseObservationDefinitionQuantitativeDetailsComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("qualifiedInterval")) {
- res.getQualifiedInterval().add(parseObservationDefinitionQualifiedIntervalComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("validCodedValueSet")) {
- res.setValidCodedValueSet(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("normalCodedValueSet")) {
- res.setNormalCodedValueSet(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("abnormalCodedValueSet")) {
- res.setAbnormalCodedValueSet(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("criticalCodedValueSet")) {
- res.setCriticalCodedValueSet(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("qualifiedValue")) {
+ res.getQualifiedValue().add(parseObservationDefinitionQualifiedValueComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("hasMember")) {
res.getHasMember().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("component")) {
@@ -19060,10 +19386,10 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseObservationDefinitionQuantitativeDetailsComponentContent(int eventType, XmlPullParser xpp, ObservationDefinition.ObservationDefinitionQuantitativeDetailsComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("customaryUnit")) {
- res.setCustomaryUnit(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("unit")) {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("unit")) {
res.setUnit(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("customaryUnit")) {
+ res.setCustomaryUnit(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("conversionFactor")) {
res.setConversionFactorElement(parseDecimal(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("decimalPrecision")) {
@@ -19074,13 +19400,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent parseObservationDefinitionQualifiedIntervalComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent res = new ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent();
+ protected ObservationDefinition.ObservationDefinitionQualifiedValueComponent parseObservationDefinitionQualifiedValueComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ ObservationDefinition.ObservationDefinitionQualifiedValueComponent res = new ObservationDefinition.ObservationDefinitionQualifiedValueComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseObservationDefinitionQualifiedIntervalComponentContent(eventType, xpp, res))
+ if (!parseObservationDefinitionQualifiedValueComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -19089,12 +19415,8 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseObservationDefinitionQualifiedIntervalComponentContent(int eventType, XmlPullParser xpp, ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("category")) {
- res.setCategoryElement(parseEnumeration(xpp, ObservationDefinition.ObservationRangeCategory.NULL, new ObservationDefinition.ObservationRangeCategoryEnumFactory()));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("range")) {
- res.setRange(parseRange(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("context")) {
+ protected boolean parseObservationDefinitionQualifiedValueComponentContent(int eventType, XmlPullParser xpp, ObservationDefinition.ObservationDefinitionQualifiedValueComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("context")) {
res.setContext(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("appliesTo")) {
res.getAppliesTo().add(parseCodeableConcept(xpp));
@@ -19106,6 +19428,18 @@ public class XmlParser extends XmlParserBase {
res.setGestationalAge(parseRange(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("condition")) {
res.setConditionElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("rangeCategory")) {
+ res.setRangeCategoryElement(parseEnumeration(xpp, ObservationDefinition.ObservationRangeCategory.NULL, new ObservationDefinition.ObservationRangeCategoryEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("range")) {
+ res.setRange(parseRange(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("validCodedValueSet")) {
+ res.setValidCodedValueSetElement(parseCanonical(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("normalCodedValueSet")) {
+ res.setNormalCodedValueSetElement(parseCanonical(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("abnormalCodedValueSet")) {
+ res.setAbnormalCodedValueSetElement(parseCanonical(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("criticalCodedValueSet")) {
+ res.setCriticalCodedValueSetElement(parseCanonical(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -19134,8 +19468,8 @@ public class XmlParser extends XmlParserBase {
res.getPermittedDataType().add(parseEnumeration(xpp, ObservationDefinition.ObservationDataType.NULL, new ObservationDefinition.ObservationDataTypeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("quantitativeDetails")) {
res.setQuantitativeDetails(parseObservationDefinitionQuantitativeDetailsComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("qualifiedInterval")) {
- res.getQualifiedInterval().add(parseObservationDefinitionQualifiedIntervalComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("qualifiedValue")) {
+ res.getQualifiedValue().add(parseObservationDefinitionQualifiedValueComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -19542,6 +19876,8 @@ public class XmlParser extends XmlParserBase {
res.setStatus(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("statusDate")) {
res.setStatusDateElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("containedItemQuantity")) {
+ res.getContainedItemQuantity().add(parseQuantity(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseMarkdown(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("legalStatusOfSupply")) {
@@ -19556,42 +19892,16 @@ public class XmlParser extends XmlParserBase {
res.setMarketingAuthorization(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("manufacturer")) {
res.getManufacturer().add(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("batchIdentifier")) {
- res.getBatchIdentifier().add(parsePackagedProductDefinitionBatchIdentifierComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("attachedDocument")) {
+ res.getAttachedDocument().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("package")) {
- res.getPackage().add(parsePackagedProductDefinitionPackageComponent(xpp));
+ res.setPackage(parsePackagedProductDefinitionPackageComponent(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
return false;
}
return true;
}
- protected PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent parsePackagedProductDefinitionBatchIdentifierComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent res = new PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parsePackagedProductDefinitionBatchIdentifierComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parsePackagedProductDefinitionBatchIdentifierComponentContent(int eventType, XmlPullParser xpp, PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("outerPackaging")) {
- res.setOuterPackaging(parseIdentifier(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("immediatePackaging")) {
- res.setImmediatePackaging(parseIdentifier(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
protected PackagedProductDefinition.PackagedProductDefinitionPackageComponent parsePackagedProductDefinitionPackageComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
PackagedProductDefinition.PackagedProductDefinitionPackageComponent res = new PackagedProductDefinition.PackagedProductDefinitionPackageComponent();
parseElementAttributes(xpp, res);
@@ -19677,7 +19987,7 @@ public class XmlParser extends XmlParserBase {
protected boolean parsePackagedProductDefinitionPackageContainedItemComponentContent(int eventType, XmlPullParser xpp, PackagedProductDefinition.PackagedProductDefinitionPackageContainedItemComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("item")) {
- res.getItem().add(parseReference(xpp));
+ res.getItem().add(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "amount")) {
res.setAmount(parseType("amount", xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
@@ -19959,7 +20269,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("requestor")) {
res.setRequestor(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("outcome")) {
- res.setOutcomeElement(parseEnumeration(xpp, Enumerations.ClaimProcessingCodes.NULL, new Enumerations.ClaimProcessingCodesEnumFactory()));
+ res.setOutcomeElement(parseEnumeration(xpp, PaymentReconciliation.PaymentOutcome.NULL, new PaymentReconciliation.PaymentOutcomeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("disposition")) {
res.setDispositionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("paymentDate")) {
@@ -20288,6 +20598,8 @@ public class XmlParser extends XmlParserBase {
res.getLibrary().add(parseCanonical(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("goal")) {
res.getGoal().add(parsePlanDefinitionGoalComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("actor")) {
+ res.getActor().add(parsePlanDefinitionActorComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("action")) {
res.getAction().add(parsePlanDefinitionActionComponent(xpp));
} else if (!parseMetadataResourceContent(eventType, xpp, res)){
@@ -20360,6 +20672,62 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected PlanDefinition.PlanDefinitionActorComponent parsePlanDefinitionActorComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ PlanDefinition.PlanDefinitionActorComponent res = new PlanDefinition.PlanDefinitionActorComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parsePlanDefinitionActorComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parsePlanDefinitionActorComponentContent(int eventType, XmlPullParser xpp, PlanDefinition.PlanDefinitionActorComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
+ res.setTitleElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
+ res.setDescriptionElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("option")) {
+ res.getOption().add(parsePlanDefinitionActorOptionComponent(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected PlanDefinition.PlanDefinitionActorOptionComponent parsePlanDefinitionActorOptionComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ PlanDefinition.PlanDefinitionActorOptionComponent res = new PlanDefinition.PlanDefinitionActorOptionComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parsePlanDefinitionActorOptionComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parsePlanDefinitionActorOptionComponentContent(int eventType, XmlPullParser xpp, PlanDefinition.PlanDefinitionActorOptionComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setTypeElement(parseEnumeration(xpp, Enumerations.ActionParticipantType.NULL, new Enumerations.ActionParticipantTypeEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("typeReference")) {
+ res.setTypeReference(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("role")) {
+ res.setRole(parseCodeableConcept(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected PlanDefinition.PlanDefinitionActionComponent parsePlanDefinitionActionComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
PlanDefinition.PlanDefinitionActionComponent res = new PlanDefinition.PlanDefinitionActionComponent();
parseElementAttributes(xpp, res);
@@ -20387,7 +20755,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("priority")) {
res.setPriorityElement(parseEnumeration(xpp, Enumerations.RequestPriority.NULL, new Enumerations.RequestPriorityEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("code")) {
- res.getCode().add(parseCodeableConcept(xpp));
+ res.setCode(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) {
res.getReason().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("documentation")) {
@@ -20401,13 +20769,15 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("condition")) {
res.getCondition().add(parsePlanDefinitionActionConditionComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("input")) {
- res.getInput().add(parseDataRequirement(xpp));
+ res.getInput().add(parsePlanDefinitionActionInputComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("output")) {
- res.getOutput().add(parseDataRequirement(xpp));
+ res.getOutput().add(parsePlanDefinitionActionOutputComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedAction")) {
res.getRelatedAction().add(parsePlanDefinitionActionRelatedActionComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "timing")) {
res.setTiming(parseType("timing", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("location")) {
+ res.setLocation(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("participant")) {
res.getParticipant().add(parsePlanDefinitionActionParticipantComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
@@ -20462,6 +20832,62 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected PlanDefinition.PlanDefinitionActionInputComponent parsePlanDefinitionActionInputComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ PlanDefinition.PlanDefinitionActionInputComponent res = new PlanDefinition.PlanDefinitionActionInputComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parsePlanDefinitionActionInputComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parsePlanDefinitionActionInputComponentContent(int eventType, XmlPullParser xpp, PlanDefinition.PlanDefinitionActionInputComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
+ res.setTitleElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("requirement")) {
+ res.setRequirement(parseDataRequirement(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedData")) {
+ res.setRelatedDataElement(parseId(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected PlanDefinition.PlanDefinitionActionOutputComponent parsePlanDefinitionActionOutputComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ PlanDefinition.PlanDefinitionActionOutputComponent res = new PlanDefinition.PlanDefinitionActionOutputComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parsePlanDefinitionActionOutputComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parsePlanDefinitionActionOutputComponentContent(int eventType, XmlPullParser xpp, PlanDefinition.PlanDefinitionActionOutputComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
+ res.setTitleElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("requirement")) {
+ res.setRequirement(parseDataRequirement(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedData")) {
+ res.setRelatedDataElement(parseString(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected PlanDefinition.PlanDefinitionActionRelatedActionComponent parsePlanDefinitionActionRelatedActionComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
PlanDefinition.PlanDefinitionActionRelatedActionComponent res = new PlanDefinition.PlanDefinitionActionRelatedActionComponent();
parseElementAttributes(xpp, res);
@@ -20478,8 +20904,8 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parsePlanDefinitionActionRelatedActionComponentContent(int eventType, XmlPullParser xpp, PlanDefinition.PlanDefinitionActionRelatedActionComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("actionId")) {
- res.setActionIdElement(parseId(xpp));
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("targetId")) {
+ res.setTargetIdElement(parseId(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relationship")) {
res.setRelationshipElement(parseEnumeration(xpp, Enumerations.ActionRelationshipType.NULL, new Enumerations.ActionRelationshipTypeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "offset")) {
@@ -20506,10 +20932,16 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parsePlanDefinitionActionParticipantComponentContent(int eventType, XmlPullParser xpp, PlanDefinition.PlanDefinitionActionParticipantComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("actorId")) {
+ res.setActorIdElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setTypeElement(parseEnumeration(xpp, Enumerations.ActionParticipantType.NULL, new Enumerations.ActionParticipantTypeEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("typeReference")) {
+ res.setTypeReference(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("role")) {
res.setRole(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("function")) {
+ res.setFunction(parseCodeableConcept(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -20790,6 +21222,8 @@ public class XmlParser extends XmlParserBase {
res.getFocalDevice().add(parseProcedureFocalDeviceComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("used")) {
res.getUsed().add(parseCodeableReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("supportingInfo")) {
+ res.getSupportingInfo().add(parseReference(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
return false;
}
@@ -20880,6 +21314,10 @@ public class XmlParser extends XmlParserBase {
res.getReason().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("activity")) {
res.setActivity(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("basedOn")) {
+ res.getBasedOn().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("encounter")) {
+ res.setEncounter(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("agent")) {
res.getAgent().add(parseProvenanceAgentComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("entity")) {
@@ -21041,13 +21479,15 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("prefix")) {
res.setPrefixElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("text")) {
- res.setTextElement(parseString(xpp));
+ res.setTextElement(parseMarkdown(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setTypeElement(parseEnumeration(xpp, Questionnaire.QuestionnaireItemType.NULL, new Questionnaire.QuestionnaireItemTypeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("enableWhen")) {
res.getEnableWhen().add(parseQuestionnaireItemEnableWhenComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("enableBehavior")) {
res.setEnableBehaviorElement(parseEnumeration(xpp, Questionnaire.EnableWhenBehavior.NULL, new Questionnaire.EnableWhenBehaviorEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("disabledDisplay")) {
+ res.setDisabledDisplayElement(parseEnumeration(xpp, Questionnaire.QuestionnaireItemDisabledDisplay.NULL, new Questionnaire.QuestionnaireItemDisabledDisplayEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("required")) {
res.setRequiredElement(parseBoolean(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("repeats")) {
@@ -21056,6 +21496,8 @@ public class XmlParser extends XmlParserBase {
res.setReadOnlyElement(parseBoolean(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("maxLength")) {
res.setMaxLengthElement(parseInteger(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("answerConstraint")) {
+ res.setAnswerConstraintElement(parseEnumeration(xpp, Questionnaire.QuestionnaireAnswerConstraint.NULL, new Questionnaire.QuestionnaireAnswerConstraintEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("answerValueSet")) {
res.setAnswerValueSetElement(parseCanonical(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("answerOption")) {
@@ -21282,8 +21724,8 @@ public class XmlParser extends XmlParserBase {
res.setStatusDateElement(parseDateTime(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("validityPeriod")) {
res.setValidityPeriod(parsePeriod(xpp));
- } else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "indication")) {
- res.setIndication(parseType("indication", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("indication")) {
+ res.setIndication(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("intendedUse")) {
res.setIntendedUse(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("basis")) {
@@ -21296,6 +21738,8 @@ public class XmlParser extends XmlParserBase {
res.setHolder(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("regulator")) {
res.setRegulator(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("attachedDocument")) {
+ res.getAttachedDocument().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("case")) {
res.setCase(parseRegulatedAuthorizationCaseComponent(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
@@ -21526,8 +21970,10 @@ public class XmlParser extends XmlParserBase {
res.getRelatedAction().add(parseRequestGroupActionRelatedActionComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "timing")) {
res.setTiming(parseType("timing", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("location")) {
+ res.setLocation(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("participant")) {
- res.getParticipant().add(parseReference(xpp));
+ res.getParticipant().add(parseRequestGroupActionParticipantComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("groupingBehavior")) {
@@ -21592,8 +22038,8 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseRequestGroupActionRelatedActionComponentContent(int eventType, XmlPullParser xpp, RequestGroup.RequestGroupActionRelatedActionComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("actionId")) {
- res.setActionIdElement(parseId(xpp));
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("targetId")) {
+ res.setTargetIdElement(parseId(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relationship")) {
res.setRelationshipElement(parseEnumeration(xpp, Enumerations.ActionRelationshipType.NULL, new Enumerations.ActionRelationshipTypeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "offset")) {
@@ -21604,6 +22050,38 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected RequestGroup.RequestGroupActionParticipantComponent parseRequestGroupActionParticipantComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ RequestGroup.RequestGroupActionParticipantComponent res = new RequestGroup.RequestGroupActionParticipantComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseRequestGroupActionParticipantComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseRequestGroupActionParticipantComponentContent(int eventType, XmlPullParser xpp, RequestGroup.RequestGroupActionParticipantComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setTypeElement(parseEnumeration(xpp, Enumerations.ActionParticipantType.NULL, new Enumerations.ActionParticipantTypeEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("typeReference")) {
+ res.setTypeReference(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("role")) {
+ res.setRole(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("function")) {
+ res.setFunction(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("actor")) {
+ res.setActor(parseReference(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected ResearchStudy parseResearchStudy(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
ResearchStudy res = new ResearchStudy();
parseResourceAttributes(xpp, res);
@@ -21620,16 +22098,28 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseResearchStudyContent(int eventType, XmlPullParser xpp, ResearchStudy res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("url")) {
+ res.setUrlElement(parseUri(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
res.getIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("version")) {
+ res.setVersionElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
+ res.setNameElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("title")) {
res.setTitleElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("label")) {
+ res.getLabel().add(parseResearchStudyLabelComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("protocol")) {
res.getProtocol().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("partOf")) {
res.getPartOf().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedArtifact")) {
+ res.getRelatedArtifact().add(parseRelatedArtifact(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("date")) {
+ res.setDateElement(parseDateTime(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
- res.setStatusElement(parseEnumeration(xpp, ResearchStudy.ResearchStudyStatus.NULL, new ResearchStudy.ResearchStudyStatusEnumFactory()));
+ res.setStatusElement(parseEnumeration(xpp, Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("primaryPurposeType")) {
res.setPrimaryPurposeType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("phase")) {
@@ -21637,50 +22127,64 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("category")) {
res.getCategory().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("focus")) {
- res.getFocus().add(parseCodeableConcept(xpp));
+ res.getFocus().add(parseResearchStudyFocusComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("condition")) {
res.getCondition().add(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contact")) {
- res.getContact().add(parseContactDetail(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("relatedArtifact")) {
- res.getRelatedArtifact().add(parseRelatedArtifact(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("keyword")) {
res.getKeyword().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("location")) {
res.getLocation().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("descriptionSummary")) {
+ res.setDescriptionSummaryElement(parseMarkdown(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseMarkdown(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("enrollment")) {
- res.getEnrollment().add(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("period")) {
res.setPeriod(parsePeriod(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contact")) {
+ res.getContact().add(parseContactDetail(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("sponsor")) {
res.setSponsor(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("principalInvestigator")) {
res.setPrincipalInvestigator(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("site")) {
res.getSite().add(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reasonStopped")) {
- res.setReasonStopped(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("note")) {
res.getNote().add(parseAnnotation(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("arm")) {
- res.getArm().add(parseResearchStudyArmComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classification")) {
+ res.getClassification().add(parseResearchStudyClassificationComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("associatedParty")) {
+ res.getAssociatedParty().add(parseResearchStudyAssociatedPartyComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("currentState")) {
+ res.getCurrentState().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("statusDate")) {
+ res.getStatusDate().add(parseResearchStudyStatusDateComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("whyStopped")) {
+ res.setWhyStopped(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("recruitment")) {
+ res.setRecruitment(parseResearchStudyRecruitmentComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("comparisonGroup")) {
+ res.getComparisonGroup().add(parseResearchStudyComparisonGroupComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("objective")) {
res.getObjective().add(parseResearchStudyObjectiveComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("outcomeMeasure")) {
+ res.getOutcomeMeasure().add(parseResearchStudyOutcomeMeasureComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("result")) {
+ res.getResult().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("webLocation")) {
+ res.getWebLocation().add(parseResearchStudyWebLocationComponent(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
return false;
}
return true;
}
- protected ResearchStudy.ResearchStudyArmComponent parseResearchStudyArmComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- ResearchStudy.ResearchStudyArmComponent res = new ResearchStudy.ResearchStudyArmComponent();
+ protected ResearchStudy.ResearchStudyLabelComponent parseResearchStudyLabelComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyLabelComponent res = new ResearchStudy.ResearchStudyLabelComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseResearchStudyArmComponentContent(eventType, xpp, res))
+ if (!parseResearchStudyLabelComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -21689,13 +22193,187 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseResearchStudyArmComponentContent(int eventType, XmlPullParser xpp, ResearchStudy.ResearchStudyArmComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseResearchStudyLabelComponentContent(int eventType, XmlPullParser xpp, ResearchStudy.ResearchStudyLabelComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("value")) {
+ res.setValueElement(parseString(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected ResearchStudy.ResearchStudyFocusComponent parseResearchStudyFocusComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyFocusComponent res = new ResearchStudy.ResearchStudyFocusComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseResearchStudyFocusComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseResearchStudyFocusComponentContent(int eventType, XmlPullParser xpp, ResearchStudy.ResearchStudyFocusComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("productCode")) {
+ res.setProductCode(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("focusType")) {
+ res.getFocusType().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("factor")) {
+ res.setFactorElement(parseMarkdown(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected ResearchStudy.ResearchStudyClassificationComponent parseResearchStudyClassificationComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyClassificationComponent res = new ResearchStudy.ResearchStudyClassificationComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseResearchStudyClassificationComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseResearchStudyClassificationComponentContent(int eventType, XmlPullParser xpp, ResearchStudy.ResearchStudyClassificationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classifier")) {
+ res.getClassifier().add(parseCodeableConcept(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected ResearchStudy.ResearchStudyAssociatedPartyComponent parseResearchStudyAssociatedPartyComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyAssociatedPartyComponent res = new ResearchStudy.ResearchStudyAssociatedPartyComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseResearchStudyAssociatedPartyComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseResearchStudyAssociatedPartyComponentContent(int eventType, XmlPullParser xpp, ResearchStudy.ResearchStudyAssociatedPartyComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
res.setNameElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("role")) {
+ res.setRole(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("classifier")) {
+ res.getClassifier().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("party")) {
+ res.setParty(parseReference(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected ResearchStudy.ResearchStudyStatusDateComponent parseResearchStudyStatusDateComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyStatusDateComponent res = new ResearchStudy.ResearchStudyStatusDateComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseResearchStudyStatusDateComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseResearchStudyStatusDateComponentContent(int eventType, XmlPullParser xpp, ResearchStudy.ResearchStudyStatusDateComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("activity")) {
+ res.setActivity(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("actual")) {
+ res.setActualElement(parseBoolean(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("period")) {
+ res.setPeriod(parsePeriod(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected ResearchStudy.ResearchStudyRecruitmentComponent parseResearchStudyRecruitmentComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyRecruitmentComponent res = new ResearchStudy.ResearchStudyRecruitmentComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseResearchStudyRecruitmentComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseResearchStudyRecruitmentComponentContent(int eventType, XmlPullParser xpp, ResearchStudy.ResearchStudyRecruitmentComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("targetNumber")) {
+ res.setTargetNumberElement(parseUnsignedInt(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("actualNumber")) {
+ res.setActualNumberElement(parseUnsignedInt(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("eligibility")) {
+ res.setEligibility(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("actualGroup")) {
+ res.setActualGroup(parseReference(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected ResearchStudy.ResearchStudyComparisonGroupComponent parseResearchStudyComparisonGroupComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyComparisonGroupComponent res = new ResearchStudy.ResearchStudyComparisonGroupComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseResearchStudyComparisonGroupComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseResearchStudyComparisonGroupComponentContent(int eventType, XmlPullParser xpp, ResearchStudy.ResearchStudyComparisonGroupComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && nameIsTypeName(xpp, "identifier")) {
+ res.setIdentifier(parseType("identifier", xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
+ res.setNameElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
- res.setDescriptionElement(parseString(xpp));
+ res.setDescriptionElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("intendedExposure")) {
+ res.getIntendedExposure().add(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("observedGroup")) {
+ res.setObservedGroup(parseReference(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -21722,6 +22400,64 @@ public class XmlParser extends XmlParserBase {
res.setNameElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
+ res.setDescriptionElement(parseMarkdown(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected ResearchStudy.ResearchStudyOutcomeMeasureComponent parseResearchStudyOutcomeMeasureComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyOutcomeMeasureComponent res = new ResearchStudy.ResearchStudyOutcomeMeasureComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseResearchStudyOutcomeMeasureComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseResearchStudyOutcomeMeasureComponentContent(int eventType, XmlPullParser xpp, ResearchStudy.ResearchStudyOutcomeMeasureComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("name")) {
+ res.setNameElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.getType().add(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
+ res.setDescriptionElement(parseMarkdown(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reference")) {
+ res.setReference(parseReference(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
+ protected ResearchStudy.ResearchStudyWebLocationComponent parseResearchStudyWebLocationComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ ResearchStudy.ResearchStudyWebLocationComponent res = new ResearchStudy.ResearchStudyWebLocationComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseResearchStudyWebLocationComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseResearchStudyWebLocationComponentContent(int eventType, XmlPullParser xpp, ResearchStudy.ResearchStudyWebLocationComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("url")) {
+ res.setUrlElement(parseUri(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -21747,15 +22483,15 @@ public class XmlParser extends XmlParserBase {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
res.getIdentifier().add(parseIdentifier(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
- res.setStatusElement(parseEnumeration(xpp, ResearchSubject.ResearchSubjectStatus.NULL, new ResearchSubject.ResearchSubjectStatusEnumFactory()));
+ res.setStatusElement(parseEnumeration(xpp, Enumerations.PublicationStatus.NULL, new Enumerations.PublicationStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("progress")) {
res.getProgress().add(parseResearchSubjectProgressComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("period")) {
res.setPeriod(parsePeriod(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("study")) {
res.setStudy(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("individual")) {
- res.setIndividual(parseReference(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("subject")) {
+ res.setSubject(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("assignedArm")) {
res.setAssignedArmElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("actualArm")) {
@@ -21786,14 +22522,16 @@ public class XmlParser extends XmlParserBase {
protected boolean parseResearchSubjectProgressComponentContent(int eventType, XmlPullParser xpp, ResearchSubject.ResearchSubjectProgressComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setType(parseCodeableConcept(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("state")) {
- res.setState(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("subjectState")) {
+ res.setSubjectState(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("milestone")) {
res.setMilestone(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("reason")) {
res.setReason(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("startDate")) {
res.setStartDateElement(parseDateTime(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("endDate")) {
+ res.setEndDateElement(parseDateTime(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -22936,8 +23674,6 @@ public class XmlParser extends XmlParserBase {
protected boolean parseStructureMapGroupRuleTargetComponentContent(int eventType, XmlPullParser xpp, StructureMap.StructureMapGroupRuleTargetComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("context")) {
res.setContextElement(parseId(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contextType")) {
- res.setContextTypeElement(parseEnumeration(xpp, StructureMap.StructureMapContextType.NULL, new StructureMap.StructureMapContextTypeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("element")) {
res.setElementElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("variable")) {
@@ -23029,7 +23765,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
res.setStatusElement(parseEnumeration(xpp, Enumerations.SubscriptionState.NULL, new Enumerations.SubscriptionStateEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("topic")) {
- res.setTopic(parseReference(xpp));
+ res.setTopicElement(parseCanonical(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("contact")) {
res.getContact().add(parseContactPoint(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("end")) {
@@ -23052,6 +23788,10 @@ public class XmlParser extends XmlParserBase {
res.setContentTypeElement(parseCode(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("content")) {
res.setContentElement(parseEnumeration(xpp, Subscription.SubscriptionPayloadContent.NULL, new Subscription.SubscriptionPayloadContentEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("notificationUrlLocation")) {
+ res.setNotificationUrlLocationElement(parseEnumeration(xpp, Subscription.SubscriptionUrlLocation.NULL, new Subscription.SubscriptionUrlLocationEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("maxCount")) {
+ res.setMaxCountElement(parsePositiveInt(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
return false;
}
@@ -23074,7 +23814,9 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseSubscriptionFilterByComponentContent(int eventType, XmlPullParser xpp, Subscription.SubscriptionFilterByComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("searchParamName")) {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("resourceType")) {
+ res.setResourceTypeElement(parseUri(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("searchParamName")) {
res.setSearchParamNameElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("searchModifier")) {
res.setSearchModifierElement(parseEnumeration(xpp, Enumerations.SubscriptionSearchModifier.NULL, new Enumerations.SubscriptionSearchModifierEnumFactory()));
@@ -23102,7 +23844,9 @@ public class XmlParser extends XmlParserBase {
}
protected boolean parseSubscriptionStatusContent(int eventType, XmlPullParser xpp, SubscriptionStatus res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
+ res.setStatusElement(parseEnumeration(xpp, Enumerations.SubscriptionState.NULL, new Enumerations.SubscriptionStateEnumFactory()));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
res.setTypeElement(parseEnumeration(xpp, SubscriptionStatus.SubscriptionNotificationType.NULL, new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("eventsSinceSubscriptionStart")) {
res.setEventsSinceSubscriptionStartElement(parseInteger64(xpp));
@@ -23110,8 +23854,6 @@ public class XmlParser extends XmlParserBase {
res.setEventsInNotificationElement(parseInteger(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("subscription")) {
res.setSubscription(parseReference(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
- res.setStatusElement(parseEnumeration(xpp, Enumerations.SubscriptionState.NULL, new Enumerations.SubscriptionStateEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("topic")) {
res.setTopicElement(parseCanonical(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("error")) {
@@ -23175,9 +23917,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("effectivePeriod")) {
res.setEffectivePeriod(parsePeriod(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("resourceTrigger")) {
- res.setResourceTrigger(parseSubscriptionTopicResourceTriggerComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("canFilterBy")) {
- res.getCanFilterBy().add(parseSubscriptionTopicCanFilterByComponent(xpp));
+ res.getResourceTrigger().add(parseSubscriptionTopicResourceTriggerComponent(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
return false;
}
@@ -23203,13 +23943,15 @@ public class XmlParser extends XmlParserBase {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("resourceType")) {
- res.getResourceType().add(parseCode(xpp));
+ res.setResourceTypeElement(parseUri(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("methodCriteria")) {
res.getMethodCriteria().add(parseEnumeration(xpp, SubscriptionTopic.InteractionTrigger.NULL, new SubscriptionTopic.InteractionTriggerEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("queryCriteria")) {
res.setQueryCriteria(parseSubscriptionTopicResourceTriggerQueryCriteriaComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("fhirPathCriteria")) {
res.getFhirPathCriteria().add(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("canFilterBy")) {
+ res.getCanFilterBy().add(parseSubscriptionTopicResourceTriggerCanFilterByComponent(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -23234,8 +23976,12 @@ public class XmlParser extends XmlParserBase {
protected boolean parseSubscriptionTopicResourceTriggerQueryCriteriaComponentContent(int eventType, XmlPullParser xpp, SubscriptionTopic.SubscriptionTopicResourceTriggerQueryCriteriaComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("previous")) {
res.setPreviousElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("resultForCreate")) {
+ res.setResultForCreateElement(parseEnumeration(xpp, SubscriptionTopic.CriteriaNotExistsBehavior.NULL, new SubscriptionTopic.CriteriaNotExistsBehaviorEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("current")) {
res.setCurrentElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("resultForDelete")) {
+ res.setResultForDeleteElement(parseEnumeration(xpp, SubscriptionTopic.CriteriaNotExistsBehavior.NULL, new SubscriptionTopic.CriteriaNotExistsBehaviorEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("requireBoth")) {
res.setRequireBothElement(parseBoolean(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
@@ -23244,13 +23990,13 @@ public class XmlParser extends XmlParserBase {
return true;
}
- protected SubscriptionTopic.SubscriptionTopicCanFilterByComponent parseSubscriptionTopicCanFilterByComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- SubscriptionTopic.SubscriptionTopicCanFilterByComponent res = new SubscriptionTopic.SubscriptionTopicCanFilterByComponent();
+ protected SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent parseSubscriptionTopicResourceTriggerCanFilterByComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent res = new SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent();
parseElementAttributes(xpp, res);
next(xpp);
int eventType = nextNoWhitespace(xpp);
while (eventType != XmlPullParser.END_TAG) {
- if (!parseSubscriptionTopicCanFilterByComponentContent(eventType, xpp, res))
+ if (!parseSubscriptionTopicResourceTriggerCanFilterByComponentContent(eventType, xpp, res))
unknownContent(xpp);
eventType = nextNoWhitespace(xpp);
}
@@ -23259,7 +24005,7 @@ public class XmlParser extends XmlParserBase {
return res;
}
- protected boolean parseSubscriptionTopicCanFilterByComponentContent(int eventType, XmlPullParser xpp, SubscriptionTopic.SubscriptionTopicCanFilterByComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ protected boolean parseSubscriptionTopicResourceTriggerCanFilterByComponentContent(int eventType, XmlPullParser xpp, SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("searchParamName")) {
res.setSearchParamNameElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("searchModifier")) {
@@ -23290,47 +24036,23 @@ public class XmlParser extends XmlParserBase {
protected boolean parseSubstanceContent(int eventType, XmlPullParser xpp, Substance res) throws XmlPullParserException, IOException, FHIRFormatError {
if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
res.getIdentifier().add(parseIdentifier(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("instance")) {
+ res.setInstanceElement(parseBoolean(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("status")) {
res.setStatusElement(parseEnumeration(xpp, Substance.FHIRSubstanceStatus.NULL, new Substance.FHIRSubstanceStatusEnumFactory()));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("category")) {
res.getCategory().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("code")) {
- res.setCode(parseCodeableConcept(xpp));
+ res.setCode(parseCodeableReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseString(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("instance")) {
- res.getInstance().add(parseSubstanceInstanceComponent(xpp));
- } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("ingredient")) {
- res.getIngredient().add(parseSubstanceIngredientComponent(xpp));
- } else if (!parseDomainResourceContent(eventType, xpp, res)){
- return false;
- }
- return true;
- }
-
- protected Substance.SubstanceInstanceComponent parseSubstanceInstanceComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
- Substance.SubstanceInstanceComponent res = new Substance.SubstanceInstanceComponent();
- parseElementAttributes(xpp, res);
- next(xpp);
- int eventType = nextNoWhitespace(xpp);
- while (eventType != XmlPullParser.END_TAG) {
- if (!parseSubstanceInstanceComponentContent(eventType, xpp, res))
- unknownContent(xpp);
- eventType = nextNoWhitespace(xpp);
- }
- next(xpp);
- parseElementClose(res);
- return res;
- }
-
- protected boolean parseSubstanceInstanceComponentContent(int eventType, XmlPullParser xpp, Substance.SubstanceInstanceComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
- if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("identifier")) {
- res.setIdentifier(parseIdentifier(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("expiry")) {
res.setExpiryElement(parseDateTime(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("quantity")) {
res.setQuantity(parseQuantity(xpp));
- } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("ingredient")) {
+ res.getIngredient().add(parseSubstanceIngredientComponent(xpp));
+ } else if (!parseDomainResourceContent(eventType, xpp, res)){
return false;
}
return true;
@@ -23390,6 +24112,8 @@ public class XmlParser extends XmlParserBase {
res.getClassification().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("domain")) {
res.setDomain(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("grade")) {
+ res.getGrade().add(parseCodeableConcept(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("description")) {
res.setDescriptionElement(parseMarkdown(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("source")) {
@@ -23423,7 +24147,7 @@ public class XmlParser extends XmlParserBase {
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("protein")) {
res.setProtein(parseReference(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("sourceMaterial")) {
- res.setSourceMaterial(parseReference(xpp));
+ res.setSourceMaterial(parseSubstanceDefinitionSourceMaterialComponent(xpp));
} else if (!parseDomainResourceContent(eventType, xpp, res)){
return false;
}
@@ -23774,6 +24498,38 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected SubstanceDefinition.SubstanceDefinitionSourceMaterialComponent parseSubstanceDefinitionSourceMaterialComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ SubstanceDefinition.SubstanceDefinitionSourceMaterialComponent res = new SubstanceDefinition.SubstanceDefinitionSourceMaterialComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseSubstanceDefinitionSourceMaterialComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseSubstanceDefinitionSourceMaterialComponentContent(int eventType, XmlPullParser xpp, SubstanceDefinition.SubstanceDefinitionSourceMaterialComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("type")) {
+ res.setType(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("genus")) {
+ res.setGenus(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("species")) {
+ res.setSpecies(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("part")) {
+ res.setPart(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("countryOfOrigin")) {
+ res.getCountryOfOrigin().add(parseCodeableConcept(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected SubstanceNucleicAcid parseSubstanceNucleicAcid(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
SubstanceNucleicAcid res = new SubstanceNucleicAcid();
parseResourceAttributes(xpp, res);
@@ -25518,6 +26274,8 @@ public class XmlParser extends XmlParserBase {
res.getDestination().add(parseTestScriptDestinationComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("metadata")) {
res.setMetadata(parseTestScriptMetadataComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("scope")) {
+ res.getScope().add(parseTestScriptScopeComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("fixture")) {
res.getFixture().add(parseTestScriptFixtureComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("profile")) {
@@ -25676,6 +26434,34 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected TestScript.TestScriptScopeComponent parseTestScriptScopeComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ TestScript.TestScriptScopeComponent res = new TestScript.TestScriptScopeComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseTestScriptScopeComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseTestScriptScopeComponentContent(int eventType, XmlPullParser xpp, TestScript.TestScriptScopeComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("artifact")) {
+ res.setArtifactElement(parseCanonical(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("conformance")) {
+ res.setConformance(parseCodeableConcept(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("phase")) {
+ res.setPhase(parseCodeableConcept(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected TestScript.TestScriptFixtureComponent parseTestScriptFixtureComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
TestScript.TestScriptFixtureComponent res = new TestScript.TestScriptFixtureComponent();
parseElementAttributes(xpp, res);
@@ -25928,6 +26714,8 @@ public class XmlParser extends XmlParserBase {
res.setResponseCodeElement(parseString(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("sourceId")) {
res.setSourceIdElement(parseId(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("stopTestOnFail")) {
+ res.setStopTestOnFailElement(parseBoolean(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("validateProfileId")) {
res.setValidateProfileIdElement(parseId(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("value")) {
@@ -26094,6 +26882,8 @@ public class XmlParser extends XmlParserBase {
res.setCompose(parseValueSetComposeComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("expansion")) {
res.setExpansion(parseValueSetExpansionComponent(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("scope")) {
+ res.setScope(parseValueSetScopeComponent(xpp));
} else if (!parseCanonicalResourceContent(eventType, xpp, res)){
return false;
}
@@ -26158,6 +26948,8 @@ public class XmlParser extends XmlParserBase {
res.getFilter().add(parseValueSetConceptSetFilterComponent(xpp));
} else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("valueSet")) {
res.getValueSet().add(parseCanonical(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("copyright")) {
+ res.setCopyrightElement(parseString(xpp));
} else if (!parseBackboneElementContent(eventType, xpp, res)){
return false;
}
@@ -26402,6 +27194,34 @@ public class XmlParser extends XmlParserBase {
return true;
}
+ protected ValueSet.ValueSetScopeComponent parseValueSetScopeComponent(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
+ ValueSet.ValueSetScopeComponent res = new ValueSet.ValueSetScopeComponent();
+ parseElementAttributes(xpp, res);
+ next(xpp);
+ int eventType = nextNoWhitespace(xpp);
+ while (eventType != XmlPullParser.END_TAG) {
+ if (!parseValueSetScopeComponentContent(eventType, xpp, res))
+ unknownContent(xpp);
+ eventType = nextNoWhitespace(xpp);
+ }
+ next(xpp);
+ parseElementClose(res);
+ return res;
+ }
+
+ protected boolean parseValueSetScopeComponentContent(int eventType, XmlPullParser xpp, ValueSet.ValueSetScopeComponent res) throws XmlPullParserException, IOException, FHIRFormatError {
+ if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("focus")) {
+ res.setFocusElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("inclusionCriteria")) {
+ res.setInclusionCriteriaElement(parseString(xpp));
+ } else if (eventType == XmlPullParser.START_TAG && xpp.getName().equals("exclusionCriteria")) {
+ res.setExclusionCriteriaElement(parseString(xpp));
+ } else if (!parseBackboneElementContent(eventType, xpp, res)){
+ return false;
+ }
+ return true;
+ }
+
protected VerificationResult parseVerificationResult(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError {
VerificationResult res = new VerificationResult();
parseResourceAttributes(xpp, res);
@@ -26760,8 +27580,8 @@ public class XmlParser extends XmlParserBase {
return parseDeviceMetric(xpp);
} else if (xpp.getName().equals("DeviceRequest")) {
return parseDeviceRequest(xpp);
- } else if (xpp.getName().equals("DeviceUseStatement")) {
- return parseDeviceUseStatement(xpp);
+ } else if (xpp.getName().equals("DeviceUsage")) {
+ return parseDeviceUsage(xpp);
} else if (xpp.getName().equals("DiagnosticReport")) {
return parseDiagnosticReport(xpp);
} else if (xpp.getName().equals("DocumentManifest")) {
@@ -26818,6 +27638,8 @@ public class XmlParser extends XmlParserBase {
return parseIngredient(xpp);
} else if (xpp.getName().equals("InsurancePlan")) {
return parseInsurancePlan(xpp);
+ } else if (xpp.getName().equals("InventoryReport")) {
+ return parseInventoryReport(xpp);
} else if (xpp.getName().equals("Invoice")) {
return parseInvoice(xpp);
} else if (xpp.getName().equals("Library")) {
@@ -27085,6 +27907,8 @@ public class XmlParser extends XmlParserBase {
return parseRange(xpp);
} else if (xpp.getName().equals(prefix+"Ratio")) {
return parseRatio(xpp);
+ } else if (xpp.getName().equals(prefix+"RatioRange")) {
+ return parseRatioRange(xpp);
} else if (xpp.getName().equals(prefix+"Reference")) {
return parseReference(xpp);
} else if (xpp.getName().equals(prefix+"RelatedArtifact")) {
@@ -27218,6 +28042,8 @@ public class XmlParser extends XmlParserBase {
return parseRange(xpp);
} else if (type.equals("Ratio")) {
return parseRatio(xpp);
+ } else if (type.equals("RatioRange")) {
+ return parseRatioRange(xpp);
} else if (type.equals("Reference")) {
return parseReference(xpp);
} else if (type.equals("RelatedArtifact")) {
@@ -27311,6 +28137,8 @@ public class XmlParser extends XmlParserBase {
return parseRange(xpp);
} else if (type.equals("Ratio")) {
return parseRatio(xpp);
+ } else if (type.equals("RatioRange")) {
+ return parseRatioRange(xpp);
} else if (type.equals("Reference")) {
return parseReference(xpp);
} else if (type.equals("RelatedArtifact")) {
@@ -27413,8 +28241,8 @@ public class XmlParser extends XmlParserBase {
return parseDeviceMetric(xpp);
} else if (type.equals("DeviceRequest")) {
return parseDeviceRequest(xpp);
- } else if (type.equals("DeviceUseStatement")) {
- return parseDeviceUseStatement(xpp);
+ } else if (type.equals("DeviceUsage")) {
+ return parseDeviceUsage(xpp);
} else if (type.equals("DiagnosticReport")) {
return parseDiagnosticReport(xpp);
} else if (type.equals("DocumentManifest")) {
@@ -27471,6 +28299,8 @@ public class XmlParser extends XmlParserBase {
return parseIngredient(xpp);
} else if (type.equals("InsurancePlan")) {
return parseInsurancePlan(xpp);
+ } else if (type.equals("InventoryReport")) {
+ return parseInventoryReport(xpp);
} else if (type.equals("Invoice")) {
return parseInvoice(xpp);
} else if (type.equals("Library")) {
@@ -27738,6 +28568,8 @@ public class XmlParser extends XmlParserBase {
return true;
} else if (xpp.getName().equals(prefix+"Ratio")) {
return true;
+ } else if (xpp.getName().equals(prefix+"RatioRange")) {
+ return true;
} else if (xpp.getName().equals(prefix+"Reference")) {
return true;
} else if (xpp.getName().equals(prefix+"RelatedArtifact")) {
@@ -27840,7 +28672,7 @@ public class XmlParser extends XmlParserBase {
return true;
} else if (xpp.getName().equals(prefix+"DeviceRequest")) {
return true;
- } else if (xpp.getName().equals(prefix+"DeviceUseStatement")) {
+ } else if (xpp.getName().equals(prefix+"DeviceUsage")) {
return true;
} else if (xpp.getName().equals(prefix+"DiagnosticReport")) {
return true;
@@ -27898,6 +28730,8 @@ public class XmlParser extends XmlParserBase {
return true;
} else if (xpp.getName().equals(prefix+"InsurancePlan")) {
return true;
+ } else if (xpp.getName().equals(prefix+"InventoryReport")) {
+ return true;
} else if (xpp.getName().equals(prefix+"Invoice")) {
return true;
} else if (xpp.getName().equals(prefix+"Library")) {
@@ -29711,6 +30545,29 @@ public class XmlParser extends XmlParserBase {
}
}
+ protected void composeRatioRange(String name, RatioRange element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeRatioRangeElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeRatioRangeElements(RatioRange element) throws IOException {
+ composeDataTypeElements(element);
+ if (element.hasLowNumerator()) {
+ composeQuantity("lowNumerator", element.getLowNumerator());
+ }
+ if (element.hasHighNumerator()) {
+ composeQuantity("highNumerator", element.getHighNumerator());
+ }
+ if (element.hasDenominator()) {
+ composeQuantity("denominator", element.getDenominator());
+ }
+ }
+
protected void composeReference(String name, Reference element) throws IOException {
if (element != null) {
composeElementAttributes(element);
@@ -29864,11 +30721,17 @@ public class XmlParser extends XmlParserBase {
if (element.hasStatisticType()) {
composeCodeableConcept("statisticType", element.getStatisticType());
}
+ if (element.hasCategory()) {
+ composeCodeableConcept("category", element.getCategory());
+ }
if (element.hasQuantity()) {
composeQuantity("quantity", element.getQuantity());
}
if (element.hasNumberOfEventsElement()) {
- composeInteger("numberOfEvents", element.getNumberOfEventsElement());
+ composeUnsignedInt("numberOfEvents", element.getNumberOfEventsElement());
+ }
+ if (element.hasNumberAffectedElement()) {
+ composeUnsignedInt("numberAffected", element.getNumberAffectedElement());
}
if (element.hasSampleSize()) {
composeStatisticSampleSizeComponent("sampleSize", element.getSampleSize());
@@ -29903,13 +30766,13 @@ public class XmlParser extends XmlParserBase {
composeAnnotation("note", e);
}
if (element.hasNumberOfStudiesElement()) {
- composeInteger("numberOfStudies", element.getNumberOfStudiesElement());
+ composeUnsignedInt("numberOfStudies", element.getNumberOfStudiesElement());
}
if (element.hasNumberOfParticipantsElement()) {
- composeInteger("numberOfParticipants", element.getNumberOfParticipantsElement());
+ composeUnsignedInt("numberOfParticipants", element.getNumberOfParticipantsElement());
}
if (element.hasKnownDataCountElement()) {
- composeInteger("knownDataCount", element.getKnownDataCountElement());
+ composeUnsignedInt("knownDataCount", element.getKnownDataCountElement());
}
}
@@ -29999,8 +30862,9 @@ public class XmlParser extends XmlParserBase {
composeCodeableConcept("code", element.getCode());
}
if (element.hasValue()) {
- composeType("value", element.getValue());
- } if (element.hasVariable()) {
+ composeQuantity("value", element.getValue());
+ }
+ if (element.hasVariable()) {
for (Statistic.StatisticModelCharacteristicVariableComponent e : element.getVariable())
composeStatisticModelCharacteristicVariableComponent("variable", e);
}
@@ -30428,7 +31292,7 @@ public class XmlParser extends XmlParserBase {
if (element.hasTiming()) {
composeType("timing", element.getTiming());
} if (element.hasLocation()) {
- composeReference("location", element.getLocation());
+ composeCodeableReference("location", element.getLocation());
}
if (element.hasParticipant()) {
for (ActivityDefinition.ActivityDefinitionParticipantComponent e : element.getParticipant())
@@ -30482,9 +31346,15 @@ public class XmlParser extends XmlParserBase {
composeBackboneElementElements(element);
if (element.hasTypeElement())
composeEnumeration("type", element.getTypeElement(), new Enumerations.ActionParticipantTypeEnumFactory());
+ if (element.hasTypeReference()) {
+ composeReference("typeReference", element.getTypeReference());
+ }
if (element.hasRole()) {
composeCodeableConcept("role", element.getRole());
}
+ if (element.hasFunction()) {
+ composeCodeableConcept("function", element.getFunction());
+ }
}
protected void composeActivityDefinitionDynamicValueComponent(String name, ActivityDefinition.ActivityDefinitionDynamicValueComponent element) throws IOException {
@@ -30708,8 +31578,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasSeriousness()) {
composeCodeableConcept("seriousness", element.getSeriousness());
}
- if (element.hasOutcome()) {
- composeCodeableConcept("outcome", element.getOutcome());
+ if (element.hasOutcome()) {
+ for (CodeableConcept e : element.getOutcome())
+ composeCodeableConcept("outcome", e);
}
if (element.hasRecorder()) {
composeReference("recorder", element.getRecorder());
@@ -30948,8 +31819,8 @@ public class XmlParser extends XmlParserBase {
composeCodeableConcept("substance", element.getSubstance());
}
if (element.hasManifestation()) {
- for (CodeableConcept e : element.getManifestation())
- composeCodeableConcept("manifestation", e);
+ for (CodeableReference e : element.getManifestation())
+ composeCodeableReference("manifestation", e);
}
if (element.hasDescriptionElement()) {
composeString("description", element.getDescriptionElement());
@@ -31008,8 +31879,8 @@ public class XmlParser extends XmlParserBase {
for (CodeableReference e : element.getReason())
composeCodeableReference("reason", e);
}
- if (element.hasPriorityElement()) {
- composeUnsignedInt("priority", element.getPriorityElement());
+ if (element.hasPriority()) {
+ composeCodeableConcept("priority", element.getPriority());
}
if (element.hasDescriptionElement()) {
composeString("description", element.getDescriptionElement());
@@ -31157,6 +32028,13 @@ public class XmlParser extends XmlParserBase {
for (CodeableConcept e : element.getPurposeOfEvent())
composeCodeableConcept("purposeOfEvent", e);
}
+ if (element.hasBasedOn()) {
+ for (Reference e : element.getBasedOn())
+ composeReference("basedOn", e);
+ }
+ if (element.hasEncounter()) {
+ composeReference("encounter", element.getEncounter());
+ }
if (element.hasAgent()) {
for (AuditEvent.AuditEventAgentComponent e : element.getAgent())
composeAuditEventAgentComponent("agent", e);
@@ -32339,6 +33217,10 @@ public class XmlParser extends XmlParserBase {
if (element.hasDocumentationElement()) {
composeMarkdown("documentation", element.getDocumentationElement());
}
+ if (element.hasFeature()) {
+ for (CapabilityStatement2.CapabilityStatement2RestFeatureComponent e : element.getFeature())
+ composeCapabilityStatement2RestFeatureComponent("feature", e);
+ }
if (element.hasResource()) {
for (CapabilityStatement2.CapabilityStatement2RestResourceComponent e : element.getResource())
composeCapabilityStatement2RestResourceComponent("resource", e);
@@ -32361,6 +33243,24 @@ public class XmlParser extends XmlParserBase {
}
}
+ protected void composeCapabilityStatement2RestFeatureComponent(String name, CapabilityStatement2.CapabilityStatement2RestFeatureComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCapabilityStatement2RestFeatureComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCapabilityStatement2RestFeatureComponentElements(CapabilityStatement2.CapabilityStatement2RestFeatureComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasCodeElement())
+ composeEnumeration("code", element.getCodeElement(), new CapabilityStatement2.CapabilityFeatureEnumFactory());
+ if (element.hasValueElement())
+ composeEnumeration("value", element.getValueElement(), new CapabilityStatement2.CapabilityFeatureValueEnumFactory());
+ }
+
protected void composeCapabilityStatement2RestResourceComponent(String name, CapabilityStatement2.CapabilityStatement2RestResourceComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
@@ -32386,6 +33286,10 @@ public class XmlParser extends XmlParserBase {
if (element.hasDocumentationElement()) {
composeMarkdown("documentation", element.getDocumentationElement());
}
+ if (element.hasFeature()) {
+ for (CapabilityStatement2.CapabilityStatement2RestFeatureComponent e : element.getFeature())
+ composeCapabilityStatement2RestFeatureComponent("feature", e);
+ }
if (element.hasInteraction()) {
for (CapabilityStatement2.ResourceInteractionComponent e : element.getInteraction())
composeCapabilityStatement2ResourceInteractionComponent("interaction", e);
@@ -32417,6 +33321,10 @@ public class XmlParser extends XmlParserBase {
if (element.hasDocumentationElement()) {
composeMarkdown("documentation", element.getDocumentationElement());
}
+ if (element.hasFeature()) {
+ for (CapabilityStatement2.CapabilityStatement2RestFeatureComponent e : element.getFeature())
+ composeCapabilityStatement2RestFeatureComponent("feature", e);
+ }
}
protected void composeCapabilityStatement2RestResourceSearchParamComponent(String name, CapabilityStatement2.CapabilityStatement2RestResourceSearchParamComponent element) throws IOException {
@@ -32442,6 +33350,10 @@ public class XmlParser extends XmlParserBase {
if (element.hasDocumentationElement()) {
composeMarkdown("documentation", element.getDocumentationElement());
}
+ if (element.hasFeature()) {
+ for (CapabilityStatement2.CapabilityStatement2RestFeatureComponent e : element.getFeature())
+ composeCapabilityStatement2RestFeatureComponent("feature", e);
+ }
}
protected void composeCapabilityStatement2RestResourceOperationComponent(String name, CapabilityStatement2.CapabilityStatement2RestResourceOperationComponent element) throws IOException {
@@ -32465,6 +33377,10 @@ public class XmlParser extends XmlParserBase {
if (element.hasDocumentationElement()) {
composeMarkdown("documentation", element.getDocumentationElement());
}
+ if (element.hasFeature()) {
+ for (CapabilityStatement2.CapabilityStatement2RestFeatureComponent e : element.getFeature())
+ composeCapabilityStatement2RestFeatureComponent("feature", e);
+ }
}
protected void composeCapabilityStatement2SystemInteractionComponent(String name, CapabilityStatement2.SystemInteractionComponent element) throws IOException {
@@ -32484,6 +33400,10 @@ public class XmlParser extends XmlParserBase {
if (element.hasDocumentationElement()) {
composeMarkdown("documentation", element.getDocumentationElement());
}
+ if (element.hasFeature()) {
+ for (CapabilityStatement2.CapabilityStatement2RestFeatureComponent e : element.getFeature())
+ composeCapabilityStatement2RestFeatureComponent("feature", e);
+ }
}
protected void composeCarePlan(String name, CarePlan element) throws IOException {
@@ -32593,33 +33513,33 @@ public class XmlParser extends XmlParserBase {
protected void composeCarePlanActivityComponentElements(CarePlan.CarePlanActivityComponent element) throws IOException {
composeBackboneElementElements(element);
- if (element.hasOutcome()) {
- for (CodeableReference e : element.getOutcome())
- composeCodeableReference("outcome", e);
+ if (element.hasPerformedActivity()) {
+ for (CodeableReference e : element.getPerformedActivity())
+ composeCodeableReference("performedActivity", e);
}
if (element.hasProgress()) {
for (Annotation e : element.getProgress())
composeAnnotation("progress", e);
}
- if (element.hasReference()) {
- composeReference("reference", element.getReference());
+ if (element.hasPlannedActivityReference()) {
+ composeReference("plannedActivityReference", element.getPlannedActivityReference());
}
- if (element.hasDetail()) {
- composeCarePlanActivityDetailComponent("detail", element.getDetail());
+ if (element.hasPlannedActivityDetail()) {
+ composeCarePlanActivityPlannedActivityDetailComponent("plannedActivityDetail", element.getPlannedActivityDetail());
}
}
- protected void composeCarePlanActivityDetailComponent(String name, CarePlan.CarePlanActivityDetailComponent element) throws IOException {
+ protected void composeCarePlanActivityPlannedActivityDetailComponent(String name, CarePlan.CarePlanActivityPlannedActivityDetailComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCarePlanActivityDetailComponentElements(element);
+ composeCarePlanActivityPlannedActivityDetailComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCarePlanActivityDetailComponentElements(CarePlan.CarePlanActivityDetailComponent element) throws IOException {
+ protected void composeCarePlanActivityPlannedActivityDetailComponentElements(CarePlan.CarePlanActivityPlannedActivityDetailComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasKindElement())
composeEnumeration("kind", element.getKindElement(), new CarePlan.CarePlanActivityKindEnumFactory());
@@ -33132,12 +34052,184 @@ public class XmlParser extends XmlParserBase {
if (element.hasUrlElement()) {
composeUri("url", element.getUrlElement());
}
+ if (element.hasIdentifier()) {
+ for (Identifier e : element.getIdentifier())
+ composeIdentifier("identifier", e);
+ }
+ if (element.hasVersionElement()) {
+ composeString("version", element.getVersionElement());
+ }
+ if (element.hasNameElement()) {
+ composeString("name", element.getNameElement());
+ }
+ if (element.hasTitleElement()) {
+ composeString("title", element.getTitleElement());
+ }
if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory());
+ if (element.hasExperimentalElement()) {
+ composeBoolean("experimental", element.getExperimentalElement());
+ }
+ if (element.hasDateElement()) {
+ composeDateTime("date", element.getDateElement());
+ }
+ if (element.hasPublisherElement()) {
+ composeString("publisher", element.getPublisherElement());
+ }
+ if (element.hasContact()) {
+ for (ContactDetail e : element.getContact())
+ composeContactDetail("contact", e);
+ }
+ if (element.hasDescriptionElement()) {
+ composeMarkdown("description", element.getDescriptionElement());
+ }
if (element.hasUseContext()) {
for (UsageContext e : element.getUseContext())
composeUsageContext("useContext", e);
}
+ if (element.hasJurisdiction()) {
+ for (CodeableConcept e : element.getJurisdiction())
+ composeCodeableConcept("jurisdiction", e);
+ }
+ if (element.hasPurposeElement()) {
+ composeMarkdown("purpose", element.getPurposeElement());
+ }
+ if (element.hasCopyrightElement()) {
+ composeMarkdown("copyright", element.getCopyrightElement());
+ }
+ if (element.hasApprovalDateElement()) {
+ composeDate("approvalDate", element.getApprovalDateElement());
+ }
+ if (element.hasLastReviewDateElement()) {
+ composeDate("lastReviewDate", element.getLastReviewDateElement());
+ }
+ if (element.hasEffectivePeriod()) {
+ composePeriod("effectivePeriod", element.getEffectivePeriod());
+ }
+ if (element.hasAuthor()) {
+ for (ContactDetail e : element.getAuthor())
+ composeContactDetail("author", e);
+ }
+ if (element.hasEditor()) {
+ for (ContactDetail e : element.getEditor())
+ composeContactDetail("editor", e);
+ }
+ if (element.hasReviewer()) {
+ for (ContactDetail e : element.getReviewer())
+ composeContactDetail("reviewer", e);
+ }
+ if (element.hasEndorser()) {
+ for (ContactDetail e : element.getEndorser())
+ composeContactDetail("endorser", e);
+ }
+ if (element.hasSummary()) {
+ for (ContactDetail e : element.getSummary())
+ composeContactDetail("summary", e);
+ }
+ if (element.hasClassification()) {
+ for (Citation.CitationClassificationComponent e : element.getClassification())
+ composeCitationClassificationComponent("classification", e);
+ }
+ if (element.hasNote()) {
+ for (Annotation e : element.getNote())
+ composeAnnotation("note", e);
+ }
+ if (element.hasCurrentState()) {
+ for (CodeableConcept e : element.getCurrentState())
+ composeCodeableConcept("currentState", e);
+ }
+ if (element.hasStatusDate()) {
+ for (Citation.CitationStatusDateComponent e : element.getStatusDate())
+ composeCitationStatusDateComponent("statusDate", e);
+ }
+ if (element.hasRelatesTo()) {
+ for (Citation.CitationRelatesToComponent e : element.getRelatesTo())
+ composeCitationRelatesToComponent("relatesTo", e);
+ }
+ if (element.hasCitedArtifact()) {
+ composeCitationCitedArtifactComponent("citedArtifact", element.getCitedArtifact());
+ }
+ }
+
+ protected void composeCitationClassificationComponent(String name, Citation.CitationClassificationComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationClassificationComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationClassificationComponentElements(Citation.CitationClassificationComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasClassifier()) {
+ for (CodeableConcept e : element.getClassifier())
+ composeCodeableConcept("classifier", e);
+ }
+ }
+
+ protected void composeCitationStatusDateComponent(String name, Citation.CitationStatusDateComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationStatusDateComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationStatusDateComponentElements(Citation.CitationStatusDateComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasActivity()) {
+ composeCodeableConcept("activity", element.getActivity());
+ }
+ if (element.hasActualElement()) {
+ composeBoolean("actual", element.getActualElement());
+ }
+ if (element.hasPeriod()) {
+ composePeriod("period", element.getPeriod());
+ }
+ }
+
+ protected void composeCitationRelatesToComponent(String name, Citation.CitationRelatesToComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationRelatesToComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationRelatesToComponentElements(Citation.CitationRelatesToComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasRelationshipType()) {
+ composeCodeableConcept("relationshipType", element.getRelationshipType());
+ }
+ if (element.hasTargetClassifier()) {
+ for (CodeableConcept e : element.getTargetClassifier())
+ composeCodeableConcept("targetClassifier", e);
+ }
+ if (element.hasTarget()) {
+ composeType("target", element.getTarget());
+ } }
+
+ protected void composeCitationCitedArtifactComponent(String name, Citation.CitationCitedArtifactComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationCitedArtifactComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationCitedArtifactComponentElements(Citation.CitationCitedArtifactComponent element) throws IOException {
+ composeBackboneElementElements(element);
if (element.hasIdentifier()) {
for (Identifier e : element.getIdentifier())
composeIdentifier("identifier", e);
@@ -33146,111 +34238,159 @@ public class XmlParser extends XmlParserBase {
for (Identifier e : element.getRelatedIdentifier())
composeIdentifier("relatedIdentifier", e);
}
- if (element.hasSummary()) {
- for (Citation.CitationSummaryComponent e : element.getSummary())
- composeCitationSummaryComponent("summary", e);
+ if (element.hasDateAccessedElement()) {
+ composeDateTime("dateAccessed", element.getDateAccessedElement());
}
- if (element.hasDateCitedElement()) {
- composeDateTime("dateCited", element.getDateCitedElement());
+ if (element.hasVersion()) {
+ composeCitationCitedArtifactVersionComponent("version", element.getVersion());
}
- if (element.hasVariantCitation()) {
- composeCitationVariantCitationComponent("variantCitation", element.getVariantCitation());
+ if (element.hasCurrentState()) {
+ for (CodeableConcept e : element.getCurrentState())
+ composeCodeableConcept("currentState", e);
}
- if (element.hasPublishingModel()) {
- composeCodeableConcept("publishingModel", element.getPublishingModel());
+ if (element.hasStatusDate()) {
+ for (Citation.CitationCitedArtifactStatusDateComponent e : element.getStatusDate())
+ composeCitationCitedArtifactStatusDateComponent("statusDate", e);
}
- if (element.hasJournal()) {
- composeCitationJournalComponent("journal", element.getJournal());
+ if (element.hasTitle()) {
+ for (Citation.CitationCitedArtifactTitleComponent e : element.getTitle())
+ composeCitationCitedArtifactTitleComponent("title", e);
}
- if (element.hasPublicationInfo()) {
- composeCitationPublicationInfoComponent("publicationInfo", element.getPublicationInfo());
+ if (element.hasAbstract()) {
+ for (Citation.CitationCitedArtifactAbstractComponent e : element.getAbstract())
+ composeCitationCitedArtifactAbstractComponent("abstract", e);
}
- if (element.hasArticleTitleElement()) {
- composeMarkdown("articleTitle", element.getArticleTitleElement());
+ if (element.hasPart()) {
+ composeCitationCitedArtifactPartComponent("part", element.getPart());
}
- if (element.hasAlternativeTitle()) {
- for (Citation.CitationAlternativeTitleComponent e : element.getAlternativeTitle())
- composeCitationAlternativeTitleComponent("alternativeTitle", e);
+ if (element.hasRelatesTo()) {
+ for (Citation.CitationCitedArtifactRelatesToComponent e : element.getRelatesTo())
+ composeCitationCitedArtifactRelatesToComponent("relatesTo", e);
}
- if (element.hasPagination()) {
- composeCitationPaginationComponent("pagination", element.getPagination());
+ if (element.hasPublicationForm()) {
+ for (Citation.CitationCitedArtifactPublicationFormComponent e : element.getPublicationForm())
+ composeCitationCitedArtifactPublicationFormComponent("publicationForm", e);
}
- if (element.hasArticleUrl()) {
- for (Citation.CitationArticleUrlComponent e : element.getArticleUrl())
- composeCitationArticleUrlComponent("articleUrl", e);
+ if (element.hasWebLocation()) {
+ for (Citation.CitationCitedArtifactWebLocationComponent e : element.getWebLocation())
+ composeCitationCitedArtifactWebLocationComponent("webLocation", e);
}
- if (element.hasAbstractElement()) {
- composeMarkdown("abstract", element.getAbstractElement());
- }
- if (element.hasAbstractCopyrightElement()) {
- composeMarkdown("abstractCopyright", element.getAbstractCopyrightElement());
- }
- if (element.hasAlternativeAbstract()) {
- for (Citation.CitationAlternativeAbstractComponent e : element.getAlternativeAbstract())
- composeCitationAlternativeAbstractComponent("alternativeAbstract", e);
+ if (element.hasClassification()) {
+ for (Citation.CitationCitedArtifactClassificationComponent e : element.getClassification())
+ composeCitationCitedArtifactClassificationComponent("classification", e);
}
if (element.hasContributorship()) {
- composeCitationContributorshipComponent("contributorship", element.getContributorship());
- }
- if (element.hasArticleLanguage()) {
- composeCodeableConcept("articleLanguage", element.getArticleLanguage());
- }
- if (element.hasAlternativeForm()) {
- for (Citation.CitationAlternativeFormComponent e : element.getAlternativeForm())
- composeCitationAlternativeFormComponent("alternativeForm", e);
- }
- if (element.hasClassifier()) {
- for (CodeableConcept e : element.getClassifier())
- composeCodeableConcept("classifier", e);
- }
- if (element.hasKeywordList()) {
- for (Citation.CitationKeywordListComponent e : element.getKeywordList())
- composeCitationKeywordListComponent("keywordList", e);
- }
- if (element.hasRelatedArtifact()) {
- for (RelatedArtifact e : element.getRelatedArtifact())
- composeRelatedArtifact("relatedArtifact", e);
+ composeCitationCitedArtifactContributorshipComponent("contributorship", element.getContributorship());
}
if (element.hasNote()) {
for (Annotation e : element.getNote())
composeAnnotation("note", e);
}
- if (element.hasMedlinePubMed()) {
- composeCitationMedlinePubMedComponent("medlinePubMed", element.getMedlinePubMed());
- }
}
- protected void composeCitationSummaryComponent(String name, Citation.CitationSummaryComponent element) throws IOException {
+ protected void composeCitationCitedArtifactVersionComponent(String name, Citation.CitationCitedArtifactVersionComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationSummaryComponentElements(element);
+ composeCitationCitedArtifactVersionComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationSummaryComponentElements(Citation.CitationSummaryComponent element) throws IOException {
+ protected void composeCitationCitedArtifactVersionComponentElements(Citation.CitationCitedArtifactVersionComponent element) throws IOException {
composeBackboneElementElements(element);
- if (element.hasStyle()) {
- composeCodeableConcept("style", element.getStyle());
+ if (element.hasValueElement()) {
+ composeString("value", element.getValueElement());
+ }
+ if (element.hasBaseCitation()) {
+ composeReference("baseCitation", element.getBaseCitation());
+ }
+ }
+
+ protected void composeCitationCitedArtifactStatusDateComponent(String name, Citation.CitationCitedArtifactStatusDateComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationCitedArtifactStatusDateComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationCitedArtifactStatusDateComponentElements(Citation.CitationCitedArtifactStatusDateComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasActivity()) {
+ composeCodeableConcept("activity", element.getActivity());
+ }
+ if (element.hasActualElement()) {
+ composeBoolean("actual", element.getActualElement());
+ }
+ if (element.hasPeriod()) {
+ composePeriod("period", element.getPeriod());
+ }
+ }
+
+ protected void composeCitationCitedArtifactTitleComponent(String name, Citation.CitationCitedArtifactTitleComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationCitedArtifactTitleComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationCitedArtifactTitleComponentElements(Citation.CitationCitedArtifactTitleComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasLanguage()) {
+ composeCodeableConcept("language", element.getLanguage());
}
if (element.hasTextElement()) {
composeMarkdown("text", element.getTextElement());
}
}
- protected void composeCitationVariantCitationComponent(String name, Citation.CitationVariantCitationComponent element) throws IOException {
+ protected void composeCitationCitedArtifactAbstractComponent(String name, Citation.CitationCitedArtifactAbstractComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationVariantCitationComponentElements(element);
+ composeCitationCitedArtifactAbstractComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationVariantCitationComponentElements(Citation.CitationVariantCitationComponent element) throws IOException {
+ protected void composeCitationCitedArtifactAbstractComponentElements(Citation.CitationCitedArtifactAbstractComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasLanguage()) {
+ composeCodeableConcept("language", element.getLanguage());
+ }
+ if (element.hasTextElement()) {
+ composeMarkdown("text", element.getTextElement());
+ }
+ if (element.hasCopyrightElement()) {
+ composeMarkdown("copyright", element.getCopyrightElement());
+ }
+ }
+
+ protected void composeCitationCitedArtifactPartComponent(String name, Citation.CitationCitedArtifactPartComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationCitedArtifactPartComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationCitedArtifactPartComponentElements(Citation.CitationCitedArtifactPartComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
@@ -33263,44 +34403,118 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeCitationJournalComponent(String name, Citation.CitationJournalComponent element) throws IOException {
+ protected void composeCitationCitedArtifactRelatesToComponent(String name, Citation.CitationCitedArtifactRelatesToComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationJournalComponentElements(element);
+ composeCitationCitedArtifactRelatesToComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationJournalComponentElements(Citation.CitationJournalComponent element) throws IOException {
+ protected void composeCitationCitedArtifactRelatesToComponentElements(Citation.CitationCitedArtifactRelatesToComponent element) throws IOException {
composeBackboneElementElements(element);
+ if (element.hasRelationshipType()) {
+ composeCodeableConcept("relationshipType", element.getRelationshipType());
+ }
+ if (element.hasTargetClassifier()) {
+ for (CodeableConcept e : element.getTargetClassifier())
+ composeCodeableConcept("targetClassifier", e);
+ }
+ if (element.hasTarget()) {
+ composeType("target", element.getTarget());
+ } }
+
+ protected void composeCitationCitedArtifactPublicationFormComponent(String name, Citation.CitationCitedArtifactPublicationFormComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationCitedArtifactPublicationFormComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationCitedArtifactPublicationFormComponentElements(Citation.CitationCitedArtifactPublicationFormComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasPublishedIn()) {
+ composeCitationCitedArtifactPublicationFormPublishedInComponent("publishedIn", element.getPublishedIn());
+ }
+ if (element.hasPeriodicRelease()) {
+ composeCitationCitedArtifactPublicationFormPeriodicReleaseComponent("periodicRelease", element.getPeriodicRelease());
+ }
+ if (element.hasArticleDateElement()) {
+ composeDateTime("articleDate", element.getArticleDateElement());
+ }
+ if (element.hasLastRevisionDateElement()) {
+ composeDateTime("lastRevisionDate", element.getLastRevisionDateElement());
+ }
+ if (element.hasLanguage()) {
+ for (CodeableConcept e : element.getLanguage())
+ composeCodeableConcept("language", e);
+ }
+ if (element.hasAccessionNumberElement()) {
+ composeString("accessionNumber", element.getAccessionNumberElement());
+ }
+ if (element.hasPageStringElement()) {
+ composeString("pageString", element.getPageStringElement());
+ }
+ if (element.hasFirstPageElement()) {
+ composeString("firstPage", element.getFirstPageElement());
+ }
+ if (element.hasLastPageElement()) {
+ composeString("lastPage", element.getLastPageElement());
+ }
+ if (element.hasPageCountElement()) {
+ composeString("pageCount", element.getPageCountElement());
+ }
+ if (element.hasCopyrightElement()) {
+ composeMarkdown("copyright", element.getCopyrightElement());
+ }
+ }
+
+ protected void composeCitationCitedArtifactPublicationFormPublishedInComponent(String name, Citation.CitationCitedArtifactPublicationFormPublishedInComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationCitedArtifactPublicationFormPublishedInComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationCitedArtifactPublicationFormPublishedInComponentElements(Citation.CitationCitedArtifactPublicationFormPublishedInComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
if (element.hasIdentifier()) {
for (Identifier e : element.getIdentifier())
composeIdentifier("identifier", e);
}
- if (element.hasCountryElement()) {
- composeString("country", element.getCountryElement());
- }
- if (element.hasJournalIssue()) {
- composeCitationJournalJournalIssueComponent("journalIssue", element.getJournalIssue());
- }
if (element.hasTitleElement()) {
composeString("title", element.getTitleElement());
}
+ if (element.hasPublisher()) {
+ composeReference("publisher", element.getPublisher());
+ }
+ if (element.hasPublisherLocationElement()) {
+ composeString("publisherLocation", element.getPublisherLocationElement());
+ }
}
- protected void composeCitationJournalJournalIssueComponent(String name, Citation.CitationJournalJournalIssueComponent element) throws IOException {
+ protected void composeCitationCitedArtifactPublicationFormPeriodicReleaseComponent(String name, Citation.CitationCitedArtifactPublicationFormPeriodicReleaseComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationJournalJournalIssueComponentElements(element);
+ composeCitationCitedArtifactPublicationFormPeriodicReleaseComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationJournalJournalIssueComponentElements(Citation.CitationJournalJournalIssueComponent element) throws IOException {
+ protected void composeCitationCitedArtifactPublicationFormPeriodicReleaseComponentElements(Citation.CitationCitedArtifactPublicationFormPeriodicReleaseComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasCitedMedium()) {
composeCodeableConcept("citedMedium", element.getCitedMedium());
@@ -33311,22 +34525,22 @@ public class XmlParser extends XmlParserBase {
if (element.hasIssueElement()) {
composeString("issue", element.getIssueElement());
}
- if (element.hasPublicationDate()) {
- composeCitationJournalJournalIssuePublicationDateComponent("publicationDate", element.getPublicationDate());
+ if (element.hasDateOfPublication()) {
+ composeCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent("dateOfPublication", element.getDateOfPublication());
}
}
- protected void composeCitationJournalJournalIssuePublicationDateComponent(String name, Citation.CitationJournalJournalIssuePublicationDateComponent element) throws IOException {
+ protected void composeCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent(String name, Citation.CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationJournalJournalIssuePublicationDateComponentElements(element);
+ composeCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationJournalJournalIssuePublicationDateComponentElements(Citation.CitationJournalJournalIssuePublicationDateComponent element) throws IOException {
+ protected void composeCitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponentElements(Citation.CitationCitedArtifactPublicationFormPeriodicReleaseDateOfPublicationComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasDateElement()) {
composeDate("date", element.getDateElement());
@@ -33348,122 +34562,17 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeCitationPublicationInfoComponent(String name, Citation.CitationPublicationInfoComponent element) throws IOException {
+ protected void composeCitationCitedArtifactWebLocationComponent(String name, Citation.CitationCitedArtifactWebLocationComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationPublicationInfoComponentElements(element);
+ composeCitationCitedArtifactWebLocationComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationPublicationInfoComponentElements(Citation.CitationPublicationInfoComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasPublishedIn()) {
- composeCitationPublicationInfoPublishedInComponent("publishedIn", element.getPublishedIn());
- }
- if (element.hasEntryDateElement()) {
- composeDateTime("entryDate", element.getEntryDateElement());
- }
- if (element.hasRevisionDateElement()) {
- composeDateTime("revisionDate", element.getRevisionDateElement());
- }
- if (element.hasPageCountElement()) {
- composeString("pageCount", element.getPageCountElement());
- }
- }
-
- protected void composeCitationPublicationInfoPublishedInComponent(String name, Citation.CitationPublicationInfoPublishedInComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationPublicationInfoPublishedInComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationPublicationInfoPublishedInComponentElements(Citation.CitationPublicationInfoPublishedInComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasType()) {
- composeCodeableConcept("type", element.getType());
- }
- if (element.hasIdentifier()) {
- for (Identifier e : element.getIdentifier())
- composeIdentifier("identifier", e);
- }
- if (element.hasNameElement()) {
- composeString("name", element.getNameElement());
- }
- if (element.hasPublisher()) {
- composeReference("publisher", element.getPublisher());
- }
- if (element.hasPublisherLocationElement()) {
- composeString("publisherLocation", element.getPublisherLocationElement());
- }
- if (element.hasStartDateElement()) {
- composeDate("startDate", element.getStartDateElement());
- }
- }
-
- protected void composeCitationAlternativeTitleComponent(String name, Citation.CitationAlternativeTitleComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationAlternativeTitleComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationAlternativeTitleComponentElements(Citation.CitationAlternativeTitleComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasType()) {
- composeCodeableConcept("type", element.getType());
- }
- if (element.hasLanguage()) {
- composeCodeableConcept("language", element.getLanguage());
- }
- if (element.hasTitleElement()) {
- composeMarkdown("title", element.getTitleElement());
- }
- }
-
- protected void composeCitationPaginationComponent(String name, Citation.CitationPaginationComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationPaginationComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationPaginationComponentElements(Citation.CitationPaginationComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasPageStringElement()) {
- composeString("pageString", element.getPageStringElement());
- }
- if (element.hasFirstPageElement()) {
- composeString("firstPage", element.getFirstPageElement());
- }
- if (element.hasLastPageElement()) {
- composeString("lastPage", element.getLastPageElement());
- }
- }
-
- protected void composeCitationArticleUrlComponent(String name, Citation.CitationArticleUrlComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationArticleUrlComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationArticleUrlComponentElements(Citation.CitationArticleUrlComponent element) throws IOException {
+ protected void composeCitationCitedArtifactWebLocationComponentElements(Citation.CitationCitedArtifactWebLocationComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
@@ -33473,68 +34582,95 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeCitationAlternativeAbstractComponent(String name, Citation.CitationAlternativeAbstractComponent element) throws IOException {
+ protected void composeCitationCitedArtifactClassificationComponent(String name, Citation.CitationCitedArtifactClassificationComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationAlternativeAbstractComponentElements(element);
+ composeCitationCitedArtifactClassificationComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationAlternativeAbstractComponentElements(Citation.CitationAlternativeAbstractComponent element) throws IOException {
+ protected void composeCitationCitedArtifactClassificationComponentElements(Citation.CitationCitedArtifactClassificationComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
- if (element.hasLanguage()) {
- composeCodeableConcept("language", element.getLanguage());
+ if (element.hasClassifier()) {
+ for (CodeableConcept e : element.getClassifier())
+ composeCodeableConcept("classifier", e);
}
- if (element.hasAbstractElement()) {
- composeMarkdown("abstract", element.getAbstractElement());
- }
- if (element.hasAbstractCopyrightElement()) {
- composeMarkdown("abstractCopyright", element.getAbstractCopyrightElement());
+ if (element.hasWhoClassified()) {
+ composeCitationCitedArtifactClassificationWhoClassifiedComponent("whoClassified", element.getWhoClassified());
}
}
- protected void composeCitationContributorshipComponent(String name, Citation.CitationContributorshipComponent element) throws IOException {
+ protected void composeCitationCitedArtifactClassificationWhoClassifiedComponent(String name, Citation.CitationCitedArtifactClassificationWhoClassifiedComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationContributorshipComponentElements(element);
+ composeCitationCitedArtifactClassificationWhoClassifiedComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationContributorshipComponentElements(Citation.CitationContributorshipComponent element) throws IOException {
+ protected void composeCitationCitedArtifactClassificationWhoClassifiedComponentElements(Citation.CitationCitedArtifactClassificationWhoClassifiedComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasPerson()) {
+ composeReference("person", element.getPerson());
+ }
+ if (element.hasOrganization()) {
+ composeReference("organization", element.getOrganization());
+ }
+ if (element.hasPublisher()) {
+ composeReference("publisher", element.getPublisher());
+ }
+ if (element.hasClassifierCopyrightElement()) {
+ composeString("classifierCopyright", element.getClassifierCopyrightElement());
+ }
+ if (element.hasFreeToShareElement()) {
+ composeBoolean("freeToShare", element.getFreeToShareElement());
+ }
+ }
+
+ protected void composeCitationCitedArtifactContributorshipComponent(String name, Citation.CitationCitedArtifactContributorshipComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationCitedArtifactContributorshipComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationCitedArtifactContributorshipComponentElements(Citation.CitationCitedArtifactContributorshipComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasCompleteElement()) {
composeBoolean("complete", element.getCompleteElement());
}
if (element.hasEntry()) {
- for (Citation.CitationContributorshipEntryComponent e : element.getEntry())
- composeCitationContributorshipEntryComponent("entry", e);
+ for (Citation.CitationCitedArtifactContributorshipEntryComponent e : element.getEntry())
+ composeCitationCitedArtifactContributorshipEntryComponent("entry", e);
}
if (element.hasSummary()) {
- for (Citation.CitationContributorshipSummaryComponent e : element.getSummary())
- composeCitationContributorshipSummaryComponent("summary", e);
+ for (Citation.CitationCitedArtifactContributorshipSummaryComponent e : element.getSummary())
+ composeCitationCitedArtifactContributorshipSummaryComponent("summary", e);
}
}
- protected void composeCitationContributorshipEntryComponent(String name, Citation.CitationContributorshipEntryComponent element) throws IOException {
+ protected void composeCitationCitedArtifactContributorshipEntryComponent(String name, Citation.CitationCitedArtifactContributorshipEntryComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationContributorshipEntryComponentElements(element);
+ composeCitationCitedArtifactContributorshipEntryComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationContributorshipEntryComponentElements(Citation.CitationContributorshipEntryComponent element) throws IOException {
+ protected void composeCitationCitedArtifactContributorshipEntryComponentElements(Citation.CitationCitedArtifactContributorshipEntryComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasName()) {
composeHumanName("name", element.getName());
@@ -33550,8 +34686,8 @@ public class XmlParser extends XmlParserBase {
composeIdentifier("identifier", e);
}
if (element.hasAffiliationInfo()) {
- for (Citation.CitationContributorshipEntryAffiliationInfoComponent e : element.getAffiliationInfo())
- composeCitationContributorshipEntryAffiliationInfoComponent("affiliationInfo", e);
+ for (Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent e : element.getAffiliationInfo())
+ composeCitationCitedArtifactContributorshipEntryAffiliationInfoComponent("affiliationInfo", e);
}
if (element.hasAddress()) {
for (Address e : element.getAddress())
@@ -33561,32 +34697,36 @@ public class XmlParser extends XmlParserBase {
for (ContactPoint e : element.getTelecom())
composeContactPoint("telecom", e);
}
- if (element.hasContribution()) {
- for (CodeableConcept e : element.getContribution())
- composeCodeableConcept("contribution", e);
+ if (element.hasContributionType()) {
+ for (CodeableConcept e : element.getContributionType())
+ composeCodeableConcept("contributionType", e);
}
- if (element.hasNotAnAuthorElement()) {
- composeBoolean("notAnAuthor", element.getNotAnAuthorElement());
+ if (element.hasRole()) {
+ composeCodeableConcept("role", element.getRole());
}
- if (element.hasCorrespondingAuthorElement()) {
- composeBoolean("correspondingAuthor", element.getCorrespondingAuthorElement());
+ if (element.hasContributionInstance()) {
+ for (Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent e : element.getContributionInstance())
+ composeCitationCitedArtifactContributorshipEntryContributionInstanceComponent("contributionInstance", e);
+ }
+ if (element.hasCorrespondingContactElement()) {
+ composeBoolean("correspondingContact", element.getCorrespondingContactElement());
}
if (element.hasListOrderElement()) {
composePositiveInt("listOrder", element.getListOrderElement());
}
}
- protected void composeCitationContributorshipEntryAffiliationInfoComponent(String name, Citation.CitationContributorshipEntryAffiliationInfoComponent element) throws IOException {
+ protected void composeCitationCitedArtifactContributorshipEntryAffiliationInfoComponent(String name, Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationContributorshipEntryAffiliationInfoComponentElements(element);
+ composeCitationCitedArtifactContributorshipEntryAffiliationInfoComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationContributorshipEntryAffiliationInfoComponentElements(Citation.CitationContributorshipEntryAffiliationInfoComponent element) throws IOException {
+ protected void composeCitationCitedArtifactContributorshipEntryAffiliationInfoComponentElements(Citation.CitationCitedArtifactContributorshipEntryAffiliationInfoComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasAffiliationElement()) {
composeString("affiliation", element.getAffiliationElement());
@@ -33600,17 +34740,37 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeCitationContributorshipSummaryComponent(String name, Citation.CitationContributorshipSummaryComponent element) throws IOException {
+ protected void composeCitationCitedArtifactContributorshipEntryContributionInstanceComponent(String name, Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeCitationContributorshipSummaryComponentElements(element);
+ composeCitationCitedArtifactContributorshipEntryContributionInstanceComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeCitationContributorshipSummaryComponentElements(Citation.CitationContributorshipSummaryComponent element) throws IOException {
+ protected void composeCitationCitedArtifactContributorshipEntryContributionInstanceComponentElements(Citation.CitationCitedArtifactContributorshipEntryContributionInstanceComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasTimeElement()) {
+ composeDateTime("time", element.getTimeElement());
+ }
+ }
+
+ protected void composeCitationCitedArtifactContributorshipSummaryComponent(String name, Citation.CitationCitedArtifactContributorshipSummaryComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeCitationCitedArtifactContributorshipSummaryComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeCitationCitedArtifactContributorshipSummaryComponentElements(Citation.CitationCitedArtifactContributorshipSummaryComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
@@ -33626,302 +34786,6 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeCitationAlternativeFormComponent(String name, Citation.CitationAlternativeFormComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationAlternativeFormComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationAlternativeFormComponentElements(Citation.CitationAlternativeFormComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasPublishingModel()) {
- composeCodeableConcept("publishingModel", element.getPublishingModel());
- }
- if (element.hasLanguage()) {
- composeCodeableConcept("language", element.getLanguage());
- }
- if (element.hasJournalIssue()) {
- composeCitationAlternativeFormJournalIssueComponent("journalIssue", element.getJournalIssue());
- }
- if (element.hasPagination()) {
- composeCitationAlternativeFormPaginationComponent("pagination", element.getPagination());
- }
- if (element.hasPublicationInfo()) {
- composeCitationAlternativeFormPublicationInfoComponent("publicationInfo", element.getPublicationInfo());
- }
- }
-
- protected void composeCitationAlternativeFormJournalIssueComponent(String name, Citation.CitationAlternativeFormJournalIssueComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationAlternativeFormJournalIssueComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationAlternativeFormJournalIssueComponentElements(Citation.CitationAlternativeFormJournalIssueComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasCitedMedium()) {
- composeCodeableConcept("citedMedium", element.getCitedMedium());
- }
- if (element.hasVolumeElement()) {
- composeString("volume", element.getVolumeElement());
- }
- if (element.hasIssueElement()) {
- composeString("issue", element.getIssueElement());
- }
- if (element.hasPublicationDate()) {
- composeCitationAlternativeFormJournalIssuePublicationDateComponent("publicationDate", element.getPublicationDate());
- }
- }
-
- protected void composeCitationAlternativeFormJournalIssuePublicationDateComponent(String name, Citation.CitationAlternativeFormJournalIssuePublicationDateComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationAlternativeFormJournalIssuePublicationDateComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationAlternativeFormJournalIssuePublicationDateComponentElements(Citation.CitationAlternativeFormJournalIssuePublicationDateComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasDateElement()) {
- composeDate("date", element.getDateElement());
- }
- if (element.hasYearElement()) {
- composeString("year", element.getYearElement());
- }
- if (element.hasMonthElement()) {
- composeString("month", element.getMonthElement());
- }
- if (element.hasDayElement()) {
- composeString("day", element.getDayElement());
- }
- if (element.hasSeasonElement()) {
- composeString("season", element.getSeasonElement());
- }
- if (element.hasTextElement()) {
- composeString("text", element.getTextElement());
- }
- }
-
- protected void composeCitationAlternativeFormPaginationComponent(String name, Citation.CitationAlternativeFormPaginationComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationAlternativeFormPaginationComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationAlternativeFormPaginationComponentElements(Citation.CitationAlternativeFormPaginationComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasPageStringElement()) {
- composeString("pageString", element.getPageStringElement());
- }
- if (element.hasFirstPageElement()) {
- composeString("firstPage", element.getFirstPageElement());
- }
- if (element.hasLastPageElement()) {
- composeString("lastPage", element.getLastPageElement());
- }
- }
-
- protected void composeCitationAlternativeFormPublicationInfoComponent(String name, Citation.CitationAlternativeFormPublicationInfoComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationAlternativeFormPublicationInfoComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationAlternativeFormPublicationInfoComponentElements(Citation.CitationAlternativeFormPublicationInfoComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasPublishedIn()) {
- composeCitationAlternativeFormPublicationInfoPublishedInComponent("publishedIn", element.getPublishedIn());
- }
- if (element.hasEntryDateElement()) {
- composeDateTime("entryDate", element.getEntryDateElement());
- }
- if (element.hasRevisionDateElement()) {
- composeDateTime("revisionDate", element.getRevisionDateElement());
- }
- if (element.hasPageCountElement()) {
- composeString("pageCount", element.getPageCountElement());
- }
- }
-
- protected void composeCitationAlternativeFormPublicationInfoPublishedInComponent(String name, Citation.CitationAlternativeFormPublicationInfoPublishedInComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationAlternativeFormPublicationInfoPublishedInComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationAlternativeFormPublicationInfoPublishedInComponentElements(Citation.CitationAlternativeFormPublicationInfoPublishedInComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasType()) {
- composeCodeableConcept("type", element.getType());
- }
- if (element.hasNameElement()) {
- composeString("name", element.getNameElement());
- }
- if (element.hasPublisher()) {
- composeReference("publisher", element.getPublisher());
- }
- if (element.hasPublisherLocationElement()) {
- composeString("publisherLocation", element.getPublisherLocationElement());
- }
- if (element.hasStartDateElement()) {
- composeDate("startDate", element.getStartDateElement());
- }
- }
-
- protected void composeCitationKeywordListComponent(String name, Citation.CitationKeywordListComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationKeywordListComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationKeywordListComponentElements(Citation.CitationKeywordListComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasOwnerElement()) {
- composeString("owner", element.getOwnerElement());
- }
- if (element.hasKeyword()) {
- for (Citation.CitationKeywordListKeywordComponent e : element.getKeyword())
- composeCitationKeywordListKeywordComponent("keyword", e);
- }
- }
-
- protected void composeCitationKeywordListKeywordComponent(String name, Citation.CitationKeywordListKeywordComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationKeywordListKeywordComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationKeywordListKeywordComponentElements(Citation.CitationKeywordListKeywordComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasMajorTopicElement()) {
- composeBoolean("majorTopic", element.getMajorTopicElement());
- }
- if (element.hasValueElement()) {
- composeString("value", element.getValueElement());
- }
- }
-
- protected void composeCitationMedlinePubMedComponent(String name, Citation.CitationMedlinePubMedComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationMedlinePubMedComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationMedlinePubMedComponentElements(Citation.CitationMedlinePubMedComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasMedlineState()) {
- composeCodeableConcept("medlineState", element.getMedlineState());
- }
- if (element.hasOwner()) {
- composeCodeableConcept("owner", element.getOwner());
- }
- if (element.hasPmidElement()) {
- composePositiveInt("pmid", element.getPmidElement());
- }
- if (element.hasPmidVersionElement()) {
- composePositiveInt("pmidVersion", element.getPmidVersionElement());
- }
- if (element.hasDateCreatedElement()) {
- composeDate("dateCreated", element.getDateCreatedElement());
- }
- if (element.hasDateCompletedElement()) {
- composeDate("dateCompleted", element.getDateCompletedElement());
- }
- if (element.hasDateRevisedElement()) {
- composeDate("dateRevised", element.getDateRevisedElement());
- }
- if (element.hasPubMedPubDate()) {
- for (Citation.CitationMedlinePubMedPubMedPubDateComponent e : element.getPubMedPubDate())
- composeCitationMedlinePubMedPubMedPubDateComponent("pubMedPubDate", e);
- }
- if (element.hasPublicationState()) {
- composeCodeableConcept("publicationState", element.getPublicationState());
- }
- if (element.hasRelatedArticle()) {
- for (Citation.CitationMedlinePubMedRelatedArticleComponent e : element.getRelatedArticle())
- composeCitationMedlinePubMedRelatedArticleComponent("relatedArticle", e);
- }
- }
-
- protected void composeCitationMedlinePubMedPubMedPubDateComponent(String name, Citation.CitationMedlinePubMedPubMedPubDateComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationMedlinePubMedPubMedPubDateComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationMedlinePubMedPubMedPubDateComponentElements(Citation.CitationMedlinePubMedPubMedPubDateComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasPublicationState()) {
- composeCodeableConcept("publicationState", element.getPublicationState());
- }
- if (element.hasDateElement()) {
- composeDateTime("date", element.getDateElement());
- }
- }
-
- protected void composeCitationMedlinePubMedRelatedArticleComponent(String name, Citation.CitationMedlinePubMedRelatedArticleComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeCitationMedlinePubMedRelatedArticleComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeCitationMedlinePubMedRelatedArticleComponentElements(Citation.CitationMedlinePubMedRelatedArticleComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasCitationReference()) {
- composeReference("citationReference", element.getCitationReference());
- }
- if (element.hasCitationMarkdownElement()) {
- composeMarkdown("citationMarkdown", element.getCitationMarkdownElement());
- }
- if (element.hasIdentifier()) {
- for (Identifier e : element.getIdentifier())
- composeIdentifier("identifier", e);
- }
- }
-
protected void composeClaim(String name, Claim element) throws IOException {
if (element != null) {
composeResourceAttributes(element);
@@ -35091,14 +35955,14 @@ public class XmlParser extends XmlParserBase {
protected void composeClinicalUseIssueContraindicationComponentElements(ClinicalUseIssue.ClinicalUseIssueContraindicationComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasDiseaseSymptomProcedure()) {
- composeCodeableConcept("diseaseSymptomProcedure", element.getDiseaseSymptomProcedure());
+ composeCodeableReference("diseaseSymptomProcedure", element.getDiseaseSymptomProcedure());
}
if (element.hasDiseaseStatus()) {
- composeCodeableConcept("diseaseStatus", element.getDiseaseStatus());
+ composeCodeableReference("diseaseStatus", element.getDiseaseStatus());
}
if (element.hasComorbidity()) {
- for (CodeableConcept e : element.getComorbidity())
- composeCodeableConcept("comorbidity", e);
+ for (CodeableReference e : element.getComorbidity())
+ composeCodeableReference("comorbidity", e);
}
if (element.hasIndication()) {
for (Reference e : element.getIndication())
@@ -35122,12 +35986,13 @@ public class XmlParser extends XmlParserBase {
protected void composeClinicalUseIssueContraindicationOtherTherapyComponentElements(ClinicalUseIssue.ClinicalUseIssueContraindicationOtherTherapyComponent element) throws IOException {
composeBackboneElementElements(element);
- if (element.hasTherapyRelationshipType()) {
- composeCodeableConcept("therapyRelationshipType", element.getTherapyRelationshipType());
+ if (element.hasRelationshipType()) {
+ composeCodeableConcept("relationshipType", element.getRelationshipType());
}
- if (element.hasMedication()) {
- composeType("medication", element.getMedication());
- } }
+ if (element.hasTherapy()) {
+ composeCodeableReference("therapy", element.getTherapy());
+ }
+ }
protected void composeClinicalUseIssueIndicationComponent(String name, ClinicalUseIssue.ClinicalUseIssueIndicationComponent element) throws IOException {
if (element != null) {
@@ -35142,17 +36007,17 @@ public class XmlParser extends XmlParserBase {
protected void composeClinicalUseIssueIndicationComponentElements(ClinicalUseIssue.ClinicalUseIssueIndicationComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasDiseaseSymptomProcedure()) {
- composeCodeableConcept("diseaseSymptomProcedure", element.getDiseaseSymptomProcedure());
+ composeCodeableReference("diseaseSymptomProcedure", element.getDiseaseSymptomProcedure());
}
if (element.hasDiseaseStatus()) {
- composeCodeableConcept("diseaseStatus", element.getDiseaseStatus());
+ composeCodeableReference("diseaseStatus", element.getDiseaseStatus());
}
if (element.hasComorbidity()) {
- for (CodeableConcept e : element.getComorbidity())
- composeCodeableConcept("comorbidity", e);
+ for (CodeableReference e : element.getComorbidity())
+ composeCodeableReference("comorbidity", e);
}
if (element.hasIntendedEffect()) {
- composeCodeableConcept("intendedEffect", element.getIntendedEffect());
+ composeCodeableReference("intendedEffect", element.getIntendedEffect());
}
if (element.hasDuration()) {
composeQuantity("duration", element.getDuration());
@@ -35187,7 +36052,7 @@ public class XmlParser extends XmlParserBase {
composeCodeableConcept("type", element.getType());
}
if (element.hasEffect()) {
- composeCodeableConcept("effect", element.getEffect());
+ composeCodeableReference("effect", element.getEffect());
}
if (element.hasIncidence()) {
composeCodeableConcept("incidence", element.getIncidence());
@@ -35226,7 +36091,7 @@ public class XmlParser extends XmlParserBase {
protected void composeClinicalUseIssueUndesirableEffectComponentElements(ClinicalUseIssue.ClinicalUseIssueUndesirableEffectComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasSymptomConditionEffect()) {
- composeCodeableConcept("symptomConditionEffect", element.getSymptomConditionEffect());
+ composeCodeableReference("symptomConditionEffect", element.getSymptomConditionEffect());
}
if (element.hasClassification()) {
composeCodeableConcept("classification", element.getClassification());
@@ -35599,6 +36464,8 @@ public class XmlParser extends XmlParserBase {
if (element.hasStatusReason()) {
composeCodeableConcept("statusReason", element.getStatusReason());
}
+ if (element.hasIntentElement())
+ composeEnumeration("intent", element.getIntentElement(), new Enumerations.RequestIntentEnumFactory());
if (element.hasCategory()) {
for (CodeableConcept e : element.getCategory())
composeCodeableConcept("category", e);
@@ -35939,8 +36806,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasUrlElement()) {
composeUri("url", element.getUrlElement());
}
- if (element.hasIdentifier()) {
- composeIdentifier("identifier", element.getIdentifierFirstRep());
+ if (element.hasIdentifier()) {
+ for (Identifier e : element.getIdentifier())
+ composeIdentifier("identifier", e);
}
if (element.hasVersionElement()) {
composeString("version", element.getVersionElement());
@@ -36006,16 +36874,10 @@ public class XmlParser extends XmlParserBase {
protected void composeConceptMapGroupComponentElements(ConceptMap.ConceptMapGroupComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasSourceElement()) {
- composeUri("source", element.getSourceElement());
- }
- if (element.hasSourceVersionElement()) {
- composeString("sourceVersion", element.getSourceVersionElement());
+ composeCanonical("source", element.getSourceElement());
}
if (element.hasTargetElement()) {
- composeUri("target", element.getTargetElement());
- }
- if (element.hasTargetVersionElement()) {
- composeString("targetVersion", element.getTargetVersionElement());
+ composeCanonical("target", element.getTargetElement());
}
if (element.hasElement()) {
for (ConceptMap.SourceElementComponent e : element.getElement())
@@ -37658,7 +38520,7 @@ public class XmlParser extends XmlParserBase {
composeReference("request", element.getRequest());
}
if (element.hasOutcomeElement())
- composeEnumeration("outcome", element.getOutcomeElement(), new Enumerations.ClaimProcessingCodesEnumFactory());
+ composeEnumeration("outcome", element.getOutcomeElement(), new CoverageEligibilityResponse.EligibilityOutcomeEnumFactory());
if (element.hasDispositionElement()) {
composeString("disposition", element.getDispositionElement());
}
@@ -38120,15 +38982,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
- if (element.hasValueQuantity()) {
- for (Quantity e : element.getValueQuantity())
- composeQuantity("valueQuantity", e);
- }
- if (element.hasValueCode()) {
- for (CodeableConcept e : element.getValueCode())
- composeCodeableConcept("valueCode", e);
- }
- }
+ if (element.hasValue()) {
+ composeType("value", element.getValue());
+ } }
protected void composeDeviceOperationalStatusComponent(String name, Device.DeviceOperationalStatusComponent element) throws IOException {
if (element != null) {
@@ -38201,16 +39057,25 @@ public class XmlParser extends XmlParserBase {
if (element.hasModelNumberElement()) {
composeString("modelNumber", element.getModelNumberElement());
}
- if (element.hasType()) {
- composeCodeableConcept("type", element.getType());
+ if (element.hasType()) {
+ for (CodeableConcept e : element.getType())
+ composeCodeableConcept("type", e);
}
if (element.hasSpecialization()) {
for (DeviceDefinition.DeviceDefinitionSpecializationComponent e : element.getSpecialization())
composeDeviceDefinitionSpecializationComponent("specialization", e);
}
+ if (element.hasHasPart()) {
+ for (DeviceDefinition.DeviceDefinitionHasPartComponent e : element.getHasPart())
+ composeDeviceDefinitionHasPartComponent("hasPart", e);
+ }
+ if (element.hasPackaging()) {
+ for (DeviceDefinition.DeviceDefinitionPackagingComponent e : element.getPackaging())
+ composeDeviceDefinitionPackagingComponent("packaging", e);
+ }
if (element.hasVersion()) {
- for (StringType e : element.getVersion())
- composeString("version", e);
+ for (DeviceDefinition.DeviceDefinitionVersionComponent e : element.getVersion())
+ composeDeviceDefinitionVersionComponent("version", e);
}
if (element.hasSafety()) {
for (CodeableConcept e : element.getSafety())
@@ -38249,9 +39114,6 @@ public class XmlParser extends XmlParserBase {
for (Annotation e : element.getNote())
composeAnnotation("note", e);
}
- if (element.hasQuantity()) {
- composeQuantity("quantity", element.getQuantity());
- }
if (element.hasParentDevice()) {
composeReference("parentDevice", element.getParentDevice());
}
@@ -38323,6 +39185,128 @@ public class XmlParser extends XmlParserBase {
}
}
+ protected void composeDeviceDefinitionHasPartComponent(String name, DeviceDefinition.DeviceDefinitionHasPartComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeDeviceDefinitionHasPartComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeDeviceDefinitionHasPartComponentElements(DeviceDefinition.DeviceDefinitionHasPartComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasReference()) {
+ composeReference("reference", element.getReference());
+ }
+ if (element.hasCountElement()) {
+ composeInteger("count", element.getCountElement());
+ }
+ }
+
+ protected void composeDeviceDefinitionPackagingComponent(String name, DeviceDefinition.DeviceDefinitionPackagingComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeDeviceDefinitionPackagingComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeDeviceDefinitionPackagingComponentElements(DeviceDefinition.DeviceDefinitionPackagingComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasIdentifier()) {
+ composeIdentifier("identifier", element.getIdentifier());
+ }
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasCountElement()) {
+ composeInteger("count", element.getCountElement());
+ }
+ if (element.hasDistributor()) {
+ for (DeviceDefinition.DeviceDefinitionPackagingDistributorComponent e : element.getDistributor())
+ composeDeviceDefinitionPackagingDistributorComponent("distributor", e);
+ }
+ if (element.hasUdiDeviceIdentifier()) {
+ for (DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent e : element.getUdiDeviceIdentifier())
+ composeDeviceDefinitionPackagingUdiDeviceIdentifierComponent("udiDeviceIdentifier", e);
+ }
+ if (element.hasPackaging()) {
+ for (DeviceDefinition.DeviceDefinitionPackagingComponent e : element.getPackaging())
+ composeDeviceDefinitionPackagingComponent("packaging", e);
+ }
+ }
+
+ protected void composeDeviceDefinitionPackagingDistributorComponent(String name, DeviceDefinition.DeviceDefinitionPackagingDistributorComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeDeviceDefinitionPackagingDistributorComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeDeviceDefinitionPackagingDistributorComponentElements(DeviceDefinition.DeviceDefinitionPackagingDistributorComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasNameElement()) {
+ composeString("name", element.getNameElement());
+ }
+ if (element.hasOrganizationReference()) {
+ for (Reference e : element.getOrganizationReference())
+ composeReference("organizationReference", e);
+ }
+ }
+
+ protected void composeDeviceDefinitionPackagingUdiDeviceIdentifierComponent(String name, DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeDeviceDefinitionPackagingUdiDeviceIdentifierComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeDeviceDefinitionPackagingUdiDeviceIdentifierComponentElements(DeviceDefinition.DeviceDefinitionPackagingUdiDeviceIdentifierComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasDeviceIdentifierElement()) {
+ composeString("deviceIdentifier", element.getDeviceIdentifierElement());
+ }
+ if (element.hasIssuerElement()) {
+ composeUri("issuer", element.getIssuerElement());
+ }
+ if (element.hasJurisdictionElement()) {
+ composeUri("jurisdiction", element.getJurisdictionElement());
+ }
+ }
+
+ protected void composeDeviceDefinitionVersionComponent(String name, DeviceDefinition.DeviceDefinitionVersionComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeDeviceDefinitionVersionComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeDeviceDefinitionVersionComponentElements(DeviceDefinition.DeviceDefinitionVersionComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasComponent()) {
+ composeIdentifier("component", element.getComponent());
+ }
+ if (element.hasValueElement()) {
+ composeString("value", element.getValueElement());
+ }
+ }
+
protected void composeDeviceDefinitionCapabilityComponent(String name, DeviceDefinition.DeviceDefinitionCapabilityComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
@@ -38497,9 +39481,15 @@ public class XmlParser extends XmlParserBase {
composeEnumeration("intent", element.getIntentElement(), new Enumerations.RequestIntentEnumFactory());
if (element.hasPriorityElement())
composeEnumeration("priority", element.getPriorityElement(), new Enumerations.RequestPriorityEnumFactory());
+ if (element.hasDoNotPerformElement()) {
+ composeBoolean("doNotPerform", element.getDoNotPerformElement());
+ }
if (element.hasCode()) {
composeCodeableReference("code", element.getCode());
}
+ if (element.hasQuantityElement()) {
+ composeInteger("quantity", element.getQuantityElement());
+ }
if (element.hasParameter()) {
for (DeviceRequest.DeviceRequestParameterComponent e : element.getParameter())
composeDeviceRequestParameterComponent("parameter", e);
@@ -38565,17 +39555,17 @@ public class XmlParser extends XmlParserBase {
composeType("value", element.getValue());
} }
- protected void composeDeviceUseStatement(String name, DeviceUseStatement element) throws IOException {
+ protected void composeDeviceUsage(String name, DeviceUsage element) throws IOException {
if (element != null) {
composeResourceAttributes(element);
xml.enter(FHIR_NS, name);
- composeDeviceUseStatementElements(element);
+ composeDeviceUsageElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeDeviceUseStatementElements(DeviceUseStatement element) throws IOException {
+ protected void composeDeviceUsageElements(DeviceUsage element) throws IOException {
composeDomainResourceElements(element);
if (element.hasIdentifier()) {
for (Identifier e : element.getIdentifier())
@@ -38586,7 +39576,7 @@ public class XmlParser extends XmlParserBase {
composeReference("basedOn", e);
}
if (element.hasStatusElement())
- composeEnumeration("status", element.getStatusElement(), new DeviceUseStatement.DeviceUseStatementStatusEnumFactory());
+ composeEnumeration("status", element.getStatusElement(), new DeviceUsage.DeviceUsageStatusEnumFactory());
if (element.hasCategory()) {
for (CodeableConcept e : element.getCategory())
composeCodeableConcept("category", e);
@@ -38696,6 +39686,9 @@ public class XmlParser extends XmlParserBase {
for (DiagnosticReport.DiagnosticReportMediaComponent e : element.getMedia())
composeDiagnosticReportMediaComponent("media", e);
}
+ if (element.hasComposition()) {
+ composeReference("composition", element.getComposition());
+ }
if (element.hasConclusionElement()) {
composeString("conclusion", element.getConclusionElement());
}
@@ -39313,7 +40306,7 @@ public class XmlParser extends XmlParserBase {
composeReference("request", element.getRequest());
}
if (element.hasOutcomeElement())
- composeEnumeration("outcome", element.getOutcomeElement(), new Enumerations.ClaimProcessingCodesEnumFactory());
+ composeEnumeration("outcome", element.getOutcomeElement(), new EnrollmentResponse.EnrollmentOutcomeEnumFactory());
if (element.hasDispositionElement()) {
composeString("disposition", element.getDispositionElement());
}
@@ -39558,7 +40551,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasTitleElement()) {
composeString("title", element.getTitleElement());
}
- if (element.hasStatusElement())
+ if (element.hasCiteAs()) {
+ composeType("citeAs", element.getCiteAs());
+ } if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory());
if (element.hasDateElement()) {
composeDateTime("date", element.getDateElement());
@@ -39682,46 +40677,22 @@ public class XmlParser extends XmlParserBase {
if (element.hasDescriptionElement()) {
composeString("description", element.getDescriptionElement());
}
- if (element.hasNote()) {
+ if (element.hasNote()) {
for (Annotation e : element.getNote())
composeAnnotation("note", e);
}
- if (element.hasRating()) {
- for (CodeableConcept e : element.getRating())
- composeCodeableConcept("rating", e);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
}
- if (element.hasCertaintySubcomponent()) {
- for (Evidence.EvidenceCertaintyCertaintySubcomponentComponent e : element.getCertaintySubcomponent())
- composeEvidenceCertaintyCertaintySubcomponentComponent("certaintySubcomponent", e);
+ if (element.hasRating()) {
+ composeCodeableConcept("rating", element.getRating());
}
- }
-
- protected void composeEvidenceCertaintyCertaintySubcomponentComponent(String name, Evidence.EvidenceCertaintyCertaintySubcomponentComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeEvidenceCertaintyCertaintySubcomponentComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
+ if (element.hasRaterElement()) {
+ composeString("rater", element.getRaterElement());
}
- }
-
- protected void composeEvidenceCertaintyCertaintySubcomponentComponentElements(Evidence.EvidenceCertaintyCertaintySubcomponentComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasDescriptionElement()) {
- composeString("description", element.getDescriptionElement());
- }
- if (element.hasNote()) {
- for (Annotation e : element.getNote())
- composeAnnotation("note", e);
- }
- if (element.hasType()) {
- for (CodeableConcept e : element.getType())
- composeCodeableConcept("type", e);
- }
- if (element.hasRating()) {
- for (CodeableConcept e : element.getRating())
- composeCodeableConcept("rating", e);
+ if (element.hasSubcomponent()) {
+ for (Evidence.EvidenceCertaintyComponent e : element.getSubcomponent())
+ composeEvidenceCertaintyComponent("subcomponent", e);
}
}
@@ -39755,9 +40726,8 @@ public class XmlParser extends XmlParserBase {
composeIdentifier("relatedIdentifier", e);
}
if (element.hasCiteAs()) {
- composeReference("citeAs", element.getCiteAs());
- }
- if (element.hasType()) {
+ composeType("citeAs", element.getCiteAs());
+ } if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
if (element.hasNote()) {
@@ -39910,6 +40880,10 @@ public class XmlParser extends XmlParserBase {
for (Reference e : element.getEntryReference())
composeReference("entryReference", e);
}
+ if (element.hasEntryQuantity()) {
+ for (Quantity e : element.getEntryQuantity())
+ composeQuantity("entryQuantity", e);
+ }
if (element.hasEmptyReason()) {
composeCodeableConcept("emptyReason", element.getEmptyReason());
}
@@ -41506,8 +42480,8 @@ public class XmlParser extends XmlParserBase {
if (element.hasStatusReasonElement()) {
composeString("statusReason", element.getStatusReasonElement());
}
- if (element.hasExpressedBy()) {
- composeReference("expressedBy", element.getExpressedBy());
+ if (element.hasSource()) {
+ composeReference("source", element.getSource());
}
if (element.hasAddresses()) {
for (Reference e : element.getAddresses())
@@ -42964,6 +43938,9 @@ public class XmlParser extends XmlParserBase {
for (CodeableConcept e : element.getFunction())
composeCodeableConcept("function", e);
}
+ if (element.hasGroup()) {
+ composeCodeableConcept("group", element.getGroup());
+ }
if (element.hasDescriptionElement()) {
composeMarkdown("description", element.getDescriptionElement());
}
@@ -42996,8 +43973,9 @@ public class XmlParser extends XmlParserBase {
protected void composeIngredientSubstanceComponentElements(Ingredient.IngredientSubstanceComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasCode()) {
- composeType("code", element.getCode());
- } if (element.hasStrength()) {
+ composeCodeableReference("code", element.getCode());
+ }
+ if (element.hasStrength()) {
for (Ingredient.IngredientSubstanceStrengthComponent e : element.getStrength())
composeIngredientSubstanceStrengthComponent("strength", e);
}
@@ -43016,23 +43994,22 @@ public class XmlParser extends XmlParserBase {
protected void composeIngredientSubstanceStrengthComponentElements(Ingredient.IngredientSubstanceStrengthComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasPresentation()) {
- composeRatio("presentation", element.getPresentation());
- }
- if (element.hasPresentationHighLimit()) {
- composeRatio("presentationHighLimit", element.getPresentationHighLimit());
- }
- if (element.hasPresentationTextElement()) {
+ composeType("presentation", element.getPresentation());
+ } if (element.hasPresentationHighLimit()) {
+ composeType("presentationHighLimit", element.getPresentationHighLimit());
+ } if (element.hasPresentationTextElement()) {
composeString("presentationText", element.getPresentationTextElement());
}
if (element.hasConcentration()) {
- composeRatio("concentration", element.getConcentration());
- }
- if (element.hasConcentrationHighLimit()) {
- composeRatio("concentrationHighLimit", element.getConcentrationHighLimit());
- }
- if (element.hasConcentrationTextElement()) {
+ composeType("concentration", element.getConcentration());
+ } if (element.hasConcentrationHighLimit()) {
+ composeType("concentrationHighLimit", element.getConcentrationHighLimit());
+ } if (element.hasConcentrationTextElement()) {
composeString("concentrationText", element.getConcentrationTextElement());
}
+ if (element.hasBasis()) {
+ composeCodeableConcept("basis", element.getBasis());
+ }
if (element.hasMeasurementPointElement()) {
composeString("measurementPoint", element.getMeasurementPointElement());
}
@@ -43059,14 +44036,13 @@ public class XmlParser extends XmlParserBase {
protected void composeIngredientSubstanceStrengthReferenceStrengthComponentElements(Ingredient.IngredientSubstanceStrengthReferenceStrengthComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasSubstance()) {
- composeType("substance", element.getSubstance());
- } if (element.hasStrength()) {
- composeRatio("strength", element.getStrength());
+ composeCodeableReference("substance", element.getSubstance());
}
- if (element.hasStrengthHighLimit()) {
- composeRatio("strengthHighLimit", element.getStrengthHighLimit());
- }
- if (element.hasMeasurementPointElement()) {
+ if (element.hasStrength()) {
+ composeType("strength", element.getStrength());
+ } if (element.hasStrengthHighLimit()) {
+ composeType("strengthHighLimit", element.getStrengthHighLimit());
+ } if (element.hasMeasurementPointElement()) {
composeString("measurementPoint", element.getMeasurementPointElement());
}
if (element.hasCountry()) {
@@ -43088,8 +44064,9 @@ public class XmlParser extends XmlParserBase {
protected void composeIngredientSpecifiedSubstanceComponentElements(Ingredient.IngredientSpecifiedSubstanceComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasCode()) {
- composeType("code", element.getCode());
- } if (element.hasGroup()) {
+ composeCodeableReference("code", element.getCode());
+ }
+ if (element.hasGroup()) {
composeCodeableConcept("group", element.getGroup());
}
if (element.hasConfidentiality()) {
@@ -43393,6 +44370,112 @@ public class XmlParser extends XmlParserBase {
}
}
+ protected void composeInventoryReport(String name, InventoryReport element) throws IOException {
+ if (element != null) {
+ composeResourceAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeInventoryReportElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeInventoryReportElements(InventoryReport element) throws IOException {
+ composeDomainResourceElements(element);
+ if (element.hasIdentifier()) {
+ for (Identifier e : element.getIdentifier())
+ composeIdentifier("identifier", e);
+ }
+ if (element.hasStatusElement())
+ composeEnumeration("status", element.getStatusElement(), new InventoryReport.InventoryReportStatusEnumFactory());
+ if (element.hasCountTypeElement())
+ composeEnumeration("countType", element.getCountTypeElement(), new InventoryReport.InventoryCountTypeEnumFactory());
+ if (element.hasOperationType()) {
+ composeCodeableConcept("operationType", element.getOperationType());
+ }
+ if (element.hasOperationTypeReason()) {
+ composeCodeableConcept("operationTypeReason", element.getOperationTypeReason());
+ }
+ if (element.hasReportedDateTimeElement()) {
+ composeDateTime("reportedDateTime", element.getReportedDateTimeElement());
+ }
+ if (element.hasReporter()) {
+ composeReference("reporter", element.getReporter());
+ }
+ if (element.hasReportingPeriod()) {
+ composePeriod("reportingPeriod", element.getReportingPeriod());
+ }
+ if (element.hasInventoryListing()) {
+ for (InventoryReport.InventoryReportInventoryListingComponent e : element.getInventoryListing())
+ composeInventoryReportInventoryListingComponent("inventoryListing", e);
+ }
+ if (element.hasNote()) {
+ composeAnnotation("note", element.getNote());
+ }
+ }
+
+ protected void composeInventoryReportInventoryListingComponent(String name, InventoryReport.InventoryReportInventoryListingComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeInventoryReportInventoryListingComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeInventoryReportInventoryListingComponentElements(InventoryReport.InventoryReportInventoryListingComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasLocation()) {
+ composeReference("location", element.getLocation());
+ }
+ if (element.hasItemStatus()) {
+ composeCodeableConcept("itemStatus", element.getItemStatus());
+ }
+ if (element.hasCountingDateTimeElement()) {
+ composeDateTime("countingDateTime", element.getCountingDateTimeElement());
+ }
+ if (element.hasItems()) {
+ for (InventoryReport.InventoryReportInventoryListingItemsComponent e : element.getItems())
+ composeInventoryReportInventoryListingItemsComponent("items", e);
+ }
+ }
+
+ protected void composeInventoryReportInventoryListingItemsComponent(String name, InventoryReport.InventoryReportInventoryListingItemsComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeInventoryReportInventoryListingItemsComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeInventoryReportInventoryListingItemsComponentElements(InventoryReport.InventoryReportInventoryListingItemsComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasCategory()) {
+ composeCodeableConcept("category", element.getCategory());
+ }
+ if (element.hasQuantity()) {
+ composeQuantity("quantity", element.getQuantity());
+ }
+ if (element.hasItem()) {
+ composeCodeableReference("item", element.getItem());
+ }
+ if (element.hasLotElement()) {
+ composeString("lot", element.getLotElement());
+ }
+ if (element.hasSerialElement()) {
+ composeString("serial", element.getSerialElement());
+ }
+ if (element.hasExpiryElement()) {
+ composeDateTime("expiry", element.getExpiryElement());
+ }
+ if (element.hasManufacturingDateElement()) {
+ composeDateTime("manufacturingDate", element.getManufacturingDateElement());
+ }
+ }
+
protected void composeInvoice(String name, Invoice element) throws IOException {
if (element != null) {
composeResourceAttributes(element);
@@ -43913,8 +44996,8 @@ public class XmlParser extends XmlParserBase {
composeReference("manufacturer", e);
}
if (element.hasIngredient()) {
- for (Reference e : element.getIngredient())
- composeReference("ingredient", e);
+ for (CodeableReference e : element.getIngredient())
+ composeCodeableReference("ingredient", e);
}
if (element.hasProperty()) {
for (ManufacturedItemDefinition.ManufacturedItemDefinitionPropertyComponent e : element.getProperty())
@@ -43979,7 +45062,9 @@ public class XmlParser extends XmlParserBase {
}
if (element.hasSubject()) {
composeType("subject", element.getSubject());
- } if (element.hasDateElement()) {
+ } if (element.hasBasisElement())
+ composeEnumeration("basis", element.getBasisElement(), new Enumerations.FHIRAllTypesEnumFactory());
+ if (element.hasDateElement()) {
composeDateTime("date", element.getDateElement());
}
if (element.hasPublisherElement()) {
@@ -44052,6 +45137,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasScoring()) {
composeCodeableConcept("scoring", element.getScoring());
}
+ if (element.hasScoringUnit()) {
+ composeCodeableConcept("scoringUnit", element.getScoringUnit());
+ }
if (element.hasCompositeScoring()) {
composeCodeableConcept("compositeScoring", element.getCompositeScoring());
}
@@ -44109,6 +45197,21 @@ public class XmlParser extends XmlParserBase {
if (element.hasDescriptionElement()) {
composeString("description", element.getDescriptionElement());
}
+ if (element.hasType()) {
+ for (CodeableConcept e : element.getType())
+ composeCodeableConcept("type", e);
+ }
+ if (element.hasBasisElement())
+ composeEnumeration("basis", element.getBasisElement(), new Enumerations.FHIRAllTypesEnumFactory());
+ if (element.hasScoring()) {
+ composeCodeableConcept("scoring", element.getScoring());
+ }
+ if (element.hasScoringUnit()) {
+ composeCodeableConcept("scoringUnit", element.getScoringUnit());
+ }
+ if (element.hasImprovementNotation()) {
+ composeCodeableConcept("improvementNotation", element.getImprovementNotation());
+ }
if (element.hasPopulation()) {
for (Measure.MeasureGroupPopulationComponent e : element.getPopulation())
composeMeasureGroupPopulationComponent("population", e);
@@ -44140,6 +45243,12 @@ public class XmlParser extends XmlParserBase {
if (element.hasCriteria()) {
composeExpression("criteria", element.getCriteria());
}
+ if (element.hasInputPopulationIdElement()) {
+ composeString("inputPopulationId", element.getInputPopulationIdElement());
+ }
+ if (element.hasAggregateMethod()) {
+ composeCodeableConcept("aggregateMethod", element.getAggregateMethod());
+ }
}
protected void composeMeasureGroupStratifierComponent(String name, Measure.MeasureGroupStratifierComponent element) throws IOException {
@@ -44239,6 +45348,8 @@ public class XmlParser extends XmlParserBase {
composeEnumeration("status", element.getStatusElement(), new MeasureReport.MeasureReportStatusEnumFactory());
if (element.hasTypeElement())
composeEnumeration("type", element.getTypeElement(), new MeasureReport.MeasureReportTypeEnumFactory());
+ if (element.hasDataUpdateTypeElement())
+ composeEnumeration("dataUpdateType", element.getDataUpdateTypeElement(), new MeasureReport.SubmitDataUpdateTypeEnumFactory());
if (element.hasMeasureElement()) {
composeCanonical("measure", element.getMeasureElement());
}
@@ -44251,9 +45362,15 @@ public class XmlParser extends XmlParserBase {
if (element.hasReporter()) {
composeReference("reporter", element.getReporter());
}
+ if (element.hasReportingVendor()) {
+ composeReference("reportingVendor", element.getReportingVendor());
+ }
if (element.hasPeriod()) {
composePeriod("period", element.getPeriod());
}
+ if (element.hasScoring()) {
+ composeCodeableConcept("scoring", element.getScoring());
+ }
if (element.hasImprovementNotation()) {
composeCodeableConcept("improvementNotation", element.getImprovementNotation());
}
@@ -44287,9 +45404,8 @@ public class XmlParser extends XmlParserBase {
composeMeasureReportGroupPopulationComponent("population", e);
}
if (element.hasMeasureScore()) {
- composeQuantity("measureScore", element.getMeasureScore());
- }
- if (element.hasStratifier()) {
+ composeType("measureScore", element.getMeasureScore());
+ } if (element.hasStratifier()) {
for (MeasureReport.MeasureReportGroupStratifierComponent e : element.getStratifier())
composeMeasureReportGroupStratifierComponent("stratifier", e);
}
@@ -44353,9 +45469,8 @@ public class XmlParser extends XmlParserBase {
protected void composeMeasureReportStratifierGroupComponentElements(MeasureReport.StratifierGroupComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasValue()) {
- composeCodeableConcept("value", element.getValue());
- }
- if (element.hasComponent()) {
+ composeType("value", element.getValue());
+ } if (element.hasComponent()) {
for (MeasureReport.StratifierGroupComponentComponent e : element.getComponent())
composeMeasureReportStratifierGroupComponentComponent("component", e);
}
@@ -44364,9 +45479,8 @@ public class XmlParser extends XmlParserBase {
composeMeasureReportStratifierGroupPopulationComponent("population", e);
}
if (element.hasMeasureScore()) {
- composeQuantity("measureScore", element.getMeasureScore());
- }
- }
+ composeType("measureScore", element.getMeasureScore());
+ } }
protected void composeMeasureReportStratifierGroupComponentComponent(String name, MeasureReport.StratifierGroupComponentComponent element) throws IOException {
if (element != null) {
@@ -44384,9 +45498,8 @@ public class XmlParser extends XmlParserBase {
composeCodeableConcept("code", element.getCode());
}
if (element.hasValue()) {
- composeCodeableConcept("value", element.getValue());
- }
- }
+ composeType("value", element.getValue());
+ } }
protected void composeMeasureReportStratifierGroupPopulationComponent(String name, MeasureReport.StratifierGroupPopulationComponent element) throws IOException {
if (element != null) {
@@ -44432,8 +45545,8 @@ public class XmlParser extends XmlParserBase {
}
if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new Medication.MedicationStatusCodesEnumFactory());
- if (element.hasManufacturer()) {
- composeReference("manufacturer", element.getManufacturer());
+ if (element.hasSponsor()) {
+ composeReference("sponsor", element.getSponsor());
}
if (element.hasDoseForm()) {
composeCodeableConcept("doseForm", element.getDoseForm());
@@ -44805,8 +45918,8 @@ public class XmlParser extends XmlParserBase {
if (element.hasAuthor()) {
composeReference("author", element.getAuthor());
}
- if (element.hasManufacturer()) {
- composeReference("manufacturer", element.getManufacturer());
+ if (element.hasSponsor()) {
+ composeReference("sponsor", element.getSponsor());
}
if (element.hasDoseForm()) {
composeCodeableConcept("doseForm", element.getDoseForm());
@@ -44860,15 +45973,15 @@ public class XmlParser extends XmlParserBase {
for (MedicationKnowledge.MedicationKnowledgeMonitoringProgramComponent e : element.getMonitoringProgram())
composeMedicationKnowledgeMonitoringProgramComponent("monitoringProgram", e);
}
- if (element.hasAdministrationGuideline()) {
- for (MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent e : element.getAdministrationGuideline())
- composeMedicationKnowledgeAdministrationGuidelineComponent("administrationGuideline", e);
+ if (element.hasIndicationGuideline()) {
+ for (MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent e : element.getIndicationGuideline())
+ composeMedicationKnowledgeIndicationGuidelineComponent("indicationGuideline", e);
}
if (element.hasMedicineClassification()) {
for (MedicationKnowledge.MedicationKnowledgeMedicineClassificationComponent e : element.getMedicineClassification())
composeMedicationKnowledgeMedicineClassificationComponent("medicineClassification", e);
}
- if (element.hasPackaging()) {
+ if (element.hasPackaging()) {
for (MedicationKnowledge.MedicationKnowledgePackagingComponent e : element.getPackaging())
composeMedicationKnowledgePackagingComponent("packaging", e);
}
@@ -44946,8 +46059,8 @@ public class XmlParser extends XmlParserBase {
if (element.hasItem()) {
composeCodeableReference("item", element.getItem());
}
- if (element.hasIsActiveElement()) {
- composeBoolean("isActive", element.getIsActiveElement());
+ if (element.hasIsActive()) {
+ composeCodeableConcept("isActive", element.getIsActive());
}
if (element.hasStrength()) {
composeType("strength", element.getStrength());
@@ -44999,42 +46112,67 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeMedicationKnowledgeAdministrationGuidelineComponent(String name, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent element) throws IOException {
+ protected void composeMedicationKnowledgeIndicationGuidelineComponent(String name, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeMedicationKnowledgeAdministrationGuidelineComponentElements(element);
+ composeMedicationKnowledgeIndicationGuidelineComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeMedicationKnowledgeAdministrationGuidelineComponentElements(MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineComponent element) throws IOException {
+ protected void composeMedicationKnowledgeIndicationGuidelineComponentElements(MedicationKnowledge.MedicationKnowledgeIndicationGuidelineComponent element) throws IOException {
composeBackboneElementElements(element);
- if (element.hasDosage()) {
- for (MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent e : element.getDosage())
- composeMedicationKnowledgeAdministrationGuidelineDosageComponent("dosage", e);
+ if (element.hasIndication()) {
+ for (CodeableReference e : element.getIndication())
+ composeCodeableReference("indication", e);
}
- if (element.hasIndication()) {
- composeCodeableReference("indication", element.getIndication());
+ if (element.hasDosingGuideline()) {
+ for (MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent e : element.getDosingGuideline())
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelineComponent("dosingGuideline", e);
+ }
+ }
+
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelineComponent(String name, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelineComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelineComponentElements(MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasTreatmentIntent()) {
+ composeCodeableConcept("treatmentIntent", element.getTreatmentIntent());
+ }
+ if (element.hasDosage()) {
+ for (MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent e : element.getDosage())
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent("dosage", e);
+ }
+ if (element.hasAdministrationTreatment()) {
+ composeCodeableConcept("administrationTreatment", element.getAdministrationTreatment());
}
if (element.hasPatientCharacteristic()) {
- for (MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent e : element.getPatientCharacteristic())
- composeMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent("patientCharacteristic", e);
+ for (MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent e : element.getPatientCharacteristic())
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent("patientCharacteristic", e);
}
}
- protected void composeMedicationKnowledgeAdministrationGuidelineDosageComponent(String name, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent element) throws IOException {
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent(String name, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeMedicationKnowledgeAdministrationGuidelineDosageComponentElements(element);
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeMedicationKnowledgeAdministrationGuidelineDosageComponentElements(MedicationKnowledge.MedicationKnowledgeAdministrationGuidelineDosageComponent element) throws IOException {
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponentElements(MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelineDosageComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
@@ -45045,17 +46183,17 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent(String name, MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent element) throws IOException {
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent(String name, MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponentElements(element);
+ composeMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeMedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponentElements(MedicationKnowledge.MedicationKnowledgeAdministrationGuidelinePatientCharacteristicComponent element) throws IOException {
+ protected void composeMedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponentElements(MedicationKnowledge.MedicationKnowledgeIndicationGuidelineDosingGuidelinePatientCharacteristicComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
@@ -45382,6 +46520,13 @@ public class XmlParser extends XmlParserBase {
if (element.hasDispenser()) {
composeReference("dispenser", element.getDispenser());
}
+ if (element.hasDispenserInstruction()) {
+ for (Annotation e : element.getDispenserInstruction())
+ composeAnnotation("dispenserInstruction", e);
+ }
+ if (element.hasDoseAdministrationAid()) {
+ composeCodeableConcept("doseAdministrationAid", element.getDoseAdministrationAid());
+ }
}
protected void composeMedicationRequestDispenseRequestInitialFillComponent(String name, MedicationRequest.MedicationRequestDispenseRequestInitialFillComponent element) throws IOException {
@@ -45493,8 +46638,8 @@ public class XmlParser extends XmlParserBase {
for (Dosage e : element.getDosage())
composeDosage("dosage", e);
}
- if (element.hasTakenAsOrderedElement()) {
- composeBoolean("takenAsOrdered", element.getTakenAsOrderedElement());
+ if (element.hasAdherence()) {
+ composeCodeableConcept("adherence", element.getAdherence());
}
}
@@ -45563,17 +46708,9 @@ public class XmlParser extends XmlParserBase {
for (MarketingStatus e : element.getMarketingStatus())
composeMarketingStatus("marketingStatus", e);
}
- if (element.hasPharmaceuticalProduct()) {
- for (Reference e : element.getPharmaceuticalProduct())
- composeReference("pharmaceuticalProduct", e);
- }
- if (element.hasPackagedMedicinalProduct()) {
- for (Reference e : element.getPackagedMedicinalProduct())
- composeReference("packagedMedicinalProduct", e);
- }
if (element.hasIngredient()) {
- for (Reference e : element.getIngredient())
- composeReference("ingredient", e);
+ for (CodeableReference e : element.getIngredient())
+ composeCodeableReference("ingredient", e);
}
if (element.hasImpurity()) {
for (Reference e : element.getImpurity())
@@ -45603,9 +46740,17 @@ public class XmlParser extends XmlParserBase {
for (MedicinalProductDefinition.MedicinalProductDefinitionCrossReferenceComponent e : element.getCrossReference())
composeMedicinalProductDefinitionCrossReferenceComponent("crossReference", e);
}
- if (element.hasManufacturingBusinessOperation()) {
- for (MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent e : element.getManufacturingBusinessOperation())
- composeMedicinalProductDefinitionManufacturingBusinessOperationComponent("manufacturingBusinessOperation", e);
+ if (element.hasOperation()) {
+ for (MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent e : element.getOperation())
+ composeMedicinalProductDefinitionOperationComponent("operation", e);
+ }
+ if (element.hasPackage()) {
+ for (MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent e : element.getPackage())
+ composeMedicinalProductDefinitionPackageComponent("package", e);
+ }
+ if (element.hasAdministrableProduct()) {
+ for (MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent e : element.getAdministrableProduct())
+ composeMedicinalProductDefinitionAdministrableProductComponent("administrableProduct", e);
}
}
@@ -45720,17 +46865,17 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeMedicinalProductDefinitionManufacturingBusinessOperationComponent(String name, MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent element) throws IOException {
+ protected void composeMedicinalProductDefinitionOperationComponent(String name, MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeMedicinalProductDefinitionManufacturingBusinessOperationComponentElements(element);
+ composeMedicinalProductDefinitionOperationComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeMedicinalProductDefinitionManufacturingBusinessOperationComponentElements(MedicinalProductDefinition.MedicinalProductDefinitionManufacturingBusinessOperationComponent element) throws IOException {
+ protected void composeMedicinalProductDefinitionOperationComponentElements(MedicinalProductDefinition.MedicinalProductDefinitionOperationComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasType()) {
composeCodeableReference("type", element.getType());
@@ -45738,9 +46883,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasEffectiveDate()) {
composePeriod("effectiveDate", element.getEffectiveDate());
}
- if (element.hasManufacturer()) {
- for (Reference e : element.getManufacturer())
- composeReference("manufacturer", e);
+ if (element.hasOrganization()) {
+ for (Reference e : element.getOrganization())
+ composeReference("organization", e);
}
if (element.hasAuthorization()) {
composeReference("authorization", element.getAuthorization());
@@ -45750,6 +46895,49 @@ public class XmlParser extends XmlParserBase {
}
}
+ protected void composeMedicinalProductDefinitionPackageComponent(String name, MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeMedicinalProductDefinitionPackageComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeMedicinalProductDefinitionPackageComponentElements(MedicinalProductDefinition.MedicinalProductDefinitionPackageComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasSize()) {
+ composeType("size", element.getSize());
+ } if (element.hasPackage()) {
+ composeReference("package", element.getPackage());
+ }
+ }
+
+ protected void composeMedicinalProductDefinitionAdministrableProductComponent(String name, MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeMedicinalProductDefinitionAdministrableProductComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeMedicinalProductDefinitionAdministrableProductComponentElements(MedicinalProductDefinition.MedicinalProductDefinitionAdministrableProductComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasRoute()) {
+ for (CodeableConcept e : element.getRoute())
+ composeCodeableConcept("route", e);
+ }
+ if (element.hasProduct()) {
+ composeReference("product", element.getProduct());
+ }
+ }
+
protected void composeMessageDefinition(String name, MessageDefinition element) throws IOException {
if (element != null) {
composeResourceAttributes(element);
@@ -46371,6 +47559,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasNameElement()) {
composeString("name", element.getNameElement());
}
+ if (element.hasTitleElement()) {
+ composeString("title", element.getTitleElement());
+ }
if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory());
if (element.hasKindElement())
@@ -46437,6 +47628,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasPeriod()) {
composePeriod("period", element.getPeriod());
}
+ if (element.hasAuthoritativeElement()) {
+ composeBoolean("authoritative", element.getAuthoritativeElement());
+ }
}
protected void composeNutritionIntake(String name, NutritionIntake element) throws IOException {
@@ -46997,7 +48191,9 @@ public class XmlParser extends XmlParserBase {
for (Identifier e : element.getIdentifier())
composeIdentifier("identifier", e);
}
- if (element.hasBasedOn()) {
+ if (element.hasInstantiates()) {
+ composeType("instantiates", element.getInstantiates());
+ } if (element.hasBasedOn()) {
for (Reference e : element.getBasedOn())
composeReference("basedOn", e);
}
@@ -47160,25 +48356,18 @@ public class XmlParser extends XmlParserBase {
if (element.hasVersionElement()) {
composeString("version", element.getVersionElement());
}
+ if (element.hasNameElement()) {
+ composeString("name", element.getNameElement());
+ }
if (element.hasTitleElement()) {
composeString("title", element.getTitleElement());
}
- if (element.hasDerivedFromCanonical()) {
- for (CanonicalType e : element.getDerivedFromCanonical())
- composeCanonical("derivedFromCanonical", e);
- }
- if (element.hasDerivedFromUri()) {
- for (UriType e : element.getDerivedFromUri())
- composeUri("derivedFromUri", e);
- }
if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory());
if (element.hasExperimentalElement()) {
composeBoolean("experimental", element.getExperimentalElement());
}
- if (element.hasSubject()) {
- composeType("subject", element.getSubject());
- } if (element.hasDateElement()) {
+ if (element.hasDateElement()) {
composeDateTime("date", element.getDateElement());
}
if (element.hasPublisher()) {
@@ -47214,6 +48403,17 @@ public class XmlParser extends XmlParserBase {
if (element.hasEffectivePeriod()) {
composePeriod("effectivePeriod", element.getEffectivePeriod());
}
+ if (element.hasDerivedFromCanonical()) {
+ for (CanonicalType e : element.getDerivedFromCanonical())
+ composeCanonical("derivedFromCanonical", e);
+ }
+ if (element.hasDerivedFromUri()) {
+ for (UriType e : element.getDerivedFromUri())
+ composeUri("derivedFromUri", e);
+ }
+ if (element.hasSubject()) {
+ composeCodeableConcept("subject", element.getSubject());
+ }
if (element.hasPerformerType()) {
composeCodeableConcept("performerType", element.getPerformerType());
}
@@ -47236,11 +48436,13 @@ public class XmlParser extends XmlParserBase {
if (element.hasMethod()) {
composeCodeableConcept("method", element.getMethod());
}
- if (element.hasSpecimen()) {
- composeReference("specimen", element.getSpecimen());
+ if (element.hasSpecimen()) {
+ for (Reference e : element.getSpecimen())
+ composeReference("specimen", e);
}
- if (element.hasDevice()) {
- composeReference("device", element.getDevice());
+ if (element.hasDevice()) {
+ for (Reference e : element.getDevice())
+ composeReference("device", e);
}
if (element.hasPreferredReportNameElement()) {
composeString("preferredReportName", element.getPreferredReportNameElement());
@@ -47248,21 +48450,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasQuantitativeDetails()) {
composeObservationDefinitionQuantitativeDetailsComponent("quantitativeDetails", element.getQuantitativeDetails());
}
- if (element.hasQualifiedInterval()) {
- for (ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent e : element.getQualifiedInterval())
- composeObservationDefinitionQualifiedIntervalComponent("qualifiedInterval", e);
- }
- if (element.hasValidCodedValueSet()) {
- composeReference("validCodedValueSet", element.getValidCodedValueSet());
- }
- if (element.hasNormalCodedValueSet()) {
- composeReference("normalCodedValueSet", element.getNormalCodedValueSet());
- }
- if (element.hasAbnormalCodedValueSet()) {
- composeReference("abnormalCodedValueSet", element.getAbnormalCodedValueSet());
- }
- if (element.hasCriticalCodedValueSet()) {
- composeReference("criticalCodedValueSet", element.getCriticalCodedValueSet());
+ if (element.hasQualifiedValue()) {
+ for (ObservationDefinition.ObservationDefinitionQualifiedValueComponent e : element.getQualifiedValue())
+ composeObservationDefinitionQualifiedValueComponent("qualifiedValue", e);
}
if (element.hasHasMember()) {
for (Reference e : element.getHasMember())
@@ -47286,12 +48476,12 @@ public class XmlParser extends XmlParserBase {
protected void composeObservationDefinitionQuantitativeDetailsComponentElements(ObservationDefinition.ObservationDefinitionQuantitativeDetailsComponent element) throws IOException {
composeBackboneElementElements(element);
- if (element.hasCustomaryUnit()) {
- composeCodeableConcept("customaryUnit", element.getCustomaryUnit());
- }
if (element.hasUnit()) {
composeCodeableConcept("unit", element.getUnit());
}
+ if (element.hasCustomaryUnit()) {
+ composeCodeableConcept("customaryUnit", element.getCustomaryUnit());
+ }
if (element.hasConversionFactorElement()) {
composeDecimal("conversionFactor", element.getConversionFactorElement());
}
@@ -47300,23 +48490,18 @@ public class XmlParser extends XmlParserBase {
}
}
- protected void composeObservationDefinitionQualifiedIntervalComponent(String name, ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent element) throws IOException {
+ protected void composeObservationDefinitionQualifiedValueComponent(String name, ObservationDefinition.ObservationDefinitionQualifiedValueComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeObservationDefinitionQualifiedIntervalComponentElements(element);
+ composeObservationDefinitionQualifiedValueComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeObservationDefinitionQualifiedIntervalComponentElements(ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent element) throws IOException {
+ protected void composeObservationDefinitionQualifiedValueComponentElements(ObservationDefinition.ObservationDefinitionQualifiedValueComponent element) throws IOException {
composeBackboneElementElements(element);
- if (element.hasCategoryElement())
- composeEnumeration("category", element.getCategoryElement(), new ObservationDefinition.ObservationRangeCategoryEnumFactory());
- if (element.hasRange()) {
- composeRange("range", element.getRange());
- }
if (element.hasContext()) {
composeCodeableConcept("context", element.getContext());
}
@@ -47335,6 +48520,23 @@ public class XmlParser extends XmlParserBase {
if (element.hasConditionElement()) {
composeString("condition", element.getConditionElement());
}
+ if (element.hasRangeCategoryElement())
+ composeEnumeration("rangeCategory", element.getRangeCategoryElement(), new ObservationDefinition.ObservationRangeCategoryEnumFactory());
+ if (element.hasRange()) {
+ composeRange("range", element.getRange());
+ }
+ if (element.hasValidCodedValueSetElement()) {
+ composeCanonical("validCodedValueSet", element.getValidCodedValueSetElement());
+ }
+ if (element.hasNormalCodedValueSetElement()) {
+ composeCanonical("normalCodedValueSet", element.getNormalCodedValueSetElement());
+ }
+ if (element.hasAbnormalCodedValueSetElement()) {
+ composeCanonical("abnormalCodedValueSet", element.getAbnormalCodedValueSetElement());
+ }
+ if (element.hasCriticalCodedValueSetElement()) {
+ composeCanonical("criticalCodedValueSet", element.getCriticalCodedValueSetElement());
+ }
}
protected void composeObservationDefinitionComponentComponent(String name, ObservationDefinition.ObservationDefinitionComponentComponent element) throws IOException {
@@ -47358,9 +48560,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasQuantitativeDetails()) {
composeObservationDefinitionQuantitativeDetailsComponent("quantitativeDetails", element.getQuantitativeDetails());
}
- if (element.hasQualifiedInterval()) {
- for (ObservationDefinition.ObservationDefinitionQualifiedIntervalComponent e : element.getQualifiedInterval())
- composeObservationDefinitionQualifiedIntervalComponent("qualifiedInterval", e);
+ if (element.hasQualifiedValue()) {
+ for (ObservationDefinition.ObservationDefinitionQualifiedValueComponent e : element.getQualifiedValue())
+ composeObservationDefinitionQualifiedValueComponent("qualifiedValue", e);
}
}
@@ -47785,6 +48987,10 @@ public class XmlParser extends XmlParserBase {
if (element.hasStatusDateElement()) {
composeDateTime("statusDate", element.getStatusDateElement());
}
+ if (element.hasContainedItemQuantity()) {
+ for (Quantity e : element.getContainedItemQuantity())
+ composeQuantity("containedItemQuantity", e);
+ }
if (element.hasDescriptionElement()) {
composeMarkdown("description", element.getDescriptionElement());
}
@@ -47809,33 +49015,12 @@ public class XmlParser extends XmlParserBase {
for (Reference e : element.getManufacturer())
composeReference("manufacturer", e);
}
- if (element.hasBatchIdentifier()) {
- for (PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent e : element.getBatchIdentifier())
- composePackagedProductDefinitionBatchIdentifierComponent("batchIdentifier", e);
+ if (element.hasAttachedDocument()) {
+ for (Reference e : element.getAttachedDocument())
+ composeReference("attachedDocument", e);
}
- if (element.hasPackage()) {
- for (PackagedProductDefinition.PackagedProductDefinitionPackageComponent e : element.getPackage())
- composePackagedProductDefinitionPackageComponent("package", e);
- }
- }
-
- protected void composePackagedProductDefinitionBatchIdentifierComponent(String name, PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composePackagedProductDefinitionBatchIdentifierComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composePackagedProductDefinitionBatchIdentifierComponentElements(PackagedProductDefinition.PackagedProductDefinitionBatchIdentifierComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasOuterPackaging()) {
- composeIdentifier("outerPackaging", element.getOuterPackaging());
- }
- if (element.hasImmediatePackaging()) {
- composeIdentifier("immediatePackaging", element.getImmediatePackaging());
+ if (element.hasPackage()) {
+ composePackagedProductDefinitionPackageComponent("package", element.getPackage());
}
}
@@ -47923,8 +49108,8 @@ public class XmlParser extends XmlParserBase {
protected void composePackagedProductDefinitionPackageContainedItemComponentElements(PackagedProductDefinition.PackagedProductDefinitionPackageContainedItemComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasItem()) {
- for (Reference e : element.getItem())
- composeReference("item", e);
+ for (CodeableReference e : element.getItem())
+ composeCodeableReference("item", e);
}
if (element.hasAmount()) {
composeType("amount", element.getAmount());
@@ -48203,7 +49388,7 @@ public class XmlParser extends XmlParserBase {
composeReference("requestor", element.getRequestor());
}
if (element.hasOutcomeElement())
- composeEnumeration("outcome", element.getOutcomeElement(), new Enumerations.ClaimProcessingCodesEnumFactory());
+ composeEnumeration("outcome", element.getOutcomeElement(), new PaymentReconciliation.PaymentOutcomeEnumFactory());
if (element.hasDispositionElement()) {
composeString("disposition", element.getDispositionElement());
}
@@ -48567,6 +49752,10 @@ public class XmlParser extends XmlParserBase {
for (PlanDefinition.PlanDefinitionGoalComponent e : element.getGoal())
composePlanDefinitionGoalComponent("goal", e);
}
+ if (element.hasActor()) {
+ for (PlanDefinition.PlanDefinitionActorComponent e : element.getActor())
+ composePlanDefinitionActorComponent("actor", e);
+ }
if (element.hasAction()) {
for (PlanDefinition.PlanDefinitionActionComponent e : element.getAction())
composePlanDefinitionActionComponent("action", e);
@@ -48633,6 +49822,52 @@ public class XmlParser extends XmlParserBase {
}
}
+ protected void composePlanDefinitionActorComponent(String name, PlanDefinition.PlanDefinitionActorComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composePlanDefinitionActorComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composePlanDefinitionActorComponentElements(PlanDefinition.PlanDefinitionActorComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasTitleElement()) {
+ composeString("title", element.getTitleElement());
+ }
+ if (element.hasDescriptionElement()) {
+ composeMarkdown("description", element.getDescriptionElement());
+ }
+ if (element.hasOption()) {
+ for (PlanDefinition.PlanDefinitionActorOptionComponent e : element.getOption())
+ composePlanDefinitionActorOptionComponent("option", e);
+ }
+ }
+
+ protected void composePlanDefinitionActorOptionComponent(String name, PlanDefinition.PlanDefinitionActorOptionComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composePlanDefinitionActorOptionComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composePlanDefinitionActorOptionComponentElements(PlanDefinition.PlanDefinitionActorOptionComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasTypeElement())
+ composeEnumeration("type", element.getTypeElement(), new Enumerations.ActionParticipantTypeEnumFactory());
+ if (element.hasTypeReference()) {
+ composeReference("typeReference", element.getTypeReference());
+ }
+ if (element.hasRole()) {
+ composeCodeableConcept("role", element.getRole());
+ }
+ }
+
protected void composePlanDefinitionActionComponent(String name, PlanDefinition.PlanDefinitionActionComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
@@ -48659,9 +49894,8 @@ public class XmlParser extends XmlParserBase {
}
if (element.hasPriorityElement())
composeEnumeration("priority", element.getPriorityElement(), new Enumerations.RequestPriorityEnumFactory());
- if (element.hasCode()) {
- for (CodeableConcept e : element.getCode())
- composeCodeableConcept("code", e);
+ if (element.hasCode()) {
+ composeCodeableConcept("code", element.getCode());
}
if (element.hasReason()) {
for (CodeableConcept e : element.getReason())
@@ -48686,12 +49920,12 @@ public class XmlParser extends XmlParserBase {
composePlanDefinitionActionConditionComponent("condition", e);
}
if (element.hasInput()) {
- for (DataRequirement e : element.getInput())
- composeDataRequirement("input", e);
+ for (PlanDefinition.PlanDefinitionActionInputComponent e : element.getInput())
+ composePlanDefinitionActionInputComponent("input", e);
}
if (element.hasOutput()) {
- for (DataRequirement e : element.getOutput())
- composeDataRequirement("output", e);
+ for (PlanDefinition.PlanDefinitionActionOutputComponent e : element.getOutput())
+ composePlanDefinitionActionOutputComponent("output", e);
}
if (element.hasRelatedAction()) {
for (PlanDefinition.PlanDefinitionActionRelatedActionComponent e : element.getRelatedAction())
@@ -48699,7 +49933,10 @@ public class XmlParser extends XmlParserBase {
}
if (element.hasTiming()) {
composeType("timing", element.getTiming());
- } if (element.hasParticipant()) {
+ } if (element.hasLocation()) {
+ composeCodeableReference("location", element.getLocation());
+ }
+ if (element.hasParticipant()) {
for (PlanDefinition.PlanDefinitionActionParticipantComponent e : element.getParticipant())
composePlanDefinitionActionParticipantComponent("participant", e);
}
@@ -48750,6 +49987,52 @@ public class XmlParser extends XmlParserBase {
}
}
+ protected void composePlanDefinitionActionInputComponent(String name, PlanDefinition.PlanDefinitionActionInputComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composePlanDefinitionActionInputComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composePlanDefinitionActionInputComponentElements(PlanDefinition.PlanDefinitionActionInputComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasTitleElement()) {
+ composeString("title", element.getTitleElement());
+ }
+ if (element.hasRequirement()) {
+ composeDataRequirement("requirement", element.getRequirement());
+ }
+ if (element.hasRelatedDataElement()) {
+ composeId("relatedData", element.getRelatedDataElement());
+ }
+ }
+
+ protected void composePlanDefinitionActionOutputComponent(String name, PlanDefinition.PlanDefinitionActionOutputComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composePlanDefinitionActionOutputComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composePlanDefinitionActionOutputComponentElements(PlanDefinition.PlanDefinitionActionOutputComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasTitleElement()) {
+ composeString("title", element.getTitleElement());
+ }
+ if (element.hasRequirement()) {
+ composeDataRequirement("requirement", element.getRequirement());
+ }
+ if (element.hasRelatedDataElement()) {
+ composeString("relatedData", element.getRelatedDataElement());
+ }
+ }
+
protected void composePlanDefinitionActionRelatedActionComponent(String name, PlanDefinition.PlanDefinitionActionRelatedActionComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
@@ -48762,8 +50045,8 @@ public class XmlParser extends XmlParserBase {
protected void composePlanDefinitionActionRelatedActionComponentElements(PlanDefinition.PlanDefinitionActionRelatedActionComponent element) throws IOException {
composeBackboneElementElements(element);
- if (element.hasActionIdElement()) {
- composeId("actionId", element.getActionIdElement());
+ if (element.hasTargetIdElement()) {
+ composeId("targetId", element.getTargetIdElement());
}
if (element.hasRelationshipElement())
composeEnumeration("relationship", element.getRelationshipElement(), new Enumerations.ActionRelationshipTypeEnumFactory());
@@ -48783,11 +50066,20 @@ public class XmlParser extends XmlParserBase {
protected void composePlanDefinitionActionParticipantComponentElements(PlanDefinition.PlanDefinitionActionParticipantComponent element) throws IOException {
composeBackboneElementElements(element);
+ if (element.hasActorIdElement()) {
+ composeString("actorId", element.getActorIdElement());
+ }
if (element.hasTypeElement())
composeEnumeration("type", element.getTypeElement(), new Enumerations.ActionParticipantTypeEnumFactory());
+ if (element.hasTypeReference()) {
+ composeReference("typeReference", element.getTypeReference());
+ }
if (element.hasRole()) {
composeCodeableConcept("role", element.getRole());
}
+ if (element.hasFunction()) {
+ composeCodeableConcept("function", element.getFunction());
+ }
}
protected void composePlanDefinitionActionDynamicValueComponent(String name, PlanDefinition.PlanDefinitionActionDynamicValueComponent element) throws IOException {
@@ -49104,6 +50396,10 @@ public class XmlParser extends XmlParserBase {
for (CodeableReference e : element.getUsed())
composeCodeableReference("used", e);
}
+ if (element.hasSupportingInfo()) {
+ for (Reference e : element.getSupportingInfo())
+ composeReference("supportingInfo", e);
+ }
}
protected void composeProcedurePerformerComponent(String name, Procedure.ProcedurePerformerComponent element) throws IOException {
@@ -49184,6 +50480,13 @@ public class XmlParser extends XmlParserBase {
if (element.hasActivity()) {
composeCodeableConcept("activity", element.getActivity());
}
+ if (element.hasBasedOn()) {
+ for (Reference e : element.getBasedOn())
+ composeReference("basedOn", e);
+ }
+ if (element.hasEncounter()) {
+ composeReference("encounter", element.getEncounter());
+ }
if (element.hasAgent()) {
for (Provenance.ProvenanceAgentComponent e : element.getAgent())
composeProvenanceAgentComponent("agent", e);
@@ -49361,7 +50664,7 @@ public class XmlParser extends XmlParserBase {
composeString("prefix", element.getPrefixElement());
}
if (element.hasTextElement()) {
- composeString("text", element.getTextElement());
+ composeMarkdown("text", element.getTextElement());
}
if (element.hasTypeElement())
composeEnumeration("type", element.getTypeElement(), new Questionnaire.QuestionnaireItemTypeEnumFactory());
@@ -49371,6 +50674,8 @@ public class XmlParser extends XmlParserBase {
}
if (element.hasEnableBehaviorElement())
composeEnumeration("enableBehavior", element.getEnableBehaviorElement(), new Questionnaire.EnableWhenBehaviorEnumFactory());
+ if (element.hasDisabledDisplayElement())
+ composeEnumeration("disabledDisplay", element.getDisabledDisplayElement(), new Questionnaire.QuestionnaireItemDisabledDisplayEnumFactory());
if (element.hasRequiredElement()) {
composeBoolean("required", element.getRequiredElement());
}
@@ -49383,6 +50688,8 @@ public class XmlParser extends XmlParserBase {
if (element.hasMaxLengthElement()) {
composeInteger("maxLength", element.getMaxLengthElement());
}
+ if (element.hasAnswerConstraintElement())
+ composeEnumeration("answerConstraint", element.getAnswerConstraintElement(), new Questionnaire.QuestionnaireAnswerConstraintEnumFactory());
if (element.hasAnswerValueSetElement()) {
composeCanonical("answerValueSet", element.getAnswerValueSetElement());
}
@@ -49595,8 +50902,9 @@ public class XmlParser extends XmlParserBase {
composePeriod("validityPeriod", element.getValidityPeriod());
}
if (element.hasIndication()) {
- composeType("indication", element.getIndication());
- } if (element.hasIntendedUse()) {
+ composeCodeableReference("indication", element.getIndication());
+ }
+ if (element.hasIntendedUse()) {
composeCodeableConcept("intendedUse", element.getIntendedUse());
}
if (element.hasBasis()) {
@@ -49617,6 +50925,10 @@ public class XmlParser extends XmlParserBase {
if (element.hasRegulator()) {
composeReference("regulator", element.getRegulator());
}
+ if (element.hasAttachedDocument()) {
+ for (Reference e : element.getAttachedDocument())
+ composeReference("attachedDocument", e);
+ }
if (element.hasCase()) {
composeRegulatedAuthorizationCaseComponent("case", element.getCase());
}
@@ -49860,9 +51172,12 @@ public class XmlParser extends XmlParserBase {
}
if (element.hasTiming()) {
composeType("timing", element.getTiming());
- } if (element.hasParticipant()) {
- for (Reference e : element.getParticipant())
- composeReference("participant", e);
+ } if (element.hasLocation()) {
+ composeCodeableReference("location", element.getLocation());
+ }
+ if (element.hasParticipant()) {
+ for (RequestGroup.RequestGroupActionParticipantComponent e : element.getParticipant())
+ composeRequestGroupActionParticipantComponent("participant", e);
}
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
@@ -49917,8 +51232,8 @@ public class XmlParser extends XmlParserBase {
protected void composeRequestGroupActionRelatedActionComponentElements(RequestGroup.RequestGroupActionRelatedActionComponent element) throws IOException {
composeBackboneElementElements(element);
- if (element.hasActionIdElement()) {
- composeId("actionId", element.getActionIdElement());
+ if (element.hasTargetIdElement()) {
+ composeId("targetId", element.getTargetIdElement());
}
if (element.hasRelationshipElement())
composeEnumeration("relationship", element.getRelationshipElement(), new Enumerations.ActionRelationshipTypeEnumFactory());
@@ -49926,6 +51241,34 @@ public class XmlParser extends XmlParserBase {
composeType("offset", element.getOffset());
} }
+ protected void composeRequestGroupActionParticipantComponent(String name, RequestGroup.RequestGroupActionParticipantComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeRequestGroupActionParticipantComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeRequestGroupActionParticipantComponentElements(RequestGroup.RequestGroupActionParticipantComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasTypeElement())
+ composeEnumeration("type", element.getTypeElement(), new Enumerations.ActionParticipantTypeEnumFactory());
+ if (element.hasTypeReference()) {
+ composeReference("typeReference", element.getTypeReference());
+ }
+ if (element.hasRole()) {
+ composeCodeableConcept("role", element.getRole());
+ }
+ if (element.hasFunction()) {
+ composeCodeableConcept("function", element.getFunction());
+ }
+ if (element.hasActor()) {
+ composeReference("actor", element.getActor());
+ }
+ }
+
protected void composeResearchStudy(String name, ResearchStudy element) throws IOException {
if (element != null) {
composeResourceAttributes(element);
@@ -49938,13 +51281,26 @@ public class XmlParser extends XmlParserBase {
protected void composeResearchStudyElements(ResearchStudy element) throws IOException {
composeDomainResourceElements(element);
+ if (element.hasUrlElement()) {
+ composeUri("url", element.getUrlElement());
+ }
if (element.hasIdentifier()) {
for (Identifier e : element.getIdentifier())
composeIdentifier("identifier", e);
}
+ if (element.hasVersionElement()) {
+ composeString("version", element.getVersionElement());
+ }
+ if (element.hasNameElement()) {
+ composeString("name", element.getNameElement());
+ }
if (element.hasTitleElement()) {
composeString("title", element.getTitleElement());
}
+ if (element.hasLabel()) {
+ for (ResearchStudy.ResearchStudyLabelComponent e : element.getLabel())
+ composeResearchStudyLabelComponent("label", e);
+ }
if (element.hasProtocol()) {
for (Reference e : element.getProtocol())
composeReference("protocol", e);
@@ -49953,8 +51309,15 @@ public class XmlParser extends XmlParserBase {
for (Reference e : element.getPartOf())
composeReference("partOf", e);
}
+ if (element.hasRelatedArtifact()) {
+ for (RelatedArtifact e : element.getRelatedArtifact())
+ composeRelatedArtifact("relatedArtifact", e);
+ }
+ if (element.hasDateElement()) {
+ composeDateTime("date", element.getDateElement());
+ }
if (element.hasStatusElement())
- composeEnumeration("status", element.getStatusElement(), new ResearchStudy.ResearchStudyStatusEnumFactory());
+ composeEnumeration("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory());
if (element.hasPrimaryPurposeType()) {
composeCodeableConcept("primaryPurposeType", element.getPrimaryPurposeType());
}
@@ -49966,21 +51329,13 @@ public class XmlParser extends XmlParserBase {
composeCodeableConcept("category", e);
}
if (element.hasFocus()) {
- for (CodeableConcept e : element.getFocus())
- composeCodeableConcept("focus", e);
+ for (ResearchStudy.ResearchStudyFocusComponent e : element.getFocus())
+ composeResearchStudyFocusComponent("focus", e);
}
if (element.hasCondition()) {
for (CodeableConcept e : element.getCondition())
composeCodeableConcept("condition", e);
}
- if (element.hasContact()) {
- for (ContactDetail e : element.getContact())
- composeContactDetail("contact", e);
- }
- if (element.hasRelatedArtifact()) {
- for (RelatedArtifact e : element.getRelatedArtifact())
- composeRelatedArtifact("relatedArtifact", e);
- }
if (element.hasKeyword()) {
for (CodeableConcept e : element.getKeyword())
composeCodeableConcept("keyword", e);
@@ -49989,16 +51344,19 @@ public class XmlParser extends XmlParserBase {
for (CodeableConcept e : element.getLocation())
composeCodeableConcept("location", e);
}
+ if (element.hasDescriptionSummaryElement()) {
+ composeMarkdown("descriptionSummary", element.getDescriptionSummaryElement());
+ }
if (element.hasDescriptionElement()) {
composeMarkdown("description", element.getDescriptionElement());
}
- if (element.hasEnrollment()) {
- for (Reference e : element.getEnrollment())
- composeReference("enrollment", e);
- }
if (element.hasPeriod()) {
composePeriod("period", element.getPeriod());
}
+ if (element.hasContact()) {
+ for (ContactDetail e : element.getContact())
+ composeContactDetail("contact", e);
+ }
if (element.hasSponsor()) {
composeReference("sponsor", element.getSponsor());
}
@@ -50009,43 +51367,224 @@ public class XmlParser extends XmlParserBase {
for (Reference e : element.getSite())
composeReference("site", e);
}
- if (element.hasReasonStopped()) {
- composeCodeableConcept("reasonStopped", element.getReasonStopped());
- }
if (element.hasNote()) {
for (Annotation e : element.getNote())
composeAnnotation("note", e);
}
- if (element.hasArm()) {
- for (ResearchStudy.ResearchStudyArmComponent e : element.getArm())
- composeResearchStudyArmComponent("arm", e);
+ if (element.hasClassification()) {
+ for (ResearchStudy.ResearchStudyClassificationComponent e : element.getClassification())
+ composeResearchStudyClassificationComponent("classification", e);
+ }
+ if (element.hasAssociatedParty()) {
+ for (ResearchStudy.ResearchStudyAssociatedPartyComponent e : element.getAssociatedParty())
+ composeResearchStudyAssociatedPartyComponent("associatedParty", e);
+ }
+ if (element.hasCurrentState()) {
+ for (CodeableConcept e : element.getCurrentState())
+ composeCodeableConcept("currentState", e);
+ }
+ if (element.hasStatusDate()) {
+ for (ResearchStudy.ResearchStudyStatusDateComponent e : element.getStatusDate())
+ composeResearchStudyStatusDateComponent("statusDate", e);
+ }
+ if (element.hasWhyStopped()) {
+ composeCodeableConcept("whyStopped", element.getWhyStopped());
+ }
+ if (element.hasRecruitment()) {
+ composeResearchStudyRecruitmentComponent("recruitment", element.getRecruitment());
+ }
+ if (element.hasComparisonGroup()) {
+ for (ResearchStudy.ResearchStudyComparisonGroupComponent e : element.getComparisonGroup())
+ composeResearchStudyComparisonGroupComponent("comparisonGroup", e);
}
if (element.hasObjective()) {
for (ResearchStudy.ResearchStudyObjectiveComponent e : element.getObjective())
composeResearchStudyObjectiveComponent("objective", e);
}
+ if (element.hasOutcomeMeasure()) {
+ for (ResearchStudy.ResearchStudyOutcomeMeasureComponent e : element.getOutcomeMeasure())
+ composeResearchStudyOutcomeMeasureComponent("outcomeMeasure", e);
+ }
+ if (element.hasResult()) {
+ for (Reference e : element.getResult())
+ composeReference("result", e);
+ }
+ if (element.hasWebLocation()) {
+ for (ResearchStudy.ResearchStudyWebLocationComponent e : element.getWebLocation())
+ composeResearchStudyWebLocationComponent("webLocation", e);
+ }
}
- protected void composeResearchStudyArmComponent(String name, ResearchStudy.ResearchStudyArmComponent element) throws IOException {
+ protected void composeResearchStudyLabelComponent(String name, ResearchStudy.ResearchStudyLabelComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeResearchStudyArmComponentElements(element);
+ composeResearchStudyLabelComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeResearchStudyArmComponentElements(ResearchStudy.ResearchStudyArmComponent element) throws IOException {
+ protected void composeResearchStudyLabelComponentElements(ResearchStudy.ResearchStudyLabelComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasValueElement()) {
+ composeString("value", element.getValueElement());
+ }
+ }
+
+ protected void composeResearchStudyFocusComponent(String name, ResearchStudy.ResearchStudyFocusComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeResearchStudyFocusComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeResearchStudyFocusComponentElements(ResearchStudy.ResearchStudyFocusComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasProductCode()) {
+ composeCodeableConcept("productCode", element.getProductCode());
+ }
+ if (element.hasFocusType()) {
+ for (CodeableConcept e : element.getFocusType())
+ composeCodeableConcept("focusType", e);
+ }
+ if (element.hasFactorElement()) {
+ composeMarkdown("factor", element.getFactorElement());
+ }
+ }
+
+ protected void composeResearchStudyClassificationComponent(String name, ResearchStudy.ResearchStudyClassificationComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeResearchStudyClassificationComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeResearchStudyClassificationComponentElements(ResearchStudy.ResearchStudyClassificationComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasClassifier()) {
+ for (CodeableConcept e : element.getClassifier())
+ composeCodeableConcept("classifier", e);
+ }
+ }
+
+ protected void composeResearchStudyAssociatedPartyComponent(String name, ResearchStudy.ResearchStudyAssociatedPartyComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeResearchStudyAssociatedPartyComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeResearchStudyAssociatedPartyComponentElements(ResearchStudy.ResearchStudyAssociatedPartyComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasNameElement()) {
composeString("name", element.getNameElement());
}
+ if (element.hasRole()) {
+ composeCodeableConcept("role", element.getRole());
+ }
+ if (element.hasClassifier()) {
+ for (CodeableConcept e : element.getClassifier())
+ composeCodeableConcept("classifier", e);
+ }
+ if (element.hasParty()) {
+ composeReference("party", element.getParty());
+ }
+ }
+
+ protected void composeResearchStudyStatusDateComponent(String name, ResearchStudy.ResearchStudyStatusDateComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeResearchStudyStatusDateComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeResearchStudyStatusDateComponentElements(ResearchStudy.ResearchStudyStatusDateComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasActivity()) {
+ composeCodeableConcept("activity", element.getActivity());
+ }
+ if (element.hasActualElement()) {
+ composeBoolean("actual", element.getActualElement());
+ }
+ if (element.hasPeriod()) {
+ composePeriod("period", element.getPeriod());
+ }
+ }
+
+ protected void composeResearchStudyRecruitmentComponent(String name, ResearchStudy.ResearchStudyRecruitmentComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeResearchStudyRecruitmentComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeResearchStudyRecruitmentComponentElements(ResearchStudy.ResearchStudyRecruitmentComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasTargetNumberElement()) {
+ composeUnsignedInt("targetNumber", element.getTargetNumberElement());
+ }
+ if (element.hasActualNumberElement()) {
+ composeUnsignedInt("actualNumber", element.getActualNumberElement());
+ }
+ if (element.hasEligibility()) {
+ composeReference("eligibility", element.getEligibility());
+ }
+ if (element.hasActualGroup()) {
+ composeReference("actualGroup", element.getActualGroup());
+ }
+ }
+
+ protected void composeResearchStudyComparisonGroupComponent(String name, ResearchStudy.ResearchStudyComparisonGroupComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeResearchStudyComparisonGroupComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeResearchStudyComparisonGroupComponentElements(ResearchStudy.ResearchStudyComparisonGroupComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasIdentifier()) {
+ composeType("identifier", element.getIdentifier());
+ } if (element.hasNameElement()) {
+ composeString("name", element.getNameElement());
+ }
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
if (element.hasDescriptionElement()) {
- composeString("description", element.getDescriptionElement());
+ composeMarkdown("description", element.getDescriptionElement());
+ }
+ if (element.hasIntendedExposure()) {
+ for (Reference e : element.getIntendedExposure())
+ composeReference("intendedExposure", e);
+ }
+ if (element.hasObservedGroup()) {
+ composeReference("observedGroup", element.getObservedGroup());
}
}
@@ -50067,6 +51606,56 @@ public class XmlParser extends XmlParserBase {
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
+ if (element.hasDescriptionElement()) {
+ composeMarkdown("description", element.getDescriptionElement());
+ }
+ }
+
+ protected void composeResearchStudyOutcomeMeasureComponent(String name, ResearchStudy.ResearchStudyOutcomeMeasureComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeResearchStudyOutcomeMeasureComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeResearchStudyOutcomeMeasureComponentElements(ResearchStudy.ResearchStudyOutcomeMeasureComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasNameElement()) {
+ composeString("name", element.getNameElement());
+ }
+ if (element.hasType()) {
+ for (CodeableConcept e : element.getType())
+ composeCodeableConcept("type", e);
+ }
+ if (element.hasDescriptionElement()) {
+ composeMarkdown("description", element.getDescriptionElement());
+ }
+ if (element.hasReference()) {
+ composeReference("reference", element.getReference());
+ }
+ }
+
+ protected void composeResearchStudyWebLocationComponent(String name, ResearchStudy.ResearchStudyWebLocationComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeResearchStudyWebLocationComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeResearchStudyWebLocationComponentElements(ResearchStudy.ResearchStudyWebLocationComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasUrlElement()) {
+ composeUri("url", element.getUrlElement());
+ }
}
protected void composeResearchSubject(String name, ResearchSubject element) throws IOException {
@@ -50086,7 +51675,7 @@ public class XmlParser extends XmlParserBase {
composeIdentifier("identifier", e);
}
if (element.hasStatusElement())
- composeEnumeration("status", element.getStatusElement(), new ResearchSubject.ResearchSubjectStatusEnumFactory());
+ composeEnumeration("status", element.getStatusElement(), new Enumerations.PublicationStatusEnumFactory());
if (element.hasProgress()) {
for (ResearchSubject.ResearchSubjectProgressComponent e : element.getProgress())
composeResearchSubjectProgressComponent("progress", e);
@@ -50097,8 +51686,8 @@ public class XmlParser extends XmlParserBase {
if (element.hasStudy()) {
composeReference("study", element.getStudy());
}
- if (element.hasIndividual()) {
- composeReference("individual", element.getIndividual());
+ if (element.hasSubject()) {
+ composeReference("subject", element.getSubject());
}
if (element.hasAssignedArmElement()) {
composeString("assignedArm", element.getAssignedArmElement());
@@ -50126,8 +51715,8 @@ public class XmlParser extends XmlParserBase {
if (element.hasType()) {
composeCodeableConcept("type", element.getType());
}
- if (element.hasState()) {
- composeCodeableConcept("state", element.getState());
+ if (element.hasSubjectState()) {
+ composeCodeableConcept("subjectState", element.getSubjectState());
}
if (element.hasMilestone()) {
composeCodeableConcept("milestone", element.getMilestone());
@@ -50138,6 +51727,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasStartDateElement()) {
composeDateTime("startDate", element.getStartDateElement());
}
+ if (element.hasEndDateElement()) {
+ composeDateTime("endDate", element.getEndDateElement());
+ }
}
protected void composeRiskAssessment(String name, RiskAssessment element) throws IOException {
@@ -51365,8 +52957,6 @@ public class XmlParser extends XmlParserBase {
if (element.hasContextElement()) {
composeId("context", element.getContextElement());
}
- if (element.hasContextTypeElement())
- composeEnumeration("contextType", element.getContextTypeElement(), new StructureMap.StructureMapContextTypeEnumFactory());
if (element.hasElementElement()) {
composeString("element", element.getElementElement());
}
@@ -51445,8 +53035,8 @@ public class XmlParser extends XmlParserBase {
}
if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new Enumerations.SubscriptionStateEnumFactory());
- if (element.hasTopic()) {
- composeReference("topic", element.getTopic());
+ if (element.hasTopicElement()) {
+ composeCanonical("topic", element.getTopicElement());
}
if (element.hasContact()) {
for (ContactPoint e : element.getContact())
@@ -51483,6 +53073,11 @@ public class XmlParser extends XmlParserBase {
}
if (element.hasContentElement())
composeEnumeration("content", element.getContentElement(), new Subscription.SubscriptionPayloadContentEnumFactory());
+ if (element.hasNotificationUrlLocationElement())
+ composeEnumeration("notificationUrlLocation", element.getNotificationUrlLocationElement(), new Subscription.SubscriptionUrlLocationEnumFactory());
+ if (element.hasMaxCountElement()) {
+ composePositiveInt("maxCount", element.getMaxCountElement());
+ }
}
protected void composeSubscriptionFilterByComponent(String name, Subscription.SubscriptionFilterByComponent element) throws IOException {
@@ -51497,6 +53092,9 @@ public class XmlParser extends XmlParserBase {
protected void composeSubscriptionFilterByComponentElements(Subscription.SubscriptionFilterByComponent element) throws IOException {
composeBackboneElementElements(element);
+ if (element.hasResourceTypeElement()) {
+ composeUri("resourceType", element.getResourceTypeElement());
+ }
if (element.hasSearchParamNameElement()) {
composeString("searchParamName", element.getSearchParamNameElement());
}
@@ -51519,6 +53117,8 @@ public class XmlParser extends XmlParserBase {
protected void composeSubscriptionStatusElements(SubscriptionStatus element) throws IOException {
composeDomainResourceElements(element);
+ if (element.hasStatusElement())
+ composeEnumeration("status", element.getStatusElement(), new Enumerations.SubscriptionStateEnumFactory());
if (element.hasTypeElement())
composeEnumeration("type", element.getTypeElement(), new SubscriptionStatus.SubscriptionNotificationTypeEnumFactory());
if (element.hasEventsSinceSubscriptionStartElement()) {
@@ -51530,8 +53130,6 @@ public class XmlParser extends XmlParserBase {
if (element.hasSubscription()) {
composeReference("subscription", element.getSubscription());
}
- if (element.hasStatusElement())
- composeEnumeration("status", element.getStatusElement(), new Enumerations.SubscriptionStateEnumFactory());
if (element.hasTopicElement()) {
composeCanonical("topic", element.getTopicElement());
}
@@ -51611,12 +53209,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasEffectivePeriod()) {
composePeriod("effectivePeriod", element.getEffectivePeriod());
}
- if (element.hasResourceTrigger()) {
- composeSubscriptionTopicResourceTriggerComponent("resourceTrigger", element.getResourceTrigger());
- }
- if (element.hasCanFilterBy()) {
- for (SubscriptionTopic.SubscriptionTopicCanFilterByComponent e : element.getCanFilterBy())
- composeSubscriptionTopicCanFilterByComponent("canFilterBy", e);
+ if (element.hasResourceTrigger()) {
+ for (SubscriptionTopic.SubscriptionTopicResourceTriggerComponent e : element.getResourceTrigger())
+ composeSubscriptionTopicResourceTriggerComponent("resourceTrigger", e);
}
}
@@ -51635,9 +53230,8 @@ public class XmlParser extends XmlParserBase {
if (element.hasDescriptionElement()) {
composeString("description", element.getDescriptionElement());
}
- if (element.hasResourceType()) {
- for (CodeType e : element.getResourceType())
- composeCode("resourceType", e);
+ if (element.hasResourceTypeElement()) {
+ composeUri("resourceType", element.getResourceTypeElement());
}
if (element.hasMethodCriteria())
for (Enumeration e : element.getMethodCriteria())
@@ -51649,6 +53243,10 @@ public class XmlParser extends XmlParserBase {
for (StringType e : element.getFhirPathCriteria())
composeString("fhirPathCriteria", e);
}
+ if (element.hasCanFilterBy()) {
+ for (SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent e : element.getCanFilterBy())
+ composeSubscriptionTopicResourceTriggerCanFilterByComponent("canFilterBy", e);
+ }
}
protected void composeSubscriptionTopicResourceTriggerQueryCriteriaComponent(String name, SubscriptionTopic.SubscriptionTopicResourceTriggerQueryCriteriaComponent element) throws IOException {
@@ -51666,25 +53264,29 @@ public class XmlParser extends XmlParserBase {
if (element.hasPreviousElement()) {
composeString("previous", element.getPreviousElement());
}
+ if (element.hasResultForCreateElement())
+ composeEnumeration("resultForCreate", element.getResultForCreateElement(), new SubscriptionTopic.CriteriaNotExistsBehaviorEnumFactory());
if (element.hasCurrentElement()) {
composeString("current", element.getCurrentElement());
}
+ if (element.hasResultForDeleteElement())
+ composeEnumeration("resultForDelete", element.getResultForDeleteElement(), new SubscriptionTopic.CriteriaNotExistsBehaviorEnumFactory());
if (element.hasRequireBothElement()) {
composeBoolean("requireBoth", element.getRequireBothElement());
}
}
- protected void composeSubscriptionTopicCanFilterByComponent(String name, SubscriptionTopic.SubscriptionTopicCanFilterByComponent element) throws IOException {
+ protected void composeSubscriptionTopicResourceTriggerCanFilterByComponent(String name, SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
xml.enter(FHIR_NS, name);
- composeSubscriptionTopicCanFilterByComponentElements(element);
+ composeSubscriptionTopicResourceTriggerCanFilterByComponentElements(element);
composeElementClose(element);
xml.exit(FHIR_NS, name);
}
}
- protected void composeSubscriptionTopicCanFilterByComponentElements(SubscriptionTopic.SubscriptionTopicCanFilterByComponent element) throws IOException {
+ protected void composeSubscriptionTopicResourceTriggerCanFilterByComponentElements(SubscriptionTopic.SubscriptionTopicResourceTriggerCanFilterByComponent element) throws IOException {
composeBackboneElementElements(element);
if (element.hasSearchParamNameElement()) {
composeString("searchParamName", element.getSearchParamNameElement());
@@ -51713,6 +53315,9 @@ public class XmlParser extends XmlParserBase {
for (Identifier e : element.getIdentifier())
composeIdentifier("identifier", e);
}
+ if (element.hasInstanceElement()) {
+ composeBoolean("instance", element.getInstanceElement());
+ }
if (element.hasStatusElement())
composeEnumeration("status", element.getStatusElement(), new Substance.FHIRSubstanceStatusEnumFactory());
if (element.hasCategory()) {
@@ -51720,42 +53325,21 @@ public class XmlParser extends XmlParserBase {
composeCodeableConcept("category", e);
}
if (element.hasCode()) {
- composeCodeableConcept("code", element.getCode());
+ composeCodeableReference("code", element.getCode());
}
if (element.hasDescriptionElement()) {
composeString("description", element.getDescriptionElement());
}
- if (element.hasInstance()) {
- for (Substance.SubstanceInstanceComponent e : element.getInstance())
- composeSubstanceInstanceComponent("instance", e);
- }
- if (element.hasIngredient()) {
- for (Substance.SubstanceIngredientComponent e : element.getIngredient())
- composeSubstanceIngredientComponent("ingredient", e);
- }
- }
-
- protected void composeSubstanceInstanceComponent(String name, Substance.SubstanceInstanceComponent element) throws IOException {
- if (element != null) {
- composeElementAttributes(element);
- xml.enter(FHIR_NS, name);
- composeSubstanceInstanceComponentElements(element);
- composeElementClose(element);
- xml.exit(FHIR_NS, name);
- }
- }
-
- protected void composeSubstanceInstanceComponentElements(Substance.SubstanceInstanceComponent element) throws IOException {
- composeBackboneElementElements(element);
- if (element.hasIdentifier()) {
- composeIdentifier("identifier", element.getIdentifier());
- }
if (element.hasExpiryElement()) {
composeDateTime("expiry", element.getExpiryElement());
}
if (element.hasQuantity()) {
composeQuantity("quantity", element.getQuantity());
}
+ if (element.hasIngredient()) {
+ for (Substance.SubstanceIngredientComponent e : element.getIngredient())
+ composeSubstanceIngredientComponent("ingredient", e);
+ }
}
protected void composeSubstanceIngredientComponent(String name, Substance.SubstanceIngredientComponent element) throws IOException {
@@ -51808,6 +53392,10 @@ public class XmlParser extends XmlParserBase {
if (element.hasDomain()) {
composeCodeableConcept("domain", element.getDomain());
}
+ if (element.hasGrade()) {
+ for (CodeableConcept e : element.getGrade())
+ composeCodeableConcept("grade", e);
+ }
if (element.hasDescriptionElement()) {
composeMarkdown("description", element.getDescriptionElement());
}
@@ -51867,7 +53455,7 @@ public class XmlParser extends XmlParserBase {
composeReference("protein", element.getProtein());
}
if (element.hasSourceMaterial()) {
- composeReference("sourceMaterial", element.getSourceMaterial());
+ composeSubstanceDefinitionSourceMaterialComponent("sourceMaterial", element.getSourceMaterial());
}
}
@@ -52208,6 +53796,36 @@ public class XmlParser extends XmlParserBase {
}
}
+ protected void composeSubstanceDefinitionSourceMaterialComponent(String name, SubstanceDefinition.SubstanceDefinitionSourceMaterialComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeSubstanceDefinitionSourceMaterialComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeSubstanceDefinitionSourceMaterialComponentElements(SubstanceDefinition.SubstanceDefinitionSourceMaterialComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasType()) {
+ composeCodeableConcept("type", element.getType());
+ }
+ if (element.hasGenus()) {
+ composeCodeableConcept("genus", element.getGenus());
+ }
+ if (element.hasSpecies()) {
+ composeCodeableConcept("species", element.getSpecies());
+ }
+ if (element.hasPart()) {
+ composeCodeableConcept("part", element.getPart());
+ }
+ if (element.hasCountryOfOrigin()) {
+ for (CodeableConcept e : element.getCountryOfOrigin())
+ composeCodeableConcept("countryOfOrigin", e);
+ }
+ }
+
protected void composeSubstanceNucleicAcid(String name, SubstanceNucleicAcid element) throws IOException {
if (element != null) {
composeResourceAttributes(element);
@@ -53847,6 +55465,10 @@ public class XmlParser extends XmlParserBase {
if (element.hasMetadata()) {
composeTestScriptMetadataComponent("metadata", element.getMetadata());
}
+ if (element.hasScope()) {
+ for (TestScript.TestScriptScopeComponent e : element.getScope())
+ composeTestScriptScopeComponent("scope", e);
+ }
if (element.hasFixture()) {
for (TestScript.TestScriptFixtureComponent e : element.getFixture())
composeTestScriptFixtureComponent("fixture", e);
@@ -53990,6 +55612,29 @@ public class XmlParser extends XmlParserBase {
}
}
+ protected void composeTestScriptScopeComponent(String name, TestScript.TestScriptScopeComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeTestScriptScopeComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeTestScriptScopeComponentElements(TestScript.TestScriptScopeComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasArtifactElement()) {
+ composeCanonical("artifact", element.getArtifactElement());
+ }
+ if (element.hasConformance()) {
+ composeCodeableConcept("conformance", element.getConformance());
+ }
+ if (element.hasPhase()) {
+ composeCodeableConcept("phase", element.getPhase());
+ }
+ }
+
protected void composeTestScriptFixtureComponent(String name, TestScript.TestScriptFixtureComponent element) throws IOException {
if (element != null) {
composeElementAttributes(element);
@@ -54237,6 +55882,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasSourceIdElement()) {
composeId("sourceId", element.getSourceIdElement());
}
+ if (element.hasStopTestOnFailElement()) {
+ composeBoolean("stopTestOnFail", element.getStopTestOnFailElement());
+ }
if (element.hasValidateProfileIdElement()) {
composeId("validateProfileId", element.getValidateProfileIdElement());
}
@@ -54396,6 +56044,9 @@ public class XmlParser extends XmlParserBase {
if (element.hasExpansion()) {
composeValueSetExpansionComponent("expansion", element.getExpansion());
}
+ if (element.hasScope()) {
+ composeValueSetScopeComponent("scope", element.getScope());
+ }
}
protected void composeValueSetComposeComponent(String name, ValueSet.ValueSetComposeComponent element) throws IOException {
@@ -54460,6 +56111,9 @@ public class XmlParser extends XmlParserBase {
for (CanonicalType e : element.getValueSet())
composeCanonical("valueSet", e);
}
+ if (element.hasCopyrightElement()) {
+ composeString("copyright", element.getCopyrightElement());
+ }
}
protected void composeValueSetConceptReferenceComponent(String name, ValueSet.ConceptReferenceComponent element) throws IOException {
@@ -54671,6 +56325,29 @@ public class XmlParser extends XmlParserBase {
composeType("value", element.getValue());
} }
+ protected void composeValueSetScopeComponent(String name, ValueSet.ValueSetScopeComponent element) throws IOException {
+ if (element != null) {
+ composeElementAttributes(element);
+ xml.enter(FHIR_NS, name);
+ composeValueSetScopeComponentElements(element);
+ composeElementClose(element);
+ xml.exit(FHIR_NS, name);
+ }
+ }
+
+ protected void composeValueSetScopeComponentElements(ValueSet.ValueSetScopeComponent element) throws IOException {
+ composeBackboneElementElements(element);
+ if (element.hasFocusElement()) {
+ composeString("focus", element.getFocusElement());
+ }
+ if (element.hasInclusionCriteriaElement()) {
+ composeString("inclusionCriteria", element.getInclusionCriteriaElement());
+ }
+ if (element.hasExclusionCriteriaElement()) {
+ composeString("exclusionCriteria", element.getExclusionCriteriaElement());
+ }
+ }
+
protected void composeVerificationResult(String name, VerificationResult element) throws IOException {
if (element != null) {
composeResourceAttributes(element);
@@ -55037,8 +56714,8 @@ public class XmlParser extends XmlParserBase {
composeDeviceMetric("DeviceMetric", (DeviceMetric)resource);
} else if (resource instanceof DeviceRequest) {
composeDeviceRequest("DeviceRequest", (DeviceRequest)resource);
- } else if (resource instanceof DeviceUseStatement) {
- composeDeviceUseStatement("DeviceUseStatement", (DeviceUseStatement)resource);
+ } else if (resource instanceof DeviceUsage) {
+ composeDeviceUsage("DeviceUsage", (DeviceUsage)resource);
} else if (resource instanceof DiagnosticReport) {
composeDiagnosticReport("DiagnosticReport", (DiagnosticReport)resource);
} else if (resource instanceof DocumentManifest) {
@@ -55095,6 +56772,8 @@ public class XmlParser extends XmlParserBase {
composeIngredient("Ingredient", (Ingredient)resource);
} else if (resource instanceof InsurancePlan) {
composeInsurancePlan("InsurancePlan", (InsurancePlan)resource);
+ } else if (resource instanceof InventoryReport) {
+ composeInventoryReport("InventoryReport", (InventoryReport)resource);
} else if (resource instanceof Invoice) {
composeInvoice("Invoice", (Invoice)resource);
} else if (resource instanceof Library) {
@@ -55342,8 +57021,8 @@ public class XmlParser extends XmlParserBase {
composeDeviceMetric(name, (DeviceMetric)resource);
} else if (resource instanceof DeviceRequest) {
composeDeviceRequest(name, (DeviceRequest)resource);
- } else if (resource instanceof DeviceUseStatement) {
- composeDeviceUseStatement(name, (DeviceUseStatement)resource);
+ } else if (resource instanceof DeviceUsage) {
+ composeDeviceUsage(name, (DeviceUsage)resource);
} else if (resource instanceof DiagnosticReport) {
composeDiagnosticReport(name, (DiagnosticReport)resource);
} else if (resource instanceof DocumentManifest) {
@@ -55400,6 +57079,8 @@ public class XmlParser extends XmlParserBase {
composeIngredient(name, (Ingredient)resource);
} else if (resource instanceof InsurancePlan) {
composeInsurancePlan(name, (InsurancePlan)resource);
+ } else if (resource instanceof InventoryReport) {
+ composeInventoryReport(name, (InventoryReport)resource);
} else if (resource instanceof Invoice) {
composeInvoice(name, (Invoice)resource);
} else if (resource instanceof Library) {
@@ -55627,6 +57308,8 @@ public class XmlParser extends XmlParserBase {
composeRange(prefix+"Range", (Range) type);
} else if (type instanceof Ratio) {
composeRatio(prefix+"Ratio", (Ratio) type);
+ } else if (type instanceof RatioRange) {
+ composeRatioRange(prefix+"RatioRange", (RatioRange) type);
} else if (type instanceof Reference) {
composeReference(prefix+"Reference", (Reference) type);
} else if (type instanceof RelatedArtifact) {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Account.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Account.java
index 56993b2f6..ef116f987 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Account.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Account.java
@@ -1,8 +1,6 @@
package org.hl7.fhir.r5.model;
-
-
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.
@@ -31,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -105,7 +103,6 @@ public class Account extends DomainResource {
case ENTEREDINERROR: return "entered-in-error";
case ONHOLD: return "on-hold";
case UNKNOWN: return "unknown";
- case NULL: return null;
default: return "?";
}
}
@@ -116,7 +113,6 @@ public class Account extends DomainResource {
case ENTEREDINERROR: return "http://hl7.org/fhir/account-status";
case ONHOLD: return "http://hl7.org/fhir/account-status";
case UNKNOWN: return "http://hl7.org/fhir/account-status";
- case NULL: return null;
default: return "?";
}
}
@@ -127,7 +123,6 @@ public class Account extends DomainResource {
case ENTEREDINERROR: return "This instance should not have been part of this patient's medical record.";
case ONHOLD: return "This account is on hold.";
case UNKNOWN: return "The account status is unknown.";
- case NULL: return null;
default: return "?";
}
}
@@ -138,7 +133,6 @@ public class Account extends DomainResource {
case ENTEREDINERROR: return "Entered in error";
case ONHOLD: return "On Hold";
case UNKNOWN: return "Unknown";
- case NULL: return null;
default: return "?";
}
}
@@ -1618,7 +1612,7 @@ A coverage may only be responsible for specific types of charges, and the sequen
* Path: Account.subject.where(resolve() is Patient)
*
*/
- @SearchParamDefinition(name="patient", path="Account.subject.where(resolve() is Patient)", description="The entity that caused the expenses", type="reference", target={Patient.class } )
+ @SearchParamDefinition(name="patient", path="Account.subject.where(resolve() is Patient)", description="The entity that caused the expenses", type="reference", target={Device.class, HealthcareService.class, Location.class, Organization.class, Patient.class, Practitioner.class, PractitionerRole.class } )
public static final String SP_PATIENT = "patient";
/**
* Fluent Client search parameter constant for patient
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActivityDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActivityDefinition.java
index af83be10f..7aac12e9f 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActivityDefinition.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActivityDefinition.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -173,7 +173,6 @@ public class ActivityDefinition extends MetadataResource {
case SUPPLYREQUEST: return "SupplyRequest";
case TASK: return "Task";
case VISIONPRESCRIPTION: return "VisionPrescription";
- case NULL: return null;
default: return "?";
}
}
@@ -194,7 +193,6 @@ public class ActivityDefinition extends MetadataResource {
case SUPPLYREQUEST: return "http://hl7.org/fhir/request-resource-types";
case TASK: return "http://hl7.org/fhir/request-resource-types";
case VISIONPRESCRIPTION: return "http://hl7.org/fhir/request-resource-types";
- case NULL: return null;
default: return "?";
}
}
@@ -215,7 +213,6 @@ public class ActivityDefinition extends MetadataResource {
case SUPPLYREQUEST: return "Request for a medication, substance or device.";
case TASK: return "A task to be performed.";
case VISIONPRESCRIPTION: return "Prescription for vision correction products for a patient.";
- case NULL: return null;
default: return "?";
}
}
@@ -236,7 +233,6 @@ public class ActivityDefinition extends MetadataResource {
case SUPPLYREQUEST: return "SupplyRequest";
case TASK: return "Task";
case VISIONPRESCRIPTION: return "VisionPrescription";
- case NULL: return null;
default: return "?";
}
}
@@ -362,20 +358,35 @@ public class ActivityDefinition extends MetadataResource {
/**
* The type of participant in the action.
*/
- @Child(name = "type", type = {CodeType.class}, order=1, min=1, max=1, modifier=false, summary=false)
- @Description(shortDefinition="patient | practitioner | related-person | device", formalDefinition="The type of participant in the action." )
+ @Child(name = "type", type = {CodeType.class}, order=1, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="careteam | device | group | healthcareservice | location | organization | patient | practitioner | practitionerrole | relatedperson", formalDefinition="The type of participant in the action." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/action-participant-type")
protected Enumeration type;
+ /**
+ * The type of participant in the action.
+ */
+ @Child(name = "typeReference", type = {CareTeam.class, Device.class, Group.class, HealthcareService.class, Location.class, Organization.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class}, order=2, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Who or what can participate", formalDefinition="The type of participant in the action." )
+ protected Reference typeReference;
+
/**
* The role the participant should play in performing the described action.
*/
- @Child(name = "role", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=false)
+ @Child(name = "role", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="E.g. Nurse, Surgeon, Parent, etc.", formalDefinition="The role the participant should play in performing the described action." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://terminology.hl7.org/ValueSet/action-participant-role")
protected CodeableConcept role;
- private static final long serialVersionUID = -1152013659L;
+ /**
+ * Indicates how the actor will be involved in the action - author, reviewer, witness, etc.
+ */
+ @Child(name = "function", type = {CodeableConcept.class}, order=4, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="E.g. Author, Reviewer, Witness, etc.", formalDefinition="Indicates how the actor will be involved in the action - author, reviewer, witness, etc." )
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/action-participant-function")
+ protected CodeableConcept function;
+
+ private static final long serialVersionUID = -136836616L;
/**
* Constructor
@@ -384,14 +395,6 @@ public class ActivityDefinition extends MetadataResource {
super();
}
- /**
- * Constructor
- */
- public ActivityDefinitionParticipantComponent(ActionParticipantType type) {
- super();
- this.setType(type);
- }
-
/**
* @return {@link #type} (The type of participant in the action.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
*/
@@ -431,9 +434,37 @@ public class ActivityDefinition extends MetadataResource {
* @param value The type of participant in the action.
*/
public ActivityDefinitionParticipantComponent setType(ActionParticipantType value) {
+ if (value == null)
+ this.type = null;
+ else {
if (this.type == null)
this.type = new Enumeration(new ActionParticipantTypeEnumFactory());
this.type.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #typeReference} (The type of participant in the action.)
+ */
+ public Reference getTypeReference() {
+ if (this.typeReference == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create ActivityDefinitionParticipantComponent.typeReference");
+ else if (Configuration.doAutoCreate())
+ this.typeReference = new Reference(); // cc
+ return this.typeReference;
+ }
+
+ public boolean hasTypeReference() {
+ return this.typeReference != null && !this.typeReference.isEmpty();
+ }
+
+ /**
+ * @param value {@link #typeReference} (The type of participant in the action.)
+ */
+ public ActivityDefinitionParticipantComponent setTypeReference(Reference value) {
+ this.typeReference = value;
return this;
}
@@ -461,17 +492,45 @@ public class ActivityDefinition extends MetadataResource {
return this;
}
+ /**
+ * @return {@link #function} (Indicates how the actor will be involved in the action - author, reviewer, witness, etc.)
+ */
+ public CodeableConcept getFunction() {
+ if (this.function == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create ActivityDefinitionParticipantComponent.function");
+ else if (Configuration.doAutoCreate())
+ this.function = new CodeableConcept(); // cc
+ return this.function;
+ }
+
+ public boolean hasFunction() {
+ return this.function != null && !this.function.isEmpty();
+ }
+
+ /**
+ * @param value {@link #function} (Indicates how the actor will be involved in the action - author, reviewer, witness, etc.)
+ */
+ public ActivityDefinitionParticipantComponent setFunction(CodeableConcept value) {
+ this.function = value;
+ return this;
+ }
+
protected void listChildren(List children) {
super.listChildren(children);
children.add(new Property("type", "code", "The type of participant in the action.", 0, 1, type));
+ children.add(new Property("typeReference", "Reference(CareTeam|Device|Group|HealthcareService|Location|Organization|Patient|Practitioner|PractitionerRole|RelatedPerson)", "The type of participant in the action.", 0, 1, typeReference));
children.add(new Property("role", "CodeableConcept", "The role the participant should play in performing the described action.", 0, 1, role));
+ children.add(new Property("function", "CodeableConcept", "Indicates how the actor will be involved in the action - author, reviewer, witness, etc.", 0, 1, function));
}
@Override
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
case 3575610: /*type*/ return new Property("type", "code", "The type of participant in the action.", 0, 1, type);
+ case 2074825009: /*typeReference*/ return new Property("typeReference", "Reference(CareTeam|Device|Group|HealthcareService|Location|Organization|Patient|Practitioner|PractitionerRole|RelatedPerson)", "The type of participant in the action.", 0, 1, typeReference);
case 3506294: /*role*/ return new Property("role", "CodeableConcept", "The role the participant should play in performing the described action.", 0, 1, role);
+ case 1380938712: /*function*/ return new Property("function", "CodeableConcept", "Indicates how the actor will be involved in the action - author, reviewer, witness, etc.", 0, 1, function);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -481,7 +540,9 @@ public class ActivityDefinition extends MetadataResource {
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // Enumeration
+ case 2074825009: /*typeReference*/ return this.typeReference == null ? new Base[0] : new Base[] {this.typeReference}; // Reference
case 3506294: /*role*/ return this.role == null ? new Base[0] : new Base[] {this.role}; // CodeableConcept
+ case 1380938712: /*function*/ return this.function == null ? new Base[0] : new Base[] {this.function}; // CodeableConcept
default: return super.getProperty(hash, name, checkValid);
}
@@ -494,9 +555,15 @@ public class ActivityDefinition extends MetadataResource {
value = new ActionParticipantTypeEnumFactory().fromType(TypeConvertor.castToCode(value));
this.type = (Enumeration) value; // Enumeration
return value;
+ case 2074825009: // typeReference
+ this.typeReference = TypeConvertor.castToReference(value); // Reference
+ return value;
case 3506294: // role
this.role = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
return value;
+ case 1380938712: // function
+ this.function = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ return value;
default: return super.setProperty(hash, name, value);
}
@@ -507,8 +574,12 @@ public class ActivityDefinition extends MetadataResource {
if (name.equals("type")) {
value = new ActionParticipantTypeEnumFactory().fromType(TypeConvertor.castToCode(value));
this.type = (Enumeration) value; // Enumeration
+ } else if (name.equals("typeReference")) {
+ this.typeReference = TypeConvertor.castToReference(value); // Reference
} else if (name.equals("role")) {
this.role = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ } else if (name.equals("function")) {
+ this.function = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
} else
return super.setProperty(name, value);
return value;
@@ -518,7 +589,9 @@ public class ActivityDefinition extends MetadataResource {
public Base makeProperty(int hash, String name) throws FHIRException {
switch (hash) {
case 3575610: return getTypeElement();
+ case 2074825009: return getTypeReference();
case 3506294: return getRole();
+ case 1380938712: return getFunction();
default: return super.makeProperty(hash, name);
}
@@ -528,7 +601,9 @@ public class ActivityDefinition extends MetadataResource {
public String[] getTypesForProperty(int hash, String name) throws FHIRException {
switch (hash) {
case 3575610: /*type*/ return new String[] {"code"};
+ case 2074825009: /*typeReference*/ return new String[] {"Reference"};
case 3506294: /*role*/ return new String[] {"CodeableConcept"};
+ case 1380938712: /*function*/ return new String[] {"CodeableConcept"};
default: return super.getTypesForProperty(hash, name);
}
@@ -539,10 +614,18 @@ public class ActivityDefinition extends MetadataResource {
if (name.equals("type")) {
throw new FHIRException("Cannot call addChild on a primitive type ActivityDefinition.participant.type");
}
+ else if (name.equals("typeReference")) {
+ this.typeReference = new Reference();
+ return this.typeReference;
+ }
else if (name.equals("role")) {
this.role = new CodeableConcept();
return this.role;
}
+ else if (name.equals("function")) {
+ this.function = new CodeableConcept();
+ return this.function;
+ }
else
return super.addChild(name);
}
@@ -556,7 +639,9 @@ public class ActivityDefinition extends MetadataResource {
public void copyValues(ActivityDefinitionParticipantComponent dst) {
super.copyValues(dst);
dst.type = type == null ? null : type.copy();
+ dst.typeReference = typeReference == null ? null : typeReference.copy();
dst.role = role == null ? null : role.copy();
+ dst.function = function == null ? null : function.copy();
}
@Override
@@ -566,7 +651,8 @@ public class ActivityDefinition extends MetadataResource {
if (!(other_ instanceof ActivityDefinitionParticipantComponent))
return false;
ActivityDefinitionParticipantComponent o = (ActivityDefinitionParticipantComponent) other_;
- return compareDeep(type, o.type, true) && compareDeep(role, o.role, true);
+ return compareDeep(type, o.type, true) && compareDeep(typeReference, o.typeReference, true) && compareDeep(role, o.role, true)
+ && compareDeep(function, o.function, true);
}
@Override
@@ -580,7 +666,8 @@ public class ActivityDefinition extends MetadataResource {
}
public boolean isEmpty() {
- return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, role);
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, typeReference, role
+ , function);
}
public String fhirType() {
@@ -878,10 +965,10 @@ public class ActivityDefinition extends MetadataResource {
protected BooleanType experimental;
/**
- * A code or group definition that describes the intended subject of the activity being defined.
+ * A code, group definition, or canonical reference that describes or identifies the intended subject of the activity being defined. Canonical references are allowed to support the definition of protocols for drug and substance quality specifications, and is allowed to reference a MedicinalProductDefinition, SubstanceDefinition, AdministrableProductDefinition, ManufacturedItemDefinition, or PackagedProductDefinition resource.
*/
- @Child(name = "subject", type = {CodeableConcept.class, Group.class}, order=8, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Type of individual the activity definition is intended for", formalDefinition="A code or group definition that describes the intended subject of the activity being defined." )
+ @Child(name = "subject", type = {CodeableConcept.class, Group.class, CanonicalType.class}, order=8, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Type of individual the activity definition is intended for", formalDefinition="A code, group definition, or canonical reference that describes or identifies the intended subject of the activity being defined. Canonical references are allowed to support the definition of protocols for drug and substance quality specifications, and is allowed to reference a MedicinalProductDefinition, SubstanceDefinition, AdministrableProductDefinition, ManufacturedItemDefinition, or PackagedProductDefinition resource." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/subject-type")
protected DataType subject;
@@ -1067,18 +1154,18 @@ public class ActivityDefinition extends MetadataResource {
protected BooleanType doNotPerform;
/**
- * The period, timing or frequency upon which the described activity is to occur.
+ * The timing or frequency upon which the described activity is to occur.
*/
- @Child(name = "timing", type = {Timing.class, DateTimeType.class, Age.class, Period.class, Range.class, Duration.class}, order=34, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="When activity is to occur", formalDefinition="The period, timing or frequency upon which the described activity is to occur." )
+ @Child(name = "timing", type = {Timing.class, Age.class, Range.class, Duration.class}, order=34, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="When activity is to occur", formalDefinition="The timing or frequency upon which the described activity is to occur." )
protected DataType timing;
/**
* Identifies the facility where the activity will occur; e.g. home, hospital, specific clinic, etc.
*/
- @Child(name = "location", type = {Location.class}, order=35, min=0, max=1, modifier=false, summary=false)
+ @Child(name = "location", type = {CodeableReference.class}, order=35, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Where it should happen", formalDefinition="Identifies the facility where the activity will occur; e.g. home, hospital, specific clinic, etc." )
- protected Reference location;
+ protected CodeableReference location;
/**
* Indicates who should participate in performing the action described.
@@ -1090,7 +1177,7 @@ public class ActivityDefinition extends MetadataResource {
/**
* Identifies the food, drug or other product being consumed or supplied in the activity.
*/
- @Child(name = "product", type = {Medication.class, Substance.class, CodeableConcept.class}, order=37, min=0, max=1, modifier=false, summary=false)
+ @Child(name = "product", type = {Medication.class, Substance.class, Ingredient.class, CodeableConcept.class}, order=37, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="What's administered/supplied", formalDefinition="Identifies the food, drug or other product being consumed or supplied in the activity." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/medication-codes")
protected DataType product;
@@ -1152,7 +1239,7 @@ public class ActivityDefinition extends MetadataResource {
@Description(shortDefinition="Dynamic aspects of the definition", formalDefinition="Dynamic values that will be evaluated to produce values for elements of the resulting resource. For example, if the dosage of a medication must be computed based on the patient's weight, a dynamic value would be used to specify an expression that calculated the weight, and the path on the request resource that would contain the result." )
protected List dynamicValue;
- private static final long serialVersionUID = 1615489416L;
+ private static final long serialVersionUID = 173439425L;
/**
* Constructor
@@ -1558,14 +1645,14 @@ public class ActivityDefinition extends MetadataResource {
}
/**
- * @return {@link #subject} (A code or group definition that describes the intended subject of the activity being defined.)
+ * @return {@link #subject} (A code, group definition, or canonical reference that describes or identifies the intended subject of the activity being defined. Canonical references are allowed to support the definition of protocols for drug and substance quality specifications, and is allowed to reference a MedicinalProductDefinition, SubstanceDefinition, AdministrableProductDefinition, ManufacturedItemDefinition, or PackagedProductDefinition resource.)
*/
public DataType getSubject() {
return this.subject;
}
/**
- * @return {@link #subject} (A code or group definition that describes the intended subject of the activity being defined.)
+ * @return {@link #subject} (A code, group definition, or canonical reference that describes or identifies the intended subject of the activity being defined. Canonical references are allowed to support the definition of protocols for drug and substance quality specifications, and is allowed to reference a MedicinalProductDefinition, SubstanceDefinition, AdministrableProductDefinition, ManufacturedItemDefinition, or PackagedProductDefinition resource.)
*/
public CodeableConcept getSubjectCodeableConcept() throws FHIRException {
if (this.subject == null)
@@ -1580,7 +1667,7 @@ public class ActivityDefinition extends MetadataResource {
}
/**
- * @return {@link #subject} (A code or group definition that describes the intended subject of the activity being defined.)
+ * @return {@link #subject} (A code, group definition, or canonical reference that describes or identifies the intended subject of the activity being defined. Canonical references are allowed to support the definition of protocols for drug and substance quality specifications, and is allowed to reference a MedicinalProductDefinition, SubstanceDefinition, AdministrableProductDefinition, ManufacturedItemDefinition, or PackagedProductDefinition resource.)
*/
public Reference getSubjectReference() throws FHIRException {
if (this.subject == null)
@@ -1594,15 +1681,30 @@ public class ActivityDefinition extends MetadataResource {
return this != null && this.subject instanceof Reference;
}
+ /**
+ * @return {@link #subject} (A code, group definition, or canonical reference that describes or identifies the intended subject of the activity being defined. Canonical references are allowed to support the definition of protocols for drug and substance quality specifications, and is allowed to reference a MedicinalProductDefinition, SubstanceDefinition, AdministrableProductDefinition, ManufacturedItemDefinition, or PackagedProductDefinition resource.)
+ */
+ public CanonicalType getSubjectCanonicalType() throws FHIRException {
+ if (this.subject == null)
+ this.subject = new CanonicalType();
+ if (!(this.subject instanceof CanonicalType))
+ throw new FHIRException("Type mismatch: the type CanonicalType was expected, but "+this.subject.getClass().getName()+" was encountered");
+ return (CanonicalType) this.subject;
+ }
+
+ public boolean hasSubjectCanonicalType() {
+ return this != null && this.subject instanceof CanonicalType;
+ }
+
public boolean hasSubject() {
return this.subject != null && !this.subject.isEmpty();
}
/**
- * @param value {@link #subject} (A code or group definition that describes the intended subject of the activity being defined.)
+ * @param value {@link #subject} (A code, group definition, or canonical reference that describes or identifies the intended subject of the activity being defined. Canonical references are allowed to support the definition of protocols for drug and substance quality specifications, and is allowed to reference a MedicinalProductDefinition, SubstanceDefinition, AdministrableProductDefinition, ManufacturedItemDefinition, or PackagedProductDefinition resource.)
*/
public ActivityDefinition setSubject(DataType value) {
- if (value != null && !(value instanceof CodeableConcept || value instanceof Reference))
+ if (value != null && !(value instanceof CodeableConcept || value instanceof Reference || value instanceof CanonicalType))
throw new Error("Not the right type for ActivityDefinition.subject[x]: "+value.fhirType());
this.subject = value;
return this;
@@ -2828,14 +2930,14 @@ public class ActivityDefinition extends MetadataResource {
}
/**
- * @return {@link #timing} (The period, timing or frequency upon which the described activity is to occur.)
+ * @return {@link #timing} (The timing or frequency upon which the described activity is to occur.)
*/
public DataType getTiming() {
return this.timing;
}
/**
- * @return {@link #timing} (The period, timing or frequency upon which the described activity is to occur.)
+ * @return {@link #timing} (The timing or frequency upon which the described activity is to occur.)
*/
public Timing getTimingTiming() throws FHIRException {
if (this.timing == null)
@@ -2850,22 +2952,7 @@ public class ActivityDefinition extends MetadataResource {
}
/**
- * @return {@link #timing} (The period, timing or frequency upon which the described activity is to occur.)
- */
- public DateTimeType getTimingDateTimeType() throws FHIRException {
- if (this.timing == null)
- this.timing = new DateTimeType();
- if (!(this.timing instanceof DateTimeType))
- throw new FHIRException("Type mismatch: the type DateTimeType was expected, but "+this.timing.getClass().getName()+" was encountered");
- return (DateTimeType) this.timing;
- }
-
- public boolean hasTimingDateTimeType() {
- return this != null && this.timing instanceof DateTimeType;
- }
-
- /**
- * @return {@link #timing} (The period, timing or frequency upon which the described activity is to occur.)
+ * @return {@link #timing} (The timing or frequency upon which the described activity is to occur.)
*/
public Age getTimingAge() throws FHIRException {
if (this.timing == null)
@@ -2880,22 +2967,7 @@ public class ActivityDefinition extends MetadataResource {
}
/**
- * @return {@link #timing} (The period, timing or frequency upon which the described activity is to occur.)
- */
- public Period getTimingPeriod() throws FHIRException {
- if (this.timing == null)
- this.timing = new Period();
- if (!(this.timing instanceof Period))
- throw new FHIRException("Type mismatch: the type Period was expected, but "+this.timing.getClass().getName()+" was encountered");
- return (Period) this.timing;
- }
-
- public boolean hasTimingPeriod() {
- return this != null && this.timing instanceof Period;
- }
-
- /**
- * @return {@link #timing} (The period, timing or frequency upon which the described activity is to occur.)
+ * @return {@link #timing} (The timing or frequency upon which the described activity is to occur.)
*/
public Range getTimingRange() throws FHIRException {
if (this.timing == null)
@@ -2910,7 +2982,7 @@ public class ActivityDefinition extends MetadataResource {
}
/**
- * @return {@link #timing} (The period, timing or frequency upon which the described activity is to occur.)
+ * @return {@link #timing} (The timing or frequency upon which the described activity is to occur.)
*/
public Duration getTimingDuration() throws FHIRException {
if (this.timing == null)
@@ -2929,10 +3001,10 @@ public class ActivityDefinition extends MetadataResource {
}
/**
- * @param value {@link #timing} (The period, timing or frequency upon which the described activity is to occur.)
+ * @param value {@link #timing} (The timing or frequency upon which the described activity is to occur.)
*/
public ActivityDefinition setTiming(DataType value) {
- if (value != null && !(value instanceof Timing || value instanceof DateTimeType || value instanceof Age || value instanceof Period || value instanceof Range || value instanceof Duration))
+ if (value != null && !(value instanceof Timing || value instanceof Age || value instanceof Range || value instanceof Duration))
throw new Error("Not the right type for ActivityDefinition.timing[x]: "+value.fhirType());
this.timing = value;
return this;
@@ -2941,12 +3013,12 @@ public class ActivityDefinition extends MetadataResource {
/**
* @return {@link #location} (Identifies the facility where the activity will occur; e.g. home, hospital, specific clinic, etc.)
*/
- public Reference getLocation() {
+ public CodeableReference getLocation() {
if (this.location == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ActivityDefinition.location");
else if (Configuration.doAutoCreate())
- this.location = new Reference(); // cc
+ this.location = new CodeableReference(); // cc
return this.location;
}
@@ -2957,7 +3029,7 @@ public class ActivityDefinition extends MetadataResource {
/**
* @param value {@link #location} (Identifies the facility where the activity will occur; e.g. home, hospital, specific clinic, etc.)
*/
- public ActivityDefinition setLocation(Reference value) {
+ public ActivityDefinition setLocation(CodeableReference value) {
this.location = value;
return this;
}
@@ -3467,7 +3539,7 @@ public class ActivityDefinition extends MetadataResource {
children.add(new Property("subtitle", "string", "An explanatory or alternate title for the activity definition giving additional information about its content.", 0, 1, subtitle));
children.add(new Property("status", "code", "The status of this activity definition. Enables tracking the life-cycle of the content.", 0, 1, status));
children.add(new Property("experimental", "boolean", "A Boolean value to indicate that this activity definition is authored for testing purposes (or education/evaluation/marketing) and is not intended to be used for genuine usage.", 0, 1, experimental));
- children.add(new Property("subject[x]", "CodeableConcept|Reference(Group)", "A code or group definition that describes the intended subject of the activity being defined.", 0, 1, subject));
+ children.add(new Property("subject[x]", "CodeableConcept|Reference(Group)|canonical", "A code, group definition, or canonical reference that describes or identifies the intended subject of the activity being defined. Canonical references are allowed to support the definition of protocols for drug and substance quality specifications, and is allowed to reference a MedicinalProductDefinition, SubstanceDefinition, AdministrableProductDefinition, ManufacturedItemDefinition, or PackagedProductDefinition resource.", 0, 1, subject));
children.add(new Property("date", "dateTime", "The date (and optionally time) when the activity definition was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the activity definition changes.", 0, 1, date));
children.add(new Property("publisher", "string", "The name of the organization or individual that published the activity definition.", 0, 1, publisher));
children.add(new Property("contact", "ContactDetail", "Contact details to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact));
@@ -3493,10 +3565,10 @@ public class ActivityDefinition extends MetadataResource {
children.add(new Property("intent", "code", "Indicates the level of authority/intentionality associated with the activity and where the request should fit into the workflow chain.", 0, 1, intent));
children.add(new Property("priority", "code", "Indicates how quickly the activity should be addressed with respect to other requests.", 0, 1, priority));
children.add(new Property("doNotPerform", "boolean", "Set this to true if the definition is to indicate that a particular activity should NOT be performed. If true, this element should be interpreted to reinforce a negative coding. For example NPO as a code with a doNotPerform of true would still indicate to NOT perform the action.", 0, 1, doNotPerform));
- children.add(new Property("timing[x]", "Timing|dateTime|Age|Period|Range|Duration", "The period, timing or frequency upon which the described activity is to occur.", 0, 1, timing));
- children.add(new Property("location", "Reference(Location)", "Identifies the facility where the activity will occur; e.g. home, hospital, specific clinic, etc.", 0, 1, location));
+ children.add(new Property("timing[x]", "Timing|Age|Range|Duration", "The timing or frequency upon which the described activity is to occur.", 0, 1, timing));
+ children.add(new Property("location", "CodeableReference(Location)", "Identifies the facility where the activity will occur; e.g. home, hospital, specific clinic, etc.", 0, 1, location));
children.add(new Property("participant", "", "Indicates who should participate in performing the action described.", 0, java.lang.Integer.MAX_VALUE, participant));
- children.add(new Property("product[x]", "Reference(Medication|Substance)|CodeableConcept", "Identifies the food, drug or other product being consumed or supplied in the activity.", 0, 1, product));
+ children.add(new Property("product[x]", "Reference(Medication|Substance|Ingredient)|CodeableConcept", "Identifies the food, drug or other product being consumed or supplied in the activity.", 0, 1, product));
children.add(new Property("quantity", "Quantity", "Identifies the quantity expected to be consumed at once (per dose, per meal, etc.).", 0, 1, quantity));
children.add(new Property("dosage", "Dosage", "Provides detailed dosage instructions in the same way that they are described for MedicationRequest resources.", 0, java.lang.Integer.MAX_VALUE, dosage));
children.add(new Property("bodySite", "CodeableConcept", "Indicates the sites on the subject's body where the procedure should be performed (I.e. the target sites).", 0, java.lang.Integer.MAX_VALUE, bodySite));
@@ -3518,10 +3590,11 @@ public class ActivityDefinition extends MetadataResource {
case -2060497896: /*subtitle*/ return new Property("subtitle", "string", "An explanatory or alternate title for the activity definition giving additional information about its content.", 0, 1, subtitle);
case -892481550: /*status*/ return new Property("status", "code", "The status of this activity definition. Enables tracking the life-cycle of the content.", 0, 1, status);
case -404562712: /*experimental*/ return new Property("experimental", "boolean", "A Boolean value to indicate that this activity definition is authored for testing purposes (or education/evaluation/marketing) and is not intended to be used for genuine usage.", 0, 1, experimental);
- case -573640748: /*subject[x]*/ return new Property("subject[x]", "CodeableConcept|Reference(Group)", "A code or group definition that describes the intended subject of the activity being defined.", 0, 1, subject);
- case -1867885268: /*subject*/ return new Property("subject[x]", "CodeableConcept|Reference(Group)", "A code or group definition that describes the intended subject of the activity being defined.", 0, 1, subject);
- case -1257122603: /*subjectCodeableConcept*/ return new Property("subject[x]", "CodeableConcept", "A code or group definition that describes the intended subject of the activity being defined.", 0, 1, subject);
- case 772938623: /*subjectReference*/ return new Property("subject[x]", "Reference(Group)", "A code or group definition that describes the intended subject of the activity being defined.", 0, 1, subject);
+ case -573640748: /*subject[x]*/ return new Property("subject[x]", "CodeableConcept|Reference(Group)|canonical", "A code, group definition, or canonical reference that describes or identifies the intended subject of the activity being defined. Canonical references are allowed to support the definition of protocols for drug and substance quality specifications, and is allowed to reference a MedicinalProductDefinition, SubstanceDefinition, AdministrableProductDefinition, ManufacturedItemDefinition, or PackagedProductDefinition resource.", 0, 1, subject);
+ case -1867885268: /*subject*/ return new Property("subject[x]", "CodeableConcept|Reference(Group)|canonical", "A code, group definition, or canonical reference that describes or identifies the intended subject of the activity being defined. Canonical references are allowed to support the definition of protocols for drug and substance quality specifications, and is allowed to reference a MedicinalProductDefinition, SubstanceDefinition, AdministrableProductDefinition, ManufacturedItemDefinition, or PackagedProductDefinition resource.", 0, 1, subject);
+ case -1257122603: /*subjectCodeableConcept*/ return new Property("subject[x]", "CodeableConcept", "A code, group definition, or canonical reference that describes or identifies the intended subject of the activity being defined. Canonical references are allowed to support the definition of protocols for drug and substance quality specifications, and is allowed to reference a MedicinalProductDefinition, SubstanceDefinition, AdministrableProductDefinition, ManufacturedItemDefinition, or PackagedProductDefinition resource.", 0, 1, subject);
+ case 772938623: /*subjectReference*/ return new Property("subject[x]", "Reference(Group)", "A code, group definition, or canonical reference that describes or identifies the intended subject of the activity being defined. Canonical references are allowed to support the definition of protocols for drug and substance quality specifications, and is allowed to reference a MedicinalProductDefinition, SubstanceDefinition, AdministrableProductDefinition, ManufacturedItemDefinition, or PackagedProductDefinition resource.", 0, 1, subject);
+ case -1768521432: /*subjectCanonical*/ return new Property("subject[x]", "canonical", "A code, group definition, or canonical reference that describes or identifies the intended subject of the activity being defined. Canonical references are allowed to support the definition of protocols for drug and substance quality specifications, and is allowed to reference a MedicinalProductDefinition, SubstanceDefinition, AdministrableProductDefinition, ManufacturedItemDefinition, or PackagedProductDefinition resource.", 0, 1, subject);
case 3076014: /*date*/ return new Property("date", "dateTime", "The date (and optionally time) when the activity definition was published. The date must change when the business version changes and it must change if the status code changes. In addition, it should change when the substantive content of the activity definition changes.", 0, 1, date);
case 1447404028: /*publisher*/ return new Property("publisher", "string", "The name of the organization or individual that published the activity definition.", 0, 1, publisher);
case 951526432: /*contact*/ return new Property("contact", "ContactDetail", "Contact details to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact);
@@ -3547,19 +3620,17 @@ public class ActivityDefinition extends MetadataResource {
case -1183762788: /*intent*/ return new Property("intent", "code", "Indicates the level of authority/intentionality associated with the activity and where the request should fit into the workflow chain.", 0, 1, intent);
case -1165461084: /*priority*/ return new Property("priority", "code", "Indicates how quickly the activity should be addressed with respect to other requests.", 0, 1, priority);
case -1788508167: /*doNotPerform*/ return new Property("doNotPerform", "boolean", "Set this to true if the definition is to indicate that a particular activity should NOT be performed. If true, this element should be interpreted to reinforce a negative coding. For example NPO as a code with a doNotPerform of true would still indicate to NOT perform the action.", 0, 1, doNotPerform);
- case 164632566: /*timing[x]*/ return new Property("timing[x]", "Timing|dateTime|Age|Period|Range|Duration", "The period, timing or frequency upon which the described activity is to occur.", 0, 1, timing);
- case -873664438: /*timing*/ return new Property("timing[x]", "Timing|dateTime|Age|Period|Range|Duration", "The period, timing or frequency upon which the described activity is to occur.", 0, 1, timing);
- case -497554124: /*timingTiming*/ return new Property("timing[x]", "Timing", "The period, timing or frequency upon which the described activity is to occur.", 0, 1, timing);
- case -1837458939: /*timingDateTime*/ return new Property("timing[x]", "dateTime", "The period, timing or frequency upon which the described activity is to occur.", 0, 1, timing);
- case 164607061: /*timingAge*/ return new Property("timing[x]", "Age", "The period, timing or frequency upon which the described activity is to occur.", 0, 1, timing);
- case -615615829: /*timingPeriod*/ return new Property("timing[x]", "Period", "The period, timing or frequency upon which the described activity is to occur.", 0, 1, timing);
- case -710871277: /*timingRange*/ return new Property("timing[x]", "Range", "The period, timing or frequency upon which the described activity is to occur.", 0, 1, timing);
- case -1327253506: /*timingDuration*/ return new Property("timing[x]", "Duration", "The period, timing or frequency upon which the described activity is to occur.", 0, 1, timing);
- case 1901043637: /*location*/ return new Property("location", "Reference(Location)", "Identifies the facility where the activity will occur; e.g. home, hospital, specific clinic, etc.", 0, 1, location);
+ case 164632566: /*timing[x]*/ return new Property("timing[x]", "Timing|Age|Range|Duration", "The timing or frequency upon which the described activity is to occur.", 0, 1, timing);
+ case -873664438: /*timing*/ return new Property("timing[x]", "Timing|Age|Range|Duration", "The timing or frequency upon which the described activity is to occur.", 0, 1, timing);
+ case -497554124: /*timingTiming*/ return new Property("timing[x]", "Timing", "The timing or frequency upon which the described activity is to occur.", 0, 1, timing);
+ case 164607061: /*timingAge*/ return new Property("timing[x]", "Age", "The timing or frequency upon which the described activity is to occur.", 0, 1, timing);
+ case -710871277: /*timingRange*/ return new Property("timing[x]", "Range", "The timing or frequency upon which the described activity is to occur.", 0, 1, timing);
+ case -1327253506: /*timingDuration*/ return new Property("timing[x]", "Duration", "The timing or frequency upon which the described activity is to occur.", 0, 1, timing);
+ case 1901043637: /*location*/ return new Property("location", "CodeableReference(Location)", "Identifies the facility where the activity will occur; e.g. home, hospital, specific clinic, etc.", 0, 1, location);
case 767422259: /*participant*/ return new Property("participant", "", "Indicates who should participate in performing the action described.", 0, java.lang.Integer.MAX_VALUE, participant);
- case 1753005361: /*product[x]*/ return new Property("product[x]", "Reference(Medication|Substance)|CodeableConcept", "Identifies the food, drug or other product being consumed or supplied in the activity.", 0, 1, product);
- case -309474065: /*product*/ return new Property("product[x]", "Reference(Medication|Substance)|CodeableConcept", "Identifies the food, drug or other product being consumed or supplied in the activity.", 0, 1, product);
- case -669667556: /*productReference*/ return new Property("product[x]", "Reference(Medication|Substance)", "Identifies the food, drug or other product being consumed or supplied in the activity.", 0, 1, product);
+ case 1753005361: /*product[x]*/ return new Property("product[x]", "Reference(Medication|Substance|Ingredient)|CodeableConcept", "Identifies the food, drug or other product being consumed or supplied in the activity.", 0, 1, product);
+ case -309474065: /*product*/ return new Property("product[x]", "Reference(Medication|Substance|Ingredient)|CodeableConcept", "Identifies the food, drug or other product being consumed or supplied in the activity.", 0, 1, product);
+ case -669667556: /*productReference*/ return new Property("product[x]", "Reference(Medication|Substance|Ingredient)", "Identifies the food, drug or other product being consumed or supplied in the activity.", 0, 1, product);
case 906854066: /*productCodeableConcept*/ return new Property("product[x]", "CodeableConcept", "Identifies the food, drug or other product being consumed or supplied in the activity.", 0, 1, product);
case -1285004149: /*quantity*/ return new Property("quantity", "Quantity", "Identifies the quantity expected to be consumed at once (per dose, per meal, etc.).", 0, 1, quantity);
case -1326018889: /*dosage*/ return new Property("dosage", "Dosage", "Provides detailed dosage instructions in the same way that they are described for MedicationRequest resources.", 0, java.lang.Integer.MAX_VALUE, dosage);
@@ -3612,7 +3683,7 @@ public class ActivityDefinition extends MetadataResource {
case -1165461084: /*priority*/ return this.priority == null ? new Base[0] : new Base[] {this.priority}; // Enumeration
case -1788508167: /*doNotPerform*/ return this.doNotPerform == null ? new Base[0] : new Base[] {this.doNotPerform}; // BooleanType
case -873664438: /*timing*/ return this.timing == null ? new Base[0] : new Base[] {this.timing}; // DataType
- case 1901043637: /*location*/ return this.location == null ? new Base[0] : new Base[] {this.location}; // Reference
+ case 1901043637: /*location*/ return this.location == null ? new Base[0] : new Base[] {this.location}; // CodeableReference
case 767422259: /*participant*/ return this.participant == null ? new Base[0] : this.participant.toArray(new Base[this.participant.size()]); // ActivityDefinitionParticipantComponent
case -309474065: /*product*/ return this.product == null ? new Base[0] : new Base[] {this.product}; // DataType
case -1285004149: /*quantity*/ return this.quantity == null ? new Base[0] : new Base[] {this.quantity}; // Quantity
@@ -3741,7 +3812,7 @@ public class ActivityDefinition extends MetadataResource {
this.timing = TypeConvertor.castToType(value); // DataType
return value;
case 1901043637: // location
- this.location = TypeConvertor.castToReference(value); // Reference
+ this.location = TypeConvertor.castToCodeableReference(value); // CodeableReference
return value;
case 767422259: // participant
this.getParticipant().add((ActivityDefinitionParticipantComponent) value); // ActivityDefinitionParticipantComponent
@@ -3855,7 +3926,7 @@ public class ActivityDefinition extends MetadataResource {
} else if (name.equals("timing[x]")) {
this.timing = TypeConvertor.castToType(value); // DataType
} else if (name.equals("location")) {
- this.location = TypeConvertor.castToReference(value); // Reference
+ this.location = TypeConvertor.castToCodeableReference(value); // CodeableReference
} else if (name.equals("participant")) {
this.getParticipant().add((ActivityDefinitionParticipantComponent) value);
} else if (name.equals("product[x]")) {
@@ -3949,7 +4020,7 @@ public class ActivityDefinition extends MetadataResource {
case -2060497896: /*subtitle*/ return new String[] {"string"};
case -892481550: /*status*/ return new String[] {"code"};
case -404562712: /*experimental*/ return new String[] {"boolean"};
- case -1867885268: /*subject*/ return new String[] {"CodeableConcept", "Reference"};
+ case -1867885268: /*subject*/ return new String[] {"CodeableConcept", "Reference", "canonical"};
case 3076014: /*date*/ return new String[] {"dateTime"};
case 1447404028: /*publisher*/ return new String[] {"string"};
case 951526432: /*contact*/ return new String[] {"ContactDetail"};
@@ -3975,8 +4046,8 @@ public class ActivityDefinition extends MetadataResource {
case -1183762788: /*intent*/ return new String[] {"code"};
case -1165461084: /*priority*/ return new String[] {"code"};
case -1788508167: /*doNotPerform*/ return new String[] {"boolean"};
- case -873664438: /*timing*/ return new String[] {"Timing", "dateTime", "Age", "Period", "Range", "Duration"};
- case 1901043637: /*location*/ return new String[] {"Reference"};
+ case -873664438: /*timing*/ return new String[] {"Timing", "Age", "Range", "Duration"};
+ case 1901043637: /*location*/ return new String[] {"CodeableReference"};
case 767422259: /*participant*/ return new String[] {};
case -309474065: /*product*/ return new String[] {"Reference", "CodeableConcept"};
case -1285004149: /*quantity*/ return new String[] {"Quantity"};
@@ -4026,6 +4097,10 @@ public class ActivityDefinition extends MetadataResource {
this.subject = new Reference();
return this.subject;
}
+ else if (name.equals("subjectCanonical")) {
+ this.subject = new CanonicalType();
+ return this.subject;
+ }
else if (name.equals("date")) {
throw new FHIRException("Cannot call addChild on a primitive type ActivityDefinition.date");
}
@@ -4107,18 +4182,10 @@ public class ActivityDefinition extends MetadataResource {
this.timing = new Timing();
return this.timing;
}
- else if (name.equals("timingDateTime")) {
- this.timing = new DateTimeType();
- return this.timing;
- }
else if (name.equals("timingAge")) {
this.timing = new Age();
return this.timing;
}
- else if (name.equals("timingPeriod")) {
- this.timing = new Period();
- return this.timing;
- }
else if (name.equals("timingRange")) {
this.timing = new Range();
return this.timing;
@@ -4128,7 +4195,7 @@ public class ActivityDefinition extends MetadataResource {
return this.timing;
}
else if (name.equals("location")) {
- this.location = new Reference();
+ this.location = new CodeableReference();
return this.location;
}
else if (name.equals("participant")) {
@@ -4376,7 +4443,7 @@ public class ActivityDefinition extends MetadataResource {
* Path: ActivityDefinition.relatedArtifact.where(type='composed-of').resource
*
*/
- @SearchParamDefinition(name="composed-of", path="ActivityDefinition.relatedArtifact.where(type='composed-of').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="composed-of", path="ActivityDefinition.relatedArtifact.where(type='composed-of').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUsage.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, InventoryReport.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_COMPOSED_OF = "composed-of";
/**
* Fluent Client search parameter constant for composed-of
@@ -4394,6 +4461,26 @@ public class ActivityDefinition extends MetadataResource {
*/
public static final ca.uhn.fhir.model.api.Include INCLUDE_COMPOSED_OF = new ca.uhn.fhir.model.api.Include("ActivityDefinition:composed-of").toLocked();
+ /**
+ * Search parameter: context
+ *
+ * Description: A use context assigned to the activity definition
+ * Type: token
+ * Path: (ActivityDefinition.useContext.value as CodeableConcept)
+ *
+ */
+ @SearchParamDefinition(name="context", path="(ActivityDefinition.useContext.value as CodeableConcept)", description="A use context assigned to the activity definition", type="token" )
+ public static final String SP_CONTEXT = "context";
+ /**
+ * Fluent Client search parameter constant for context
+ *
+ * Description: A use context assigned to the activity definition
+ * Type: token
+ * Path: (ActivityDefinition.useContext.value as CodeableConcept)
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT);
+
/**
* Search parameter: context-quantity
*
@@ -4414,46 +4501,6 @@ public class ActivityDefinition extends MetadataResource {
*/
public static final ca.uhn.fhir.rest.gclient.QuantityClientParam CONTEXT_QUANTITY = new ca.uhn.fhir.rest.gclient.QuantityClientParam(SP_CONTEXT_QUANTITY);
- /**
- * Search parameter: context-type-quantity
- *
- * Description: A use context type and quantity- or range-based value assigned to the activity definition
- * Type: composite
- * Path: ActivityDefinition.useContext
- *
- */
- @SearchParamDefinition(name="context-type-quantity", path="ActivityDefinition.useContext", description="A use context type and quantity- or range-based value assigned to the activity definition", type="composite", compositeOf={"context-type", "context-quantity"} )
- public static final String SP_CONTEXT_TYPE_QUANTITY = "context-type-quantity";
- /**
- * Fluent Client search parameter constant for context-type-quantity
- *
- * Description: A use context type and quantity- or range-based value assigned to the activity definition
- * Type: composite
- * Path: ActivityDefinition.useContext
- *
- */
- public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_QUANTITY);
-
- /**
- * Search parameter: context-type-value
- *
- * Description: A use context type and value assigned to the activity definition
- * Type: composite
- * Path: ActivityDefinition.useContext
- *
- */
- @SearchParamDefinition(name="context-type-value", path="ActivityDefinition.useContext", description="A use context type and value assigned to the activity definition", type="composite", compositeOf={"context-type", "context"} )
- public static final String SP_CONTEXT_TYPE_VALUE = "context-type-value";
- /**
- * Fluent Client search parameter constant for context-type-value
- *
- * Description: A use context type and value assigned to the activity definition
- * Type: composite
- * Path: ActivityDefinition.useContext
- *
- */
- public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_VALUE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_VALUE);
-
/**
* Search parameter: context-type
*
@@ -4474,26 +4521,6 @@ public class ActivityDefinition extends MetadataResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT_TYPE);
- /**
- * Search parameter: context
- *
- * Description: A use context assigned to the activity definition
- * Type: token
- * Path: (ActivityDefinition.useContext.value as CodeableConcept)
- *
- */
- @SearchParamDefinition(name="context", path="(ActivityDefinition.useContext.value as CodeableConcept)", description="A use context assigned to the activity definition", type="token" )
- public static final String SP_CONTEXT = "context";
- /**
- * Fluent Client search parameter constant for context
- *
- * Description: A use context assigned to the activity definition
- * Type: token
- * Path: (ActivityDefinition.useContext.value as CodeableConcept)
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT);
-
/**
* Search parameter: date
*
@@ -4522,7 +4549,7 @@ public class ActivityDefinition extends MetadataResource {
* Path: ActivityDefinition.relatedArtifact.where(type='depends-on').resource | ActivityDefinition.library
*
*/
- @SearchParamDefinition(name="depends-on", path="ActivityDefinition.relatedArtifact.where(type='depends-on').resource | ActivityDefinition.library", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="depends-on", path="ActivityDefinition.relatedArtifact.where(type='depends-on').resource | ActivityDefinition.library", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUsage.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, InventoryReport.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_DEPENDS_ON = "depends-on";
/**
* Fluent Client search parameter constant for depends-on
@@ -4548,7 +4575,7 @@ public class ActivityDefinition extends MetadataResource {
* Path: ActivityDefinition.relatedArtifact.where(type='derived-from').resource
*
*/
- @SearchParamDefinition(name="derived-from", path="ActivityDefinition.relatedArtifact.where(type='derived-from').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="derived-from", path="ActivityDefinition.relatedArtifact.where(type='derived-from').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUsage.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, InventoryReport.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_DERIVED_FROM = "derived-from";
/**
* Fluent Client search parameter constant for derived-from
@@ -4674,7 +4701,7 @@ public class ActivityDefinition extends MetadataResource {
* Path: ActivityDefinition.relatedArtifact.where(type='predecessor').resource
*
*/
- @SearchParamDefinition(name="predecessor", path="ActivityDefinition.relatedArtifact.where(type='predecessor').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="predecessor", path="ActivityDefinition.relatedArtifact.where(type='predecessor').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUsage.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, InventoryReport.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_PREDECESSOR = "predecessor";
/**
* Fluent Client search parameter constant for predecessor
@@ -4740,7 +4767,7 @@ public class ActivityDefinition extends MetadataResource {
* Path: ActivityDefinition.relatedArtifact.where(type='successor').resource
*
*/
- @SearchParamDefinition(name="successor", path="ActivityDefinition.relatedArtifact.where(type='successor').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="successor", path="ActivityDefinition.relatedArtifact.where(type='successor').resource", description="What resource is being referenced", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUsage.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, InventoryReport.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_SUCCESSOR = "successor";
/**
* Fluent Client search parameter constant for successor
@@ -4838,6 +4865,46 @@ public class ActivityDefinition extends MetadataResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
+ /**
+ * Search parameter: context-type-quantity
+ *
+ * Description: A use context type and quantity- or range-based value assigned to the activity definition
+ * Type: composite
+ * Path: ActivityDefinition.useContext
+ *
+ */
+ @SearchParamDefinition(name="context-type-quantity", path="ActivityDefinition.useContext", description="A use context type and quantity- or range-based value assigned to the activity definition", type="composite", compositeOf={"context-type", "context-quantity"} )
+ public static final String SP_CONTEXT_TYPE_QUANTITY = "context-type-quantity";
+ /**
+ * Fluent Client search parameter constant for context-type-quantity
+ *
+ * Description: A use context type and quantity- or range-based value assigned to the activity definition
+ * Type: composite
+ * Path: ActivityDefinition.useContext
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_QUANTITY);
+
+ /**
+ * Search parameter: context-type-value
+ *
+ * Description: A use context type and value assigned to the activity definition
+ * Type: composite
+ * Path: ActivityDefinition.useContext
+ *
+ */
+ @SearchParamDefinition(name="context-type-value", path="ActivityDefinition.useContext", description="A use context type and value assigned to the activity definition", type="composite", compositeOf={"context-type", "context"} )
+ public static final String SP_CONTEXT_TYPE_VALUE = "context-type-value";
+ /**
+ * Fluent Client search parameter constant for context-type-value
+ *
+ * Description: A use context type and value assigned to the activity definition
+ * Type: composite
+ * Path: ActivityDefinition.useContext
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_VALUE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_VALUE);
+
}
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Address.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Address.java
index 4ae4aee8c..ee13ff0d5 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Address.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Address.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -87,7 +87,6 @@ public class Address extends DataType implements ICompositeType {
case POSTAL: return "postal";
case PHYSICAL: return "physical";
case BOTH: return "both";
- case NULL: return null;
default: return "?";
}
}
@@ -96,7 +95,6 @@ public class Address extends DataType implements ICompositeType {
case POSTAL: return "http://hl7.org/fhir/address-type";
case PHYSICAL: return "http://hl7.org/fhir/address-type";
case BOTH: return "http://hl7.org/fhir/address-type";
- case NULL: return null;
default: return "?";
}
}
@@ -105,7 +103,6 @@ public class Address extends DataType implements ICompositeType {
case POSTAL: return "Mailing addresses - PO Boxes and care-of addresses.";
case PHYSICAL: return "A physical address that can be visited.";
case BOTH: return "An address that is both physical and postal.";
- case NULL: return null;
default: return "?";
}
}
@@ -114,7 +111,6 @@ public class Address extends DataType implements ICompositeType {
case POSTAL: return "Postal";
case PHYSICAL: return "Physical";
case BOTH: return "Postal & Physical";
- case NULL: return null;
default: return "?";
}
}
@@ -213,7 +209,6 @@ public class Address extends DataType implements ICompositeType {
case TEMP: return "temp";
case OLD: return "old";
case BILLING: return "billing";
- case NULL: return null;
default: return "?";
}
}
@@ -224,7 +219,6 @@ public class Address extends DataType implements ICompositeType {
case TEMP: return "http://hl7.org/fhir/address-use";
case OLD: return "http://hl7.org/fhir/address-use";
case BILLING: return "http://hl7.org/fhir/address-use";
- case NULL: return null;
default: return "?";
}
}
@@ -235,7 +229,6 @@ public class Address extends DataType implements ICompositeType {
case TEMP: return "A temporary address. The period can provide more detailed information.";
case OLD: return "This address is no longer in use (or was never correct but retained for records).";
case BILLING: return "An address to be used to send bills, invoices, receipts etc.";
- case NULL: return null;
default: return "?";
}
}
@@ -246,7 +239,6 @@ public class Address extends DataType implements ICompositeType {
case TEMP: return "Temporary";
case OLD: return "Old / Incorrect";
case BILLING: return "Billing";
- case NULL: return null;
default: return "?";
}
}
@@ -369,7 +361,7 @@ public class Address extends DataType implements ICompositeType {
* Country - a nation as commonly understood or generally accepted.
*/
@Child(name = "country", type = {StringType.class}, order=8, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="Country (e.g. can be ISO 3166 2 or 3 letter code)", formalDefinition="Country - a nation as commonly understood or generally accepted." )
+ @Description(shortDefinition="Country (e.g. may be ISO 3166 2 or 3 letter code)", formalDefinition="Country - a nation as commonly understood or generally accepted." )
protected StringType country;
/**
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdministrableProductDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdministrableProductDefinition.java
index 77bce65af..fcfa45c64 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdministrableProductDefinition.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdministrableProductDefinition.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -48,7 +48,7 @@ import ca.uhn.fhir.model.api.annotation.Description;
import ca.uhn.fhir.model.api.annotation.Block;
/**
- * A pharmaceutical product described in terms of its composition and dose form.
+ * A medicinal product in the final form which is suitable for administering to a patient (after any mixing of multiple components, dissolution etc. has been performed).
*/
@ResourceDef(name="AdministrableProductDefinition", profile="http://hl7.org/fhir/StructureDefinition/AdministrableProductDefinition")
public class AdministrableProductDefinition extends DomainResource {
@@ -414,38 +414,38 @@ public class AdministrableProductDefinition extends DomainResource {
protected CodeableConcept code;
/**
- * The first dose (dose quantity) administered in humans can be specified, for a product under investigation, using a numerical value and its unit of measurement.
+ * The first dose (dose quantity) administered can be specified for the product, using a numerical value and its unit of measurement.
*/
@Child(name = "firstDose", type = {Quantity.class}, order=2, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="The first dose (dose quantity) administered in humans can be specified, for a product under investigation, using a numerical value and its unit of measurement", formalDefinition="The first dose (dose quantity) administered in humans can be specified, for a product under investigation, using a numerical value and its unit of measurement." )
+ @Description(shortDefinition="The first dose (dose quantity) administered can be specified for the product, using a numerical value and its unit of measurement", formalDefinition="The first dose (dose quantity) administered can be specified for the product, using a numerical value and its unit of measurement." )
protected Quantity firstDose;
/**
- * The maximum single dose that can be administered as per the protocol of a clinical trial can be specified using a numerical value and its unit of measurement.
+ * The maximum single dose that can be administered, can be specified using a numerical value and its unit of measurement.
*/
@Child(name = "maxSingleDose", type = {Quantity.class}, order=3, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="The maximum single dose that can be administered as per the protocol of a clinical trial can be specified using a numerical value and its unit of measurement", formalDefinition="The maximum single dose that can be administered as per the protocol of a clinical trial can be specified using a numerical value and its unit of measurement." )
+ @Description(shortDefinition="The maximum single dose that can be administered, can be specified using a numerical value and its unit of measurement", formalDefinition="The maximum single dose that can be administered, can be specified using a numerical value and its unit of measurement." )
protected Quantity maxSingleDose;
/**
- * The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered as per the protocol referenced in the clinical trial authorisation.
+ * The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered.
*/
@Child(name = "maxDosePerDay", type = {Quantity.class}, order=4, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered as per the protocol referenced in the clinical trial authorisation", formalDefinition="The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered as per the protocol referenced in the clinical trial authorisation." )
+ @Description(shortDefinition="The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered", formalDefinition="The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered." )
protected Quantity maxDosePerDay;
/**
- * The maximum dose per treatment period that can be administered as per the protocol referenced in the clinical trial authorisation.
+ * The maximum dose per treatment period that can be administered.
*/
@Child(name = "maxDosePerTreatmentPeriod", type = {Ratio.class}, order=5, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="The maximum dose per treatment period that can be administered as per the protocol referenced in the clinical trial authorisation", formalDefinition="The maximum dose per treatment period that can be administered as per the protocol referenced in the clinical trial authorisation." )
+ @Description(shortDefinition="The maximum dose per treatment period that can be administered", formalDefinition="The maximum dose per treatment period that can be administered." )
protected Ratio maxDosePerTreatmentPeriod;
/**
- * The maximum treatment period during which an Investigational Medicinal Product can be administered as per the protocol referenced in the clinical trial authorisation.
+ * The maximum treatment period during which an Investigational Medicinal Product can be administered.
*/
@Child(name = "maxTreatmentPeriod", type = {Duration.class}, order=6, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="The maximum treatment period during which an Investigational Medicinal Product can be administered as per the protocol referenced in the clinical trial authorisation", formalDefinition="The maximum treatment period during which an Investigational Medicinal Product can be administered as per the protocol referenced in the clinical trial authorisation." )
+ @Description(shortDefinition="The maximum treatment period during which an Investigational Medicinal Product can be administered", formalDefinition="The maximum treatment period during which an Investigational Medicinal Product can be administered." )
protected Duration maxTreatmentPeriod;
/**
@@ -497,7 +497,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @return {@link #firstDose} (The first dose (dose quantity) administered in humans can be specified, for a product under investigation, using a numerical value and its unit of measurement.)
+ * @return {@link #firstDose} (The first dose (dose quantity) administered can be specified for the product, using a numerical value and its unit of measurement.)
*/
public Quantity getFirstDose() {
if (this.firstDose == null)
@@ -513,7 +513,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @param value {@link #firstDose} (The first dose (dose quantity) administered in humans can be specified, for a product under investigation, using a numerical value and its unit of measurement.)
+ * @param value {@link #firstDose} (The first dose (dose quantity) administered can be specified for the product, using a numerical value and its unit of measurement.)
*/
public AdministrableProductDefinitionRouteOfAdministrationComponent setFirstDose(Quantity value) {
this.firstDose = value;
@@ -521,7 +521,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @return {@link #maxSingleDose} (The maximum single dose that can be administered as per the protocol of a clinical trial can be specified using a numerical value and its unit of measurement.)
+ * @return {@link #maxSingleDose} (The maximum single dose that can be administered, can be specified using a numerical value and its unit of measurement.)
*/
public Quantity getMaxSingleDose() {
if (this.maxSingleDose == null)
@@ -537,7 +537,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @param value {@link #maxSingleDose} (The maximum single dose that can be administered as per the protocol of a clinical trial can be specified using a numerical value and its unit of measurement.)
+ * @param value {@link #maxSingleDose} (The maximum single dose that can be administered, can be specified using a numerical value and its unit of measurement.)
*/
public AdministrableProductDefinitionRouteOfAdministrationComponent setMaxSingleDose(Quantity value) {
this.maxSingleDose = value;
@@ -545,7 +545,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @return {@link #maxDosePerDay} (The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered as per the protocol referenced in the clinical trial authorisation.)
+ * @return {@link #maxDosePerDay} (The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered.)
*/
public Quantity getMaxDosePerDay() {
if (this.maxDosePerDay == null)
@@ -561,7 +561,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @param value {@link #maxDosePerDay} (The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered as per the protocol referenced in the clinical trial authorisation.)
+ * @param value {@link #maxDosePerDay} (The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered.)
*/
public AdministrableProductDefinitionRouteOfAdministrationComponent setMaxDosePerDay(Quantity value) {
this.maxDosePerDay = value;
@@ -569,7 +569,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @return {@link #maxDosePerTreatmentPeriod} (The maximum dose per treatment period that can be administered as per the protocol referenced in the clinical trial authorisation.)
+ * @return {@link #maxDosePerTreatmentPeriod} (The maximum dose per treatment period that can be administered.)
*/
public Ratio getMaxDosePerTreatmentPeriod() {
if (this.maxDosePerTreatmentPeriod == null)
@@ -585,7 +585,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @param value {@link #maxDosePerTreatmentPeriod} (The maximum dose per treatment period that can be administered as per the protocol referenced in the clinical trial authorisation.)
+ * @param value {@link #maxDosePerTreatmentPeriod} (The maximum dose per treatment period that can be administered.)
*/
public AdministrableProductDefinitionRouteOfAdministrationComponent setMaxDosePerTreatmentPeriod(Ratio value) {
this.maxDosePerTreatmentPeriod = value;
@@ -593,7 +593,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @return {@link #maxTreatmentPeriod} (The maximum treatment period during which an Investigational Medicinal Product can be administered as per the protocol referenced in the clinical trial authorisation.)
+ * @return {@link #maxTreatmentPeriod} (The maximum treatment period during which an Investigational Medicinal Product can be administered.)
*/
public Duration getMaxTreatmentPeriod() {
if (this.maxTreatmentPeriod == null)
@@ -609,7 +609,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @param value {@link #maxTreatmentPeriod} (The maximum treatment period during which an Investigational Medicinal Product can be administered as per the protocol referenced in the clinical trial authorisation.)
+ * @param value {@link #maxTreatmentPeriod} (The maximum treatment period during which an Investigational Medicinal Product can be administered.)
*/
public AdministrableProductDefinitionRouteOfAdministrationComponent setMaxTreatmentPeriod(Duration value) {
this.maxTreatmentPeriod = value;
@@ -672,11 +672,11 @@ public class AdministrableProductDefinition extends DomainResource {
protected void listChildren(List children) {
super.listChildren(children);
children.add(new Property("code", "CodeableConcept", "Coded expression for the route.", 0, 1, code));
- children.add(new Property("firstDose", "Quantity", "The first dose (dose quantity) administered in humans can be specified, for a product under investigation, using a numerical value and its unit of measurement.", 0, 1, firstDose));
- children.add(new Property("maxSingleDose", "Quantity", "The maximum single dose that can be administered as per the protocol of a clinical trial can be specified using a numerical value and its unit of measurement.", 0, 1, maxSingleDose));
- children.add(new Property("maxDosePerDay", "Quantity", "The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered as per the protocol referenced in the clinical trial authorisation.", 0, 1, maxDosePerDay));
- children.add(new Property("maxDosePerTreatmentPeriod", "Ratio", "The maximum dose per treatment period that can be administered as per the protocol referenced in the clinical trial authorisation.", 0, 1, maxDosePerTreatmentPeriod));
- children.add(new Property("maxTreatmentPeriod", "Duration", "The maximum treatment period during which an Investigational Medicinal Product can be administered as per the protocol referenced in the clinical trial authorisation.", 0, 1, maxTreatmentPeriod));
+ children.add(new Property("firstDose", "Quantity", "The first dose (dose quantity) administered can be specified for the product, using a numerical value and its unit of measurement.", 0, 1, firstDose));
+ children.add(new Property("maxSingleDose", "Quantity", "The maximum single dose that can be administered, can be specified using a numerical value and its unit of measurement.", 0, 1, maxSingleDose));
+ children.add(new Property("maxDosePerDay", "Quantity", "The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered.", 0, 1, maxDosePerDay));
+ children.add(new Property("maxDosePerTreatmentPeriod", "Ratio", "The maximum dose per treatment period that can be administered.", 0, 1, maxDosePerTreatmentPeriod));
+ children.add(new Property("maxTreatmentPeriod", "Duration", "The maximum treatment period during which an Investigational Medicinal Product can be administered.", 0, 1, maxTreatmentPeriod));
children.add(new Property("targetSpecies", "", "A species for which this route applies.", 0, java.lang.Integer.MAX_VALUE, targetSpecies));
}
@@ -684,11 +684,11 @@ public class AdministrableProductDefinition extends DomainResource {
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
case 3059181: /*code*/ return new Property("code", "CodeableConcept", "Coded expression for the route.", 0, 1, code);
- case 132551405: /*firstDose*/ return new Property("firstDose", "Quantity", "The first dose (dose quantity) administered in humans can be specified, for a product under investigation, using a numerical value and its unit of measurement.", 0, 1, firstDose);
- case -259207927: /*maxSingleDose*/ return new Property("maxSingleDose", "Quantity", "The maximum single dose that can be administered as per the protocol of a clinical trial can be specified using a numerical value and its unit of measurement.", 0, 1, maxSingleDose);
- case -2017475520: /*maxDosePerDay*/ return new Property("maxDosePerDay", "Quantity", "The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered as per the protocol referenced in the clinical trial authorisation.", 0, 1, maxDosePerDay);
- case -608040195: /*maxDosePerTreatmentPeriod*/ return new Property("maxDosePerTreatmentPeriod", "Ratio", "The maximum dose per treatment period that can be administered as per the protocol referenced in the clinical trial authorisation.", 0, 1, maxDosePerTreatmentPeriod);
- case 920698453: /*maxTreatmentPeriod*/ return new Property("maxTreatmentPeriod", "Duration", "The maximum treatment period during which an Investigational Medicinal Product can be administered as per the protocol referenced in the clinical trial authorisation.", 0, 1, maxTreatmentPeriod);
+ case 132551405: /*firstDose*/ return new Property("firstDose", "Quantity", "The first dose (dose quantity) administered can be specified for the product, using a numerical value and its unit of measurement.", 0, 1, firstDose);
+ case -259207927: /*maxSingleDose*/ return new Property("maxSingleDose", "Quantity", "The maximum single dose that can be administered, can be specified using a numerical value and its unit of measurement.", 0, 1, maxSingleDose);
+ case -2017475520: /*maxDosePerDay*/ return new Property("maxDosePerDay", "Quantity", "The maximum dose per day (maximum dose quantity to be administered in any one 24-h period) that can be administered.", 0, 1, maxDosePerDay);
+ case -608040195: /*maxDosePerTreatmentPeriod*/ return new Property("maxDosePerTreatmentPeriod", "Ratio", "The maximum dose per treatment period that can be administered.", 0, 1, maxDosePerTreatmentPeriod);
+ case 920698453: /*maxTreatmentPeriod*/ return new Property("maxTreatmentPeriod", "Duration", "The maximum treatment period during which an Investigational Medicinal Product can be administered.", 0, 1, maxTreatmentPeriod);
case 295481963: /*targetSpecies*/ return new Property("targetSpecies", "", "A species for which this route applies.", 0, java.lang.Integer.MAX_VALUE, targetSpecies);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -1404,31 +1404,31 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * An identifier for the pharmaceutical medicinal product.
+ * An identifier for the administrable product.
*/
@Child(name = "identifier", type = {Identifier.class}, order=0, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
- @Description(shortDefinition="An identifier for the pharmaceutical medicinal product", formalDefinition="An identifier for the pharmaceutical medicinal product." )
+ @Description(shortDefinition="An identifier for the administrable product", formalDefinition="An identifier for the administrable product." )
protected List identifier;
/**
- * The product that this is a pharmaceutical product of.
+ * The medicinal product that this is an administrable form of. This is not a reference to the item(s) that make up this administrable form - it is the whole product.
*/
@Child(name = "subject", type = {MedicinalProductDefinition.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
- @Description(shortDefinition="The product that this is a pharmaceutical product of", formalDefinition="The product that this is a pharmaceutical product of." )
+ @Description(shortDefinition="The medicinal product that this is an administrable form of. This is not a reference to the item(s) that make up this administrable form - it is the whole product", formalDefinition="The medicinal product that this is an administrable form of. This is not a reference to the item(s) that make up this administrable form - it is the whole product." )
protected List subject;
/**
- * The administrable dose form, after necessary reconstitution.
+ * The administrable dose form, i.e. the dose form of the final product after necessary reconstitution or processing.
*/
@Child(name = "administrableDoseForm", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="The administrable dose form, after necessary reconstitution", formalDefinition="The administrable dose form, after necessary reconstitution." )
+ @Description(shortDefinition="The administrable dose form, i.e. the dose form of the final product after necessary reconstitution or processing", formalDefinition="The administrable dose form, i.e. the dose form of the final product after necessary reconstitution or processing." )
protected CodeableConcept administrableDoseForm;
/**
- * Todo.
+ * The units of presentation for the administrable product, for example 'tablet'.
*/
@Child(name = "unitOfPresentation", type = {CodeableConcept.class}, order=3, min=0, max=1, modifier=false, summary=true)
- @Description(shortDefinition="Todo", formalDefinition="Todo." )
+ @Description(shortDefinition="The units of presentation for the administrable product, for example 'tablet'", formalDefinition="The units of presentation for the administrable product, for example 'tablet'." )
protected CodeableConcept unitOfPresentation;
/**
@@ -1439,17 +1439,17 @@ public class AdministrableProductDefinition extends DomainResource {
protected List producedFrom;
/**
- * The ingredients of this administrable pharmaceutical product.
+ * The ingredients of this administrable medicinal product. Sometimes it may be appropriate to specify these via the associated manufactured item(s).
*/
@Child(name = "ingredient", type = {Ingredient.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
- @Description(shortDefinition="The ingredients of this administrable pharmaceutical product", formalDefinition="The ingredients of this administrable pharmaceutical product." )
+ @Description(shortDefinition="The ingredients of this administrable medicinal product. Sometimes it may be appropriate to specify these via the associated manufactured item(s)", formalDefinition="The ingredients of this administrable medicinal product. Sometimes it may be appropriate to specify these via the associated manufactured item(s)." )
protected List ingredient;
/**
- * Accompanying device.
+ * A device that is integral to the medicinal product, in effect being considered as an "ingredient" of the medicinal product. This is not intended for devices that are just co-packaged.
*/
@Child(name = "device", type = {DeviceDefinition.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
- @Description(shortDefinition="Accompanying device", formalDefinition="Accompanying device." )
+ @Description(shortDefinition="A device that is integral to the medicinal product, in effect being considered as an \"ingredient\" of the medicinal product. This is not intended for devices that are just co-packaged", formalDefinition="A device that is integral to the medicinal product, in effect being considered as an \"ingredient\" of the medicinal product. This is not intended for devices that are just co-packaged." )
protected List device;
/**
@@ -1460,10 +1460,10 @@ public class AdministrableProductDefinition extends DomainResource {
protected List property;
/**
- * The path by which the pharmaceutical product is taken into or makes contact with the body.
+ * The path by which the product is taken into or makes contact with the body. In some regions this is referred to as the licenced or approved route.
*/
@Child(name = "routeOfAdministration", type = {}, order=8, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
- @Description(shortDefinition="The path by which the pharmaceutical product is taken into or makes contact with the body", formalDefinition="The path by which the pharmaceutical product is taken into or makes contact with the body." )
+ @Description(shortDefinition="The path by which the product is taken into or makes contact with the body. In some regions this is referred to as the licenced or approved route", formalDefinition="The path by which the product is taken into or makes contact with the body. In some regions this is referred to as the licenced or approved route." )
protected List routeOfAdministration;
private static final long serialVersionUID = -1072766896L;
@@ -1484,7 +1484,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @return {@link #identifier} (An identifier for the pharmaceutical medicinal product.)
+ * @return {@link #identifier} (An identifier for the administrable product.)
*/
public List getIdentifier() {
if (this.identifier == null)
@@ -1537,7 +1537,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @return {@link #subject} (The product that this is a pharmaceutical product of.)
+ * @return {@link #subject} (The medicinal product that this is an administrable form of. This is not a reference to the item(s) that make up this administrable form - it is the whole product.)
*/
public List getSubject() {
if (this.subject == null)
@@ -1590,7 +1590,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @return {@link #administrableDoseForm} (The administrable dose form, after necessary reconstitution.)
+ * @return {@link #administrableDoseForm} (The administrable dose form, i.e. the dose form of the final product after necessary reconstitution or processing.)
*/
public CodeableConcept getAdministrableDoseForm() {
if (this.administrableDoseForm == null)
@@ -1606,7 +1606,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @param value {@link #administrableDoseForm} (The administrable dose form, after necessary reconstitution.)
+ * @param value {@link #administrableDoseForm} (The administrable dose form, i.e. the dose form of the final product after necessary reconstitution or processing.)
*/
public AdministrableProductDefinition setAdministrableDoseForm(CodeableConcept value) {
this.administrableDoseForm = value;
@@ -1614,7 +1614,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @return {@link #unitOfPresentation} (Todo.)
+ * @return {@link #unitOfPresentation} (The units of presentation for the administrable product, for example 'tablet'.)
*/
public CodeableConcept getUnitOfPresentation() {
if (this.unitOfPresentation == null)
@@ -1630,7 +1630,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @param value {@link #unitOfPresentation} (Todo.)
+ * @param value {@link #unitOfPresentation} (The units of presentation for the administrable product, for example 'tablet'.)
*/
public AdministrableProductDefinition setUnitOfPresentation(CodeableConcept value) {
this.unitOfPresentation = value;
@@ -1691,7 +1691,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @return {@link #ingredient} (The ingredients of this administrable pharmaceutical product.)
+ * @return {@link #ingredient} (The ingredients of this administrable medicinal product. Sometimes it may be appropriate to specify these via the associated manufactured item(s).)
*/
public List getIngredient() {
if (this.ingredient == null)
@@ -1744,7 +1744,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @return {@link #device} (Accompanying device.)
+ * @return {@link #device} (A device that is integral to the medicinal product, in effect being considered as an "ingredient" of the medicinal product. This is not intended for devices that are just co-packaged.)
*/
public List getDevice() {
if (this.device == null)
@@ -1850,7 +1850,7 @@ public class AdministrableProductDefinition extends DomainResource {
}
/**
- * @return {@link #routeOfAdministration} (The path by which the pharmaceutical product is taken into or makes contact with the body.)
+ * @return {@link #routeOfAdministration} (The path by which the product is taken into or makes contact with the body. In some regions this is referred to as the licenced or approved route.)
*/
public List getRouteOfAdministration() {
if (this.routeOfAdministration == null)
@@ -1904,29 +1904,29 @@ public class AdministrableProductDefinition extends DomainResource {
protected void listChildren(List children) {
super.listChildren(children);
- children.add(new Property("identifier", "Identifier", "An identifier for the pharmaceutical medicinal product.", 0, java.lang.Integer.MAX_VALUE, identifier));
- children.add(new Property("subject", "Reference(MedicinalProductDefinition)", "The product that this is a pharmaceutical product of.", 0, java.lang.Integer.MAX_VALUE, subject));
- children.add(new Property("administrableDoseForm", "CodeableConcept", "The administrable dose form, after necessary reconstitution.", 0, 1, administrableDoseForm));
- children.add(new Property("unitOfPresentation", "CodeableConcept", "Todo.", 0, 1, unitOfPresentation));
+ children.add(new Property("identifier", "Identifier", "An identifier for the administrable product.", 0, java.lang.Integer.MAX_VALUE, identifier));
+ children.add(new Property("subject", "Reference(MedicinalProductDefinition)", "The medicinal product that this is an administrable form of. This is not a reference to the item(s) that make up this administrable form - it is the whole product.", 0, java.lang.Integer.MAX_VALUE, subject));
+ children.add(new Property("administrableDoseForm", "CodeableConcept", "The administrable dose form, i.e. the dose form of the final product after necessary reconstitution or processing.", 0, 1, administrableDoseForm));
+ children.add(new Property("unitOfPresentation", "CodeableConcept", "The units of presentation for the administrable product, for example 'tablet'.", 0, 1, unitOfPresentation));
children.add(new Property("producedFrom", "Reference(ManufacturedItemDefinition)", "The manufactured item(s) that this administrable product is produced from. Either a single item, or several that are mixed before administration (e.g. a power item and a solution item). Note that these are not raw ingredients.", 0, java.lang.Integer.MAX_VALUE, producedFrom));
- children.add(new Property("ingredient", "Reference(Ingredient)", "The ingredients of this administrable pharmaceutical product.", 0, java.lang.Integer.MAX_VALUE, ingredient));
- children.add(new Property("device", "Reference(DeviceDefinition)", "Accompanying device.", 0, java.lang.Integer.MAX_VALUE, device));
+ children.add(new Property("ingredient", "Reference(Ingredient)", "The ingredients of this administrable medicinal product. Sometimes it may be appropriate to specify these via the associated manufactured item(s).", 0, java.lang.Integer.MAX_VALUE, ingredient));
+ children.add(new Property("device", "Reference(DeviceDefinition)", "A device that is integral to the medicinal product, in effect being considered as an \"ingredient\" of the medicinal product. This is not intended for devices that are just co-packaged.", 0, java.lang.Integer.MAX_VALUE, device));
children.add(new Property("property", "", "Characteristics e.g. a products onset of action.", 0, java.lang.Integer.MAX_VALUE, property));
- children.add(new Property("routeOfAdministration", "", "The path by which the pharmaceutical product is taken into or makes contact with the body.", 0, java.lang.Integer.MAX_VALUE, routeOfAdministration));
+ children.add(new Property("routeOfAdministration", "", "The path by which the product is taken into or makes contact with the body. In some regions this is referred to as the licenced or approved route.", 0, java.lang.Integer.MAX_VALUE, routeOfAdministration));
}
@Override
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
- case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "An identifier for the pharmaceutical medicinal product.", 0, java.lang.Integer.MAX_VALUE, identifier);
- case -1867885268: /*subject*/ return new Property("subject", "Reference(MedicinalProductDefinition)", "The product that this is a pharmaceutical product of.", 0, java.lang.Integer.MAX_VALUE, subject);
- case 1446105202: /*administrableDoseForm*/ return new Property("administrableDoseForm", "CodeableConcept", "The administrable dose form, after necessary reconstitution.", 0, 1, administrableDoseForm);
- case -1427765963: /*unitOfPresentation*/ return new Property("unitOfPresentation", "CodeableConcept", "Todo.", 0, 1, unitOfPresentation);
+ case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "An identifier for the administrable product.", 0, java.lang.Integer.MAX_VALUE, identifier);
+ case -1867885268: /*subject*/ return new Property("subject", "Reference(MedicinalProductDefinition)", "The medicinal product that this is an administrable form of. This is not a reference to the item(s) that make up this administrable form - it is the whole product.", 0, java.lang.Integer.MAX_VALUE, subject);
+ case 1446105202: /*administrableDoseForm*/ return new Property("administrableDoseForm", "CodeableConcept", "The administrable dose form, i.e. the dose form of the final product after necessary reconstitution or processing.", 0, 1, administrableDoseForm);
+ case -1427765963: /*unitOfPresentation*/ return new Property("unitOfPresentation", "CodeableConcept", "The units of presentation for the administrable product, for example 'tablet'.", 0, 1, unitOfPresentation);
case 588380494: /*producedFrom*/ return new Property("producedFrom", "Reference(ManufacturedItemDefinition)", "The manufactured item(s) that this administrable product is produced from. Either a single item, or several that are mixed before administration (e.g. a power item and a solution item). Note that these are not raw ingredients.", 0, java.lang.Integer.MAX_VALUE, producedFrom);
- case -206409263: /*ingredient*/ return new Property("ingredient", "Reference(Ingredient)", "The ingredients of this administrable pharmaceutical product.", 0, java.lang.Integer.MAX_VALUE, ingredient);
- case -1335157162: /*device*/ return new Property("device", "Reference(DeviceDefinition)", "Accompanying device.", 0, java.lang.Integer.MAX_VALUE, device);
+ case -206409263: /*ingredient*/ return new Property("ingredient", "Reference(Ingredient)", "The ingredients of this administrable medicinal product. Sometimes it may be appropriate to specify these via the associated manufactured item(s).", 0, java.lang.Integer.MAX_VALUE, ingredient);
+ case -1335157162: /*device*/ return new Property("device", "Reference(DeviceDefinition)", "A device that is integral to the medicinal product, in effect being considered as an \"ingredient\" of the medicinal product. This is not intended for devices that are just co-packaged.", 0, java.lang.Integer.MAX_VALUE, device);
case -993141291: /*property*/ return new Property("property", "", "Characteristics e.g. a products onset of action.", 0, java.lang.Integer.MAX_VALUE, property);
- case 1742084734: /*routeOfAdministration*/ return new Property("routeOfAdministration", "", "The path by which the pharmaceutical product is taken into or makes contact with the body.", 0, java.lang.Integer.MAX_VALUE, routeOfAdministration);
+ case 1742084734: /*routeOfAdministration*/ return new Property("routeOfAdministration", "", "The path by which the product is taken into or makes contact with the body. In some regions this is referred to as the licenced or approved route.", 0, java.lang.Integer.MAX_VALUE, routeOfAdministration);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -2171,17 +2171,17 @@ public class AdministrableProductDefinition extends DomainResource {
/**
* Search parameter: device
*
- * Description: Accompanying device
+ * Description: A device that is integral to the medicinal product, in effect being considered as an "ingredient" of the medicinal product. This is not intended for devices that are just co-packaged
* Type: reference
* Path: AdministrableProductDefinition.device
*
*/
- @SearchParamDefinition(name="device", path="AdministrableProductDefinition.device", description="Accompanying device", type="reference", target={DeviceDefinition.class } )
+ @SearchParamDefinition(name="device", path="AdministrableProductDefinition.device", description="A device that is integral to the medicinal product, in effect being considered as an \"ingredient\" of the medicinal product. This is not intended for devices that are just co-packaged", type="reference", target={DeviceDefinition.class } )
public static final String SP_DEVICE = "device";
/**
* Fluent Client search parameter constant for device
*
- * Description: Accompanying device
+ * Description: A device that is integral to the medicinal product, in effect being considered as an "ingredient" of the medicinal product. This is not intended for devices that are just co-packaged
* Type: reference
* Path: AdministrableProductDefinition.device
*
@@ -2197,17 +2197,17 @@ public class AdministrableProductDefinition extends DomainResource {
/**
* Search parameter: dose-form
*
- * Description: The administrable dose form, after necessary reconstitution
+ * Description: The administrable dose form, i.e. the dose form of the final product after necessary reconstitution or processing
* Type: token
* Path: AdministrableProductDefinition.administrableDoseForm
*
*/
- @SearchParamDefinition(name="dose-form", path="AdministrableProductDefinition.administrableDoseForm", description="The administrable dose form, after necessary reconstitution", type="token" )
+ @SearchParamDefinition(name="dose-form", path="AdministrableProductDefinition.administrableDoseForm", description="The administrable dose form, i.e. the dose form of the final product after necessary reconstitution or processing", type="token" )
public static final String SP_DOSE_FORM = "dose-form";
/**
* Fluent Client search parameter constant for dose-form
*
- * Description: The administrable dose form, after necessary reconstitution
+ * Description: The administrable dose form, i.e. the dose form of the final product after necessary reconstitution or processing
* Type: token
* Path: AdministrableProductDefinition.administrableDoseForm
*
@@ -2217,17 +2217,17 @@ public class AdministrableProductDefinition extends DomainResource {
/**
* Search parameter: identifier
*
- * Description: An identifier for the pharmaceutical medicinal product
+ * Description: An identifier for the administrable product
* Type: token
* Path: AdministrableProductDefinition.identifier
*
*/
- @SearchParamDefinition(name="identifier", path="AdministrableProductDefinition.identifier", description="An identifier for the pharmaceutical medicinal product", type="token" )
+ @SearchParamDefinition(name="identifier", path="AdministrableProductDefinition.identifier", description="An identifier for the administrable product", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
* Fluent Client search parameter constant for identifier
*
- * Description: An identifier for the pharmaceutical medicinal product
+ * Description: An identifier for the administrable product
* Type: token
* Path: AdministrableProductDefinition.identifier
*
@@ -2237,17 +2237,17 @@ public class AdministrableProductDefinition extends DomainResource {
/**
* Search parameter: ingredient
*
- * Description: The ingredients of this administrable pharmaceutical product
+ * Description: The ingredients of this administrable medicinal product. Sometimes it may be appropriate to specify these via the associated manufactured item(s)
* Type: reference
* Path: AdministrableProductDefinition.ingredient
*
*/
- @SearchParamDefinition(name="ingredient", path="AdministrableProductDefinition.ingredient", description="The ingredients of this administrable pharmaceutical product", type="reference", target={Ingredient.class } )
+ @SearchParamDefinition(name="ingredient", path="AdministrableProductDefinition.ingredient", description="The ingredients of this administrable medicinal product. Sometimes it may be appropriate to specify these via the associated manufactured item(s)", type="reference", target={Ingredient.class } )
public static final String SP_INGREDIENT = "ingredient";
/**
* Fluent Client search parameter constant for ingredient
*
- * Description: The ingredients of this administrable pharmaceutical product
+ * Description: The ingredients of this administrable medicinal product. Sometimes it may be appropriate to specify these via the associated manufactured item(s)
* Type: reference
* Path: AdministrableProductDefinition.ingredient
*
@@ -2309,17 +2309,17 @@ public class AdministrableProductDefinition extends DomainResource {
/**
* Search parameter: subject
*
- * Description: The product that this is a pharmaceutical product of
+ * Description: The medicinal product that this is an administrable form of. This is not a reference to the item(s) that make up this administrable form - it is the whole product
* Type: reference
* Path: AdministrableProductDefinition.subject
*
*/
- @SearchParamDefinition(name="subject", path="AdministrableProductDefinition.subject", description="The product that this is a pharmaceutical product of", type="reference", target={MedicinalProductDefinition.class } )
+ @SearchParamDefinition(name="subject", path="AdministrableProductDefinition.subject", description="The medicinal product that this is an administrable form of. This is not a reference to the item(s) that make up this administrable form - it is the whole product", type="reference", target={MedicinalProductDefinition.class } )
public static final String SP_SUBJECT = "subject";
/**
* Fluent Client search parameter constant for subject
*
- * Description: The product that this is a pharmaceutical product of
+ * Description: The medicinal product that this is an administrable form of. This is not a reference to the item(s) that make up this administrable form - it is the whole product
* Type: reference
* Path: AdministrableProductDefinition.subject
*
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdverseEvent.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdverseEvent.java
index 5417032b8..c728f52b0 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdverseEvent.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdverseEvent.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -82,7 +82,6 @@ public class AdverseEvent extends DomainResource {
switch (this) {
case ACTUAL: return "actual";
case POTENTIAL: return "potential";
- case NULL: return null;
default: return "?";
}
}
@@ -90,7 +89,6 @@ public class AdverseEvent extends DomainResource {
switch (this) {
case ACTUAL: return "http://hl7.org/fhir/adverse-event-actuality";
case POTENTIAL: return "http://hl7.org/fhir/adverse-event-actuality";
- case NULL: return null;
default: return "?";
}
}
@@ -98,7 +96,6 @@ public class AdverseEvent extends DomainResource {
switch (this) {
case ACTUAL: return "The adverse event actually happened regardless of whether anyone was affected or harmed.";
case POTENTIAL: return "A potential adverse event.";
- case NULL: return null;
default: return "?";
}
}
@@ -106,7 +103,6 @@ public class AdverseEvent extends DomainResource {
switch (this) {
case ACTUAL: return "Adverse Event";
case POTENTIAL: return "Potential Adverse Event";
- case NULL: return null;
default: return "?";
}
}
@@ -192,7 +188,6 @@ public class AdverseEvent extends DomainResource {
case COMPLETED: return "completed";
case ENTEREDINERROR: return "entered-in-error";
case UNKNOWN: return "unknown";
- case NULL: return null;
default: return "?";
}
}
@@ -202,7 +197,6 @@ public class AdverseEvent extends DomainResource {
case COMPLETED: return "http://hl7.org/fhir/event-status";
case ENTEREDINERROR: return "http://hl7.org/fhir/event-status";
case UNKNOWN: return "http://hl7.org/fhir/event-status";
- case NULL: return null;
default: return "?";
}
}
@@ -212,7 +206,6 @@ public class AdverseEvent extends DomainResource {
case COMPLETED: return "The event has now concluded.";
case ENTEREDINERROR: return "This electronic record should never have existed, though it is possible that real-world decisions were based on it. (If real-world activity has occurred, the status should be \"stopped\" rather than \"entered-in-error\".).";
case UNKNOWN: return "The authoring/source system does not know which of the status values currently applies for this event. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, but the authoring/source system does not know which.";
- case NULL: return null;
default: return "?";
}
}
@@ -222,7 +215,6 @@ public class AdverseEvent extends DomainResource {
case COMPLETED: return "Completed";
case ENTEREDINERROR: return "Entered in Error";
case UNKNOWN: return "Unknown";
- case NULL: return null;
default: return "?";
}
}
@@ -1853,10 +1845,10 @@ public class AdverseEvent extends DomainResource {
protected DateTimeType recordedDate;
/**
- * Includes information about the reaction that occurred as a result of exposure to a substance (for example, a drug or a chemical).
+ * Information about the condition that occurred as a result of the adverse event, such as hives due to the exposure to a substance (for example, a drug or a chemical) or a broken leg as a result of the fall.
*/
@Child(name = "resultingCondition", type = {Condition.class}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
- @Description(shortDefinition="Effect on the subject due to this event", formalDefinition="Includes information about the reaction that occurred as a result of exposure to a substance (for example, a drug or a chemical)." )
+ @Description(shortDefinition="Effect on the subject due to this event", formalDefinition="Information about the condition that occurred as a result of the adverse event, such as hives due to the exposure to a substance (for example, a drug or a chemical) or a broken leg as a result of the fall." )
protected List resultingCondition;
/**
@@ -1877,10 +1869,10 @@ public class AdverseEvent extends DomainResource {
/**
* Describes the type of outcome from the adverse event, such as resolved, recovering, ongoing, resolved-with-sequelae, or fatal.
*/
- @Child(name = "outcome", type = {CodeableConcept.class}, order=13, min=0, max=1, modifier=false, summary=true)
+ @Child(name = "outcome", type = {CodeableConcept.class}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Type of outcome from the adverse event", formalDefinition="Describes the type of outcome from the adverse event, such as resolved, recovering, ongoing, resolved-with-sequelae, or fatal." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/adverse-event-outcome")
- protected CodeableConcept outcome;
+ protected List outcome;
/**
* Information on who recorded the adverse event. May be the patient or a practitioner.
@@ -1938,7 +1930,7 @@ public class AdverseEvent extends DomainResource {
@Description(shortDefinition="Research study that the subject is enrolled in", formalDefinition="The research study that the subject is enrolled in." )
protected List study;
- private static final long serialVersionUID = -162346876L;
+ private static final long serialVersionUID = 1528004510L;
/**
* Constructor
@@ -2390,7 +2382,7 @@ public class AdverseEvent extends DomainResource {
}
/**
- * @return {@link #resultingCondition} (Includes information about the reaction that occurred as a result of exposure to a substance (for example, a drug or a chemical).)
+ * @return {@link #resultingCondition} (Information about the condition that occurred as a result of the adverse event, such as hives due to the exposure to a substance (for example, a drug or a chemical) or a broken leg as a result of the fall.)
*/
public List getResultingCondition() {
if (this.resultingCondition == null)
@@ -2493,25 +2485,54 @@ public class AdverseEvent extends DomainResource {
/**
* @return {@link #outcome} (Describes the type of outcome from the adverse event, such as resolved, recovering, ongoing, resolved-with-sequelae, or fatal.)
*/
- public CodeableConcept getOutcome() {
+ public List getOutcome() {
if (this.outcome == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create AdverseEvent.outcome");
- else if (Configuration.doAutoCreate())
- this.outcome = new CodeableConcept(); // cc
+ this.outcome = new ArrayList();
return this.outcome;
}
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public AdverseEvent setOutcome(List theOutcome) {
+ this.outcome = theOutcome;
+ return this;
+ }
+
public boolean hasOutcome() {
- return this.outcome != null && !this.outcome.isEmpty();
+ if (this.outcome == null)
+ return false;
+ for (CodeableConcept item : this.outcome)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public CodeableConcept addOutcome() { //3
+ CodeableConcept t = new CodeableConcept();
+ if (this.outcome == null)
+ this.outcome = new ArrayList();
+ this.outcome.add(t);
+ return t;
+ }
+
+ public AdverseEvent addOutcome(CodeableConcept t) { //3
+ if (t == null)
+ return this;
+ if (this.outcome == null)
+ this.outcome = new ArrayList();
+ this.outcome.add(t);
+ return this;
}
/**
- * @param value {@link #outcome} (Describes the type of outcome from the adverse event, such as resolved, recovering, ongoing, resolved-with-sequelae, or fatal.)
+ * @return The first repetition of repeating field {@link #outcome}, creating it if it does not already exist {3}
*/
- public AdverseEvent setOutcome(CodeableConcept value) {
- this.outcome = value;
- return this;
+ public CodeableConcept getOutcomeFirstRep() {
+ if (getOutcome().isEmpty()) {
+ addOutcome();
+ }
+ return getOutcome().get(0);
}
/**
@@ -2921,10 +2942,10 @@ public class AdverseEvent extends DomainResource {
children.add(new Property("occurrence[x]", "dateTime|Period|Timing", "The date (and perhaps time) when the adverse event occurred.", 0, 1, occurrence));
children.add(new Property("detected", "dateTime", "Estimated or actual date the AdverseEvent began, in the opinion of the reporter.", 0, 1, detected));
children.add(new Property("recordedDate", "dateTime", "The date on which the existence of the AdverseEvent was first recorded.", 0, 1, recordedDate));
- children.add(new Property("resultingCondition", "Reference(Condition)", "Includes information about the reaction that occurred as a result of exposure to a substance (for example, a drug or a chemical).", 0, java.lang.Integer.MAX_VALUE, resultingCondition));
+ children.add(new Property("resultingCondition", "Reference(Condition)", "Information about the condition that occurred as a result of the adverse event, such as hives due to the exposure to a substance (for example, a drug or a chemical) or a broken leg as a result of the fall.", 0, java.lang.Integer.MAX_VALUE, resultingCondition));
children.add(new Property("location", "Reference(Location)", "The information about where the adverse event occurred.", 0, 1, location));
children.add(new Property("seriousness", "CodeableConcept", "Assessment whether this event, or averted event, was of clinical importance.", 0, 1, seriousness));
- children.add(new Property("outcome", "CodeableConcept", "Describes the type of outcome from the adverse event, such as resolved, recovering, ongoing, resolved-with-sequelae, or fatal.", 0, 1, outcome));
+ children.add(new Property("outcome", "CodeableConcept", "Describes the type of outcome from the adverse event, such as resolved, recovering, ongoing, resolved-with-sequelae, or fatal.", 0, java.lang.Integer.MAX_VALUE, outcome));
children.add(new Property("recorder", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson)", "Information on who recorded the adverse event. May be the patient or a practitioner.", 0, 1, recorder));
children.add(new Property("participant", "", "Indicates who or what participated in the adverse event and how they were involved.", 0, java.lang.Integer.MAX_VALUE, participant));
children.add(new Property("suspectEntity", "", "Describes the entity that is suspected to have caused the adverse event.", 0, java.lang.Integer.MAX_VALUE, suspectEntity));
@@ -2952,10 +2973,10 @@ public class AdverseEvent extends DomainResource {
case 1515218299: /*occurrenceTiming*/ return new Property("occurrence[x]", "Timing", "The date (and perhaps time) when the adverse event occurred.", 0, 1, occurrence);
case 1048254082: /*detected*/ return new Property("detected", "dateTime", "Estimated or actual date the AdverseEvent began, in the opinion of the reporter.", 0, 1, detected);
case -1952893826: /*recordedDate*/ return new Property("recordedDate", "dateTime", "The date on which the existence of the AdverseEvent was first recorded.", 0, 1, recordedDate);
- case -830261258: /*resultingCondition*/ return new Property("resultingCondition", "Reference(Condition)", "Includes information about the reaction that occurred as a result of exposure to a substance (for example, a drug or a chemical).", 0, java.lang.Integer.MAX_VALUE, resultingCondition);
+ case -830261258: /*resultingCondition*/ return new Property("resultingCondition", "Reference(Condition)", "Information about the condition that occurred as a result of the adverse event, such as hives due to the exposure to a substance (for example, a drug or a chemical) or a broken leg as a result of the fall.", 0, java.lang.Integer.MAX_VALUE, resultingCondition);
case 1901043637: /*location*/ return new Property("location", "Reference(Location)", "The information about where the adverse event occurred.", 0, 1, location);
case -1551003909: /*seriousness*/ return new Property("seriousness", "CodeableConcept", "Assessment whether this event, or averted event, was of clinical importance.", 0, 1, seriousness);
- case -1106507950: /*outcome*/ return new Property("outcome", "CodeableConcept", "Describes the type of outcome from the adverse event, such as resolved, recovering, ongoing, resolved-with-sequelae, or fatal.", 0, 1, outcome);
+ case -1106507950: /*outcome*/ return new Property("outcome", "CodeableConcept", "Describes the type of outcome from the adverse event, such as resolved, recovering, ongoing, resolved-with-sequelae, or fatal.", 0, java.lang.Integer.MAX_VALUE, outcome);
case -799233858: /*recorder*/ return new Property("recorder", "Reference(Patient|Practitioner|PractitionerRole|RelatedPerson)", "Information on who recorded the adverse event. May be the patient or a practitioner.", 0, 1, recorder);
case 767422259: /*participant*/ return new Property("participant", "", "Indicates who or what participated in the adverse event and how they were involved.", 0, java.lang.Integer.MAX_VALUE, participant);
case -1957422662: /*suspectEntity*/ return new Property("suspectEntity", "", "Describes the entity that is suspected to have caused the adverse event.", 0, java.lang.Integer.MAX_VALUE, suspectEntity);
@@ -2985,7 +3006,7 @@ public class AdverseEvent extends DomainResource {
case -830261258: /*resultingCondition*/ return this.resultingCondition == null ? new Base[0] : this.resultingCondition.toArray(new Base[this.resultingCondition.size()]); // Reference
case 1901043637: /*location*/ return this.location == null ? new Base[0] : new Base[] {this.location}; // Reference
case -1551003909: /*seriousness*/ return this.seriousness == null ? new Base[0] : new Base[] {this.seriousness}; // CodeableConcept
- case -1106507950: /*outcome*/ return this.outcome == null ? new Base[0] : new Base[] {this.outcome}; // CodeableConcept
+ case -1106507950: /*outcome*/ return this.outcome == null ? new Base[0] : this.outcome.toArray(new Base[this.outcome.size()]); // CodeableConcept
case -799233858: /*recorder*/ return this.recorder == null ? new Base[0] : new Base[] {this.recorder}; // Reference
case 767422259: /*participant*/ return this.participant == null ? new Base[0] : this.participant.toArray(new Base[this.participant.size()]); // AdverseEventParticipantComponent
case -1957422662: /*suspectEntity*/ return this.suspectEntity == null ? new Base[0] : this.suspectEntity.toArray(new Base[this.suspectEntity.size()]); // AdverseEventSuspectEntityComponent
@@ -3044,7 +3065,7 @@ public class AdverseEvent extends DomainResource {
this.seriousness = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
return value;
case -1106507950: // outcome
- this.outcome = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ this.getOutcome().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept
return value;
case -799233858: // recorder
this.recorder = TypeConvertor.castToReference(value); // Reference
@@ -3106,7 +3127,7 @@ public class AdverseEvent extends DomainResource {
} else if (name.equals("seriousness")) {
this.seriousness = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
} else if (name.equals("outcome")) {
- this.outcome = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
+ this.getOutcome().add(TypeConvertor.castToCodeableConcept(value));
} else if (name.equals("recorder")) {
this.recorder = TypeConvertor.castToReference(value); // Reference
} else if (name.equals("participant")) {
@@ -3145,7 +3166,7 @@ public class AdverseEvent extends DomainResource {
case -830261258: return addResultingCondition();
case 1901043637: return getLocation();
case -1551003909: return getSeriousness();
- case -1106507950: return getOutcome();
+ case -1106507950: return addOutcome();
case -799233858: return getRecorder();
case 767422259: return addParticipant();
case -1957422662: return addSuspectEntity();
@@ -3245,8 +3266,7 @@ public class AdverseEvent extends DomainResource {
return this.seriousness;
}
else if (name.equals("outcome")) {
- this.outcome = new CodeableConcept();
- return this.outcome;
+ return addOutcome();
}
else if (name.equals("recorder")) {
this.recorder = new Reference();
@@ -3315,7 +3335,11 @@ public class AdverseEvent extends DomainResource {
};
dst.location = location == null ? null : location.copy();
dst.seriousness = seriousness == null ? null : seriousness.copy();
- dst.outcome = outcome == null ? null : outcome.copy();
+ if (outcome != null) {
+ dst.outcome = new ArrayList();
+ for (CodeableConcept i : outcome)
+ dst.outcome.add(i.copy());
+ };
dst.recorder = recorder == null ? null : recorder.copy();
if (participant != null) {
dst.participant = new ArrayList();
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Age.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Age.java
index 5538edbb2..7c2aee0b4 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Age.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Age.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AllergyIntolerance.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AllergyIntolerance.java
index 83ff7ef00..8b5488bcf 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AllergyIntolerance.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AllergyIntolerance.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -96,7 +96,6 @@ public class AllergyIntolerance extends DomainResource {
case MEDICATION: return "medication";
case ENVIRONMENT: return "environment";
case BIOLOGIC: return "biologic";
- case NULL: return null;
default: return "?";
}
}
@@ -106,7 +105,6 @@ public class AllergyIntolerance extends DomainResource {
case MEDICATION: return "http://hl7.org/fhir/allergy-intolerance-category";
case ENVIRONMENT: return "http://hl7.org/fhir/allergy-intolerance-category";
case BIOLOGIC: return "http://hl7.org/fhir/allergy-intolerance-category";
- case NULL: return null;
default: return "?";
}
}
@@ -116,7 +114,6 @@ public class AllergyIntolerance extends DomainResource {
case MEDICATION: return "Substances administered to achieve a physiological effect.";
case ENVIRONMENT: return "Any substances that are encountered in the environment, including any substance not already classified as food, medication, or biologic.";
case BIOLOGIC: return "A preparation that is synthesized from living organisms or their products, especially a human or animal protein, such as a hormone or antitoxin, that is used as a diagnostic, preventive, or therapeutic agent. Examples of biologic medications include: vaccines; allergenic extracts, which are used for both diagnosis and treatment (for example, allergy shots); gene therapies; cellular therapies. There are other biologic products, such as tissues, which are not typically associated with allergies.";
- case NULL: return null;
default: return "?";
}
}
@@ -126,7 +123,6 @@ public class AllergyIntolerance extends DomainResource {
case MEDICATION: return "Medication";
case ENVIRONMENT: return "Environment";
case BIOLOGIC: return "Biologic";
- case NULL: return null;
default: return "?";
}
}
@@ -217,7 +213,6 @@ public class AllergyIntolerance extends DomainResource {
case LOW: return "low";
case HIGH: return "high";
case UNABLETOASSESS: return "unable-to-assess";
- case NULL: return null;
default: return "?";
}
}
@@ -226,7 +221,6 @@ public class AllergyIntolerance extends DomainResource {
case LOW: return "http://hl7.org/fhir/allergy-intolerance-criticality";
case HIGH: return "http://hl7.org/fhir/allergy-intolerance-criticality";
case UNABLETOASSESS: return "http://hl7.org/fhir/allergy-intolerance-criticality";
- case NULL: return null;
default: return "?";
}
}
@@ -235,7 +229,6 @@ public class AllergyIntolerance extends DomainResource {
case LOW: return "Worst case result of a future exposure is not assessed to be life-threatening or having high potential for organ system failure.";
case HIGH: return "Worst case result of a future exposure is assessed to be life-threatening or having high potential for organ system failure.";
case UNABLETOASSESS: return "Unable to assess the worst case result of a future exposure.";
- case NULL: return null;
default: return "?";
}
}
@@ -244,7 +237,6 @@ public class AllergyIntolerance extends DomainResource {
case LOW: return "Low Risk";
case HIGH: return "High Risk";
case UNABLETOASSESS: return "Unable to Assess Risk";
- case NULL: return null;
default: return "?";
}
}
@@ -329,7 +321,6 @@ public class AllergyIntolerance extends DomainResource {
case MILD: return "mild";
case MODERATE: return "moderate";
case SEVERE: return "severe";
- case NULL: return null;
default: return "?";
}
}
@@ -338,7 +329,6 @@ public class AllergyIntolerance extends DomainResource {
case MILD: return "http://hl7.org/fhir/reaction-event-severity";
case MODERATE: return "http://hl7.org/fhir/reaction-event-severity";
case SEVERE: return "http://hl7.org/fhir/reaction-event-severity";
- case NULL: return null;
default: return "?";
}
}
@@ -347,7 +337,6 @@ public class AllergyIntolerance extends DomainResource {
case MILD: return "Causes mild physiological effects.";
case MODERATE: return "Causes moderate physiological effects.";
case SEVERE: return "Causes severe physiological effects.";
- case NULL: return null;
default: return "?";
}
}
@@ -356,7 +345,6 @@ public class AllergyIntolerance extends DomainResource {
case MILD: return "Mild";
case MODERATE: return "Moderate";
case SEVERE: return "Severe";
- case NULL: return null;
default: return "?";
}
}
@@ -434,7 +422,6 @@ public class AllergyIntolerance extends DomainResource {
switch (this) {
case ALLERGY: return "allergy";
case INTOLERANCE: return "intolerance";
- case NULL: return null;
default: return "?";
}
}
@@ -442,7 +429,6 @@ public class AllergyIntolerance extends DomainResource {
switch (this) {
case ALLERGY: return "http://hl7.org/fhir/allergy-intolerance-type";
case INTOLERANCE: return "http://hl7.org/fhir/allergy-intolerance-type";
- case NULL: return null;
default: return "?";
}
}
@@ -450,7 +436,6 @@ public class AllergyIntolerance extends DomainResource {
switch (this) {
case ALLERGY: return "A propensity for hypersensitive reaction(s) to a substance. These reactions are most typically type I hypersensitivity, plus other \"allergy-like\" reactions, including pseudoallergy.";
case INTOLERANCE: return "A propensity for adverse reactions to a substance that is not judged to be allergic or \"allergy-like\". These reactions are typically (but not necessarily) non-immune. They are to some degree idiosyncratic and/or patient-specific (i.e. are not a reaction that is expected to occur with most or all patients given similar circumstances).";
- case NULL: return null;
default: return "?";
}
}
@@ -458,7 +443,6 @@ public class AllergyIntolerance extends DomainResource {
switch (this) {
case ALLERGY: return "Allergy";
case INTOLERANCE: return "Intolerance";
- case NULL: return null;
default: return "?";
}
}
@@ -514,10 +498,10 @@ public class AllergyIntolerance extends DomainResource {
/**
* Clinical symptoms and/or signs that are observed or associated with the adverse reaction event.
*/
- @Child(name = "manifestation", type = {CodeableConcept.class}, order=2, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "manifestation", type = {CodeableReference.class}, order=2, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Clinical symptoms/signs associated with the Event", formalDefinition="Clinical symptoms and/or signs that are observed or associated with the adverse reaction event." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/clinical-findings")
- protected List manifestation;
+ protected List manifestation;
/**
* Text description about the reaction as a whole, including details of the manifestation if required.
@@ -556,7 +540,7 @@ public class AllergyIntolerance extends DomainResource {
@Description(shortDefinition="Text about event not captured in other fields", formalDefinition="Additional text about the adverse reaction event not captured in other fields." )
protected List note;
- private static final long serialVersionUID = -752118516L;
+ private static final long serialVersionUID = 1007789961L;
/**
* Constructor
@@ -568,7 +552,7 @@ public class AllergyIntolerance extends DomainResource {
/**
* Constructor
*/
- public AllergyIntoleranceReactionComponent(CodeableConcept manifestation) {
+ public AllergyIntoleranceReactionComponent(CodeableReference manifestation) {
super();
this.addManifestation(manifestation);
}
@@ -600,16 +584,16 @@ public class AllergyIntolerance extends DomainResource {
/**
* @return {@link #manifestation} (Clinical symptoms and/or signs that are observed or associated with the adverse reaction event.)
*/
- public List getManifestation() {
+ public List getManifestation() {
if (this.manifestation == null)
- this.manifestation = new ArrayList();
+ this.manifestation = new ArrayList();
return this.manifestation;
}
/**
* @return Returns a reference to this
for easy method chaining
*/
- public AllergyIntoleranceReactionComponent setManifestation(List theManifestation) {
+ public AllergyIntoleranceReactionComponent setManifestation(List theManifestation) {
this.manifestation = theManifestation;
return this;
}
@@ -617,25 +601,25 @@ public class AllergyIntolerance extends DomainResource {
public boolean hasManifestation() {
if (this.manifestation == null)
return false;
- for (CodeableConcept item : this.manifestation)
+ for (CodeableReference item : this.manifestation)
if (!item.isEmpty())
return true;
return false;
}
- public CodeableConcept addManifestation() { //3
- CodeableConcept t = new CodeableConcept();
+ public CodeableReference addManifestation() { //3
+ CodeableReference t = new CodeableReference();
if (this.manifestation == null)
- this.manifestation = new ArrayList();
+ this.manifestation = new ArrayList();
this.manifestation.add(t);
return t;
}
- public AllergyIntoleranceReactionComponent addManifestation(CodeableConcept t) { //3
+ public AllergyIntoleranceReactionComponent addManifestation(CodeableReference t) { //3
if (t == null)
return this;
if (this.manifestation == null)
- this.manifestation = new ArrayList();
+ this.manifestation = new ArrayList();
this.manifestation.add(t);
return this;
}
@@ -643,7 +627,7 @@ public class AllergyIntolerance extends DomainResource {
/**
* @return The first repetition of repeating field {@link #manifestation}, creating it if it does not already exist {3}
*/
- public CodeableConcept getManifestationFirstRep() {
+ public CodeableReference getManifestationFirstRep() {
if (getManifestation().isEmpty()) {
addManifestation();
}
@@ -877,7 +861,7 @@ public class AllergyIntolerance extends DomainResource {
protected void listChildren(List children) {
super.listChildren(children);
children.add(new Property("substance", "CodeableConcept", "Identification of the specific substance (or pharmaceutical product) considered to be responsible for the Adverse Reaction event. Note: the substance for a specific reaction may be different from the substance identified as the cause of the risk, but it must be consistent with it. For instance, it may be a more specific substance (e.g. a brand medication) or a composite product that includes the identified substance. It must be clinically safe to only process the 'code' and ignore the 'reaction.substance'. If a receiving system is unable to confirm that AllergyIntolerance.reaction.substance falls within the semantic scope of AllergyIntolerance.code, then the receiving system should ignore AllergyIntolerance.reaction.substance.", 0, 1, substance));
- children.add(new Property("manifestation", "CodeableConcept", "Clinical symptoms and/or signs that are observed or associated with the adverse reaction event.", 0, java.lang.Integer.MAX_VALUE, manifestation));
+ children.add(new Property("manifestation", "CodeableReference(Observation)", "Clinical symptoms and/or signs that are observed or associated with the adverse reaction event.", 0, java.lang.Integer.MAX_VALUE, manifestation));
children.add(new Property("description", "string", "Text description about the reaction as a whole, including details of the manifestation if required.", 0, 1, description));
children.add(new Property("onset", "dateTime", "Record of the date and/or time of the onset of the Reaction.", 0, 1, onset));
children.add(new Property("severity", "code", "Clinical assessment of the severity of the reaction event as a whole, potentially considering multiple different manifestations.", 0, 1, severity));
@@ -889,7 +873,7 @@ public class AllergyIntolerance extends DomainResource {
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
case 530040176: /*substance*/ return new Property("substance", "CodeableConcept", "Identification of the specific substance (or pharmaceutical product) considered to be responsible for the Adverse Reaction event. Note: the substance for a specific reaction may be different from the substance identified as the cause of the risk, but it must be consistent with it. For instance, it may be a more specific substance (e.g. a brand medication) or a composite product that includes the identified substance. It must be clinically safe to only process the 'code' and ignore the 'reaction.substance'. If a receiving system is unable to confirm that AllergyIntolerance.reaction.substance falls within the semantic scope of AllergyIntolerance.code, then the receiving system should ignore AllergyIntolerance.reaction.substance.", 0, 1, substance);
- case 1115984422: /*manifestation*/ return new Property("manifestation", "CodeableConcept", "Clinical symptoms and/or signs that are observed or associated with the adverse reaction event.", 0, java.lang.Integer.MAX_VALUE, manifestation);
+ case 1115984422: /*manifestation*/ return new Property("manifestation", "CodeableReference(Observation)", "Clinical symptoms and/or signs that are observed or associated with the adverse reaction event.", 0, java.lang.Integer.MAX_VALUE, manifestation);
case -1724546052: /*description*/ return new Property("description", "string", "Text description about the reaction as a whole, including details of the manifestation if required.", 0, 1, description);
case 105901603: /*onset*/ return new Property("onset", "dateTime", "Record of the date and/or time of the onset of the Reaction.", 0, 1, onset);
case 1478300413: /*severity*/ return new Property("severity", "code", "Clinical assessment of the severity of the reaction event as a whole, potentially considering multiple different manifestations.", 0, 1, severity);
@@ -904,7 +888,7 @@ public class AllergyIntolerance extends DomainResource {
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
case 530040176: /*substance*/ return this.substance == null ? new Base[0] : new Base[] {this.substance}; // CodeableConcept
- case 1115984422: /*manifestation*/ return this.manifestation == null ? new Base[0] : this.manifestation.toArray(new Base[this.manifestation.size()]); // CodeableConcept
+ case 1115984422: /*manifestation*/ return this.manifestation == null ? new Base[0] : this.manifestation.toArray(new Base[this.manifestation.size()]); // CodeableReference
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType
case 105901603: /*onset*/ return this.onset == null ? new Base[0] : new Base[] {this.onset}; // DateTimeType
case 1478300413: /*severity*/ return this.severity == null ? new Base[0] : new Base[] {this.severity}; // Enumeration
@@ -922,7 +906,7 @@ public class AllergyIntolerance extends DomainResource {
this.substance = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
return value;
case 1115984422: // manifestation
- this.getManifestation().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept
+ this.getManifestation().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference
return value;
case -1724546052: // description
this.description = TypeConvertor.castToString(value); // StringType
@@ -950,7 +934,7 @@ public class AllergyIntolerance extends DomainResource {
if (name.equals("substance")) {
this.substance = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
} else if (name.equals("manifestation")) {
- this.getManifestation().add(TypeConvertor.castToCodeableConcept(value));
+ this.getManifestation().add(TypeConvertor.castToCodeableReference(value));
} else if (name.equals("description")) {
this.description = TypeConvertor.castToString(value); // StringType
} else if (name.equals("onset")) {
@@ -986,7 +970,7 @@ public class AllergyIntolerance extends DomainResource {
public String[] getTypesForProperty(int hash, String name) throws FHIRException {
switch (hash) {
case 530040176: /*substance*/ return new String[] {"CodeableConcept"};
- case 1115984422: /*manifestation*/ return new String[] {"CodeableConcept"};
+ case 1115984422: /*manifestation*/ return new String[] {"CodeableReference"};
case -1724546052: /*description*/ return new String[] {"string"};
case 105901603: /*onset*/ return new String[] {"dateTime"};
case 1478300413: /*severity*/ return new String[] {"code"};
@@ -1036,8 +1020,8 @@ public class AllergyIntolerance extends DomainResource {
super.copyValues(dst);
dst.substance = substance == null ? null : substance.copy();
if (manifestation != null) {
- dst.manifestation = new ArrayList();
- for (CodeableConcept i : manifestation)
+ dst.manifestation = new ArrayList();
+ for (CodeableReference i : manifestation)
dst.manifestation.add(i.copy());
};
dst.description = description == null ? null : description.copy();
@@ -1102,10 +1086,10 @@ public class AllergyIntolerance extends DomainResource {
protected CodeableConcept clinicalStatus;
/**
- * Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance (including pharmaceutical product).
+ * Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance (including pharmaceutical product). The verification status pertains to the allergy or intolerance, itself, not to any specific AllergyIntolerance attribute.
*/
@Child(name = "verificationStatus", type = {CodeableConcept.class}, order=2, min=0, max=1, modifier=true, summary=true)
- @Description(shortDefinition="unconfirmed | presumed | confirmed | refuted | entered-in-error", formalDefinition="Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance (including pharmaceutical product)." )
+ @Description(shortDefinition="unconfirmed | presumed | confirmed | refuted | entered-in-error", formalDefinition="Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance (including pharmaceutical product). The verification status pertains to the allergy or intolerance, itself, not to any specific AllergyIntolerance attribute." )
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/allergyintolerance-verification")
protected CodeableConcept verificationStatus;
@@ -1299,7 +1283,7 @@ public class AllergyIntolerance extends DomainResource {
}
/**
- * @return {@link #verificationStatus} (Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance (including pharmaceutical product).)
+ * @return {@link #verificationStatus} (Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance (including pharmaceutical product). The verification status pertains to the allergy or intolerance, itself, not to any specific AllergyIntolerance attribute.)
*/
public CodeableConcept getVerificationStatus() {
if (this.verificationStatus == null)
@@ -1315,7 +1299,7 @@ public class AllergyIntolerance extends DomainResource {
}
/**
- * @param value {@link #verificationStatus} (Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance (including pharmaceutical product).)
+ * @param value {@link #verificationStatus} (Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance (including pharmaceutical product). The verification status pertains to the allergy or intolerance, itself, not to any specific AllergyIntolerance attribute.)
*/
public AllergyIntolerance setVerificationStatus(CodeableConcept value) {
this.verificationStatus = value;
@@ -1905,7 +1889,7 @@ public class AllergyIntolerance extends DomainResource {
super.listChildren(children);
children.add(new Property("identifier", "Identifier", "Business identifiers assigned to this AllergyIntolerance by the performer or other systems which remain constant as the resource is updated and propagates from server to server.", 0, java.lang.Integer.MAX_VALUE, identifier));
children.add(new Property("clinicalStatus", "CodeableConcept", "The clinical status of the allergy or intolerance.", 0, 1, clinicalStatus));
- children.add(new Property("verificationStatus", "CodeableConcept", "Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance (including pharmaceutical product).", 0, 1, verificationStatus));
+ children.add(new Property("verificationStatus", "CodeableConcept", "Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance (including pharmaceutical product). The verification status pertains to the allergy or intolerance, itself, not to any specific AllergyIntolerance attribute.", 0, 1, verificationStatus));
children.add(new Property("type", "code", "Identification of the underlying physiological mechanism for the reaction risk.", 0, 1, type));
children.add(new Property("category", "code", "Category of the identified substance.", 0, java.lang.Integer.MAX_VALUE, category));
children.add(new Property("criticality", "code", "Estimate of the potential clinical harm, or seriousness, of the reaction to the identified substance.", 0, 1, criticality));
@@ -1926,7 +1910,7 @@ public class AllergyIntolerance extends DomainResource {
switch (_hash) {
case -1618432855: /*identifier*/ return new Property("identifier", "Identifier", "Business identifiers assigned to this AllergyIntolerance by the performer or other systems which remain constant as the resource is updated and propagates from server to server.", 0, java.lang.Integer.MAX_VALUE, identifier);
case -462853915: /*clinicalStatus*/ return new Property("clinicalStatus", "CodeableConcept", "The clinical status of the allergy or intolerance.", 0, 1, clinicalStatus);
- case -842509843: /*verificationStatus*/ return new Property("verificationStatus", "CodeableConcept", "Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance (including pharmaceutical product).", 0, 1, verificationStatus);
+ case -842509843: /*verificationStatus*/ return new Property("verificationStatus", "CodeableConcept", "Assertion about certainty associated with the propensity, or potential risk, of a reaction to the identified substance (including pharmaceutical product). The verification status pertains to the allergy or intolerance, itself, not to any specific AllergyIntolerance attribute.", 0, 1, verificationStatus);
case 3575610: /*type*/ return new Property("type", "code", "Identification of the underlying physiological mechanism for the reaction risk.", 0, 1, type);
case 50511102: /*category*/ return new Property("category", "code", "Category of the identified substance.", 0, java.lang.Integer.MAX_VALUE, category);
case -1608054609: /*criticality*/ return new Property("criticality", "code", "Estimate of the potential clinical harm, or seriousness, of the reaction to the identified substance.", 0, 1, criticality);
@@ -2359,152 +2343,6 @@ public class AllergyIntolerance extends DomainResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam CLINICAL_STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CLINICAL_STATUS);
- /**
- * Search parameter: criticality
- *
- * Description: low | high | unable-to-assess
- * Type: token
- * Path: AllergyIntolerance.criticality
- *
- */
- @SearchParamDefinition(name="criticality", path="AllergyIntolerance.criticality", description="low | high | unable-to-assess", type="token" )
- public static final String SP_CRITICALITY = "criticality";
- /**
- * Fluent Client search parameter constant for criticality
- *
- * Description: low | high | unable-to-assess
- * Type: token
- * Path: AllergyIntolerance.criticality
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam CRITICALITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CRITICALITY);
-
- /**
- * Search parameter: last-date
- *
- * Description: Date(/time) of last known occurrence of a reaction
- * Type: date
- * Path: AllergyIntolerance.lastOccurrence
- *
- */
- @SearchParamDefinition(name="last-date", path="AllergyIntolerance.lastOccurrence", description="Date(/time) of last known occurrence of a reaction", type="date" )
- public static final String SP_LAST_DATE = "last-date";
- /**
- * Fluent Client search parameter constant for last-date
- *
- * Description: Date(/time) of last known occurrence of a reaction
- * Type: date
- * Path: AllergyIntolerance.lastOccurrence
- *
- */
- public static final ca.uhn.fhir.rest.gclient.DateClientParam LAST_DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_LAST_DATE);
-
- /**
- * Search parameter: manifestation
- *
- * Description: Clinical symptoms/signs associated with the Event
- * Type: token
- * Path: AllergyIntolerance.reaction.manifestation
- *
- */
- @SearchParamDefinition(name="manifestation", path="AllergyIntolerance.reaction.manifestation", description="Clinical symptoms/signs associated with the Event", type="token" )
- public static final String SP_MANIFESTATION = "manifestation";
- /**
- * Fluent Client search parameter constant for manifestation
- *
- * Description: Clinical symptoms/signs associated with the Event
- * Type: token
- * Path: AllergyIntolerance.reaction.manifestation
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam MANIFESTATION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MANIFESTATION);
-
- /**
- * Search parameter: recorder
- *
- * Description: Who recorded the sensitivity
- * Type: reference
- * Path: AllergyIntolerance.recorder
- *
- */
- @SearchParamDefinition(name="recorder", path="AllergyIntolerance.recorder", description="Who recorded the sensitivity", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Practitioner") }, target={Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
- public static final String SP_RECORDER = "recorder";
- /**
- * Fluent Client search parameter constant for recorder
- *
- * Description: Who recorded the sensitivity
- * Type: reference
- * Path: AllergyIntolerance.recorder
- *
- */
- public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECORDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECORDER);
-
-/**
- * Constant for fluent queries to be used to add include statements. Specifies
- * the path value of "AllergyIntolerance:recorder".
- */
- public static final ca.uhn.fhir.model.api.Include INCLUDE_RECORDER = new ca.uhn.fhir.model.api.Include("AllergyIntolerance:recorder").toLocked();
-
- /**
- * Search parameter: route
- *
- * Description: How the subject was exposed to the substance
- * Type: token
- * Path: AllergyIntolerance.reaction.exposureRoute
- *
- */
- @SearchParamDefinition(name="route", path="AllergyIntolerance.reaction.exposureRoute", description="How the subject was exposed to the substance", type="token" )
- public static final String SP_ROUTE = "route";
- /**
- * Fluent Client search parameter constant for route
- *
- * Description: How the subject was exposed to the substance
- * Type: token
- * Path: AllergyIntolerance.reaction.exposureRoute
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam ROUTE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ROUTE);
-
- /**
- * Search parameter: severity
- *
- * Description: mild | moderate | severe (of event as a whole)
- * Type: token
- * Path: AllergyIntolerance.reaction.severity
- *
- */
- @SearchParamDefinition(name="severity", path="AllergyIntolerance.reaction.severity", description="mild | moderate | severe (of event as a whole)", type="token" )
- public static final String SP_SEVERITY = "severity";
- /**
- * Fluent Client search parameter constant for severity
- *
- * Description: mild | moderate | severe (of event as a whole)
- * Type: token
- * Path: AllergyIntolerance.reaction.severity
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam SEVERITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SEVERITY);
-
- /**
- * Search parameter: verification-status
- *
- * Description: unconfirmed | presumed | confirmed | refuted | entered-in-error
- * Type: token
- * Path: AllergyIntolerance.verificationStatus
- *
- */
- @SearchParamDefinition(name="verification-status", path="AllergyIntolerance.verificationStatus", description="unconfirmed | presumed | confirmed | refuted | entered-in-error", type="token" )
- public static final String SP_VERIFICATION_STATUS = "verification-status";
- /**
- * Fluent Client search parameter constant for verification-status
- *
- * Description: unconfirmed | presumed | confirmed | refuted | entered-in-error
- * Type: token
- * Path: AllergyIntolerance.verificationStatus
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERIFICATION_STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERIFICATION_STATUS);
-
/**
* Search parameter: code
*
@@ -2557,6 +2395,26 @@ public class AllergyIntolerance extends DomainResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE);
+ /**
+ * Search parameter: criticality
+ *
+ * Description: low | high | unable-to-assess
+ * Type: token
+ * Path: AllergyIntolerance.criticality
+ *
+ */
+ @SearchParamDefinition(name="criticality", path="AllergyIntolerance.criticality", description="low | high | unable-to-assess", type="token" )
+ public static final String SP_CRITICALITY = "criticality";
+ /**
+ * Fluent Client search parameter constant for criticality
+ *
+ * Description: low | high | unable-to-assess
+ * Type: token
+ * Path: AllergyIntolerance.criticality
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam CRITICALITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CRITICALITY);
+
/**
* Search parameter: date
*
@@ -2635,7 +2493,7 @@ public class AllergyIntolerance extends DomainResource {
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
* [Goal](goal.html): External Ids for this goal
-* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number
+* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID
* [Immunization](immunization.html): Business identifier
* [List](list.html): Business identifier
* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier
@@ -2655,7 +2513,7 @@ public class AllergyIntolerance extends DomainResource {
* Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
- @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
+ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
* Fluent Client search parameter constant for identifier
@@ -2677,7 +2535,7 @@ public class AllergyIntolerance extends DomainResource {
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
* [Goal](goal.html): External Ids for this goal
-* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number
+* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID
* [Immunization](immunization.html): Business identifier
* [List](list.html): Business identifier
* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier
@@ -2699,6 +2557,72 @@ public class AllergyIntolerance extends DomainResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+ /**
+ * Search parameter: last-date
+ *
+ * Description: Date(/time) of last known occurrence of a reaction
+ * Type: date
+ * Path: AllergyIntolerance.lastOccurrence
+ *
+ */
+ @SearchParamDefinition(name="last-date", path="AllergyIntolerance.lastOccurrence", description="Date(/time) of last known occurrence of a reaction", type="date" )
+ public static final String SP_LAST_DATE = "last-date";
+ /**
+ * Fluent Client search parameter constant for last-date
+ *
+ * Description: Date(/time) of last known occurrence of a reaction
+ * Type: date
+ * Path: AllergyIntolerance.lastOccurrence
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.DateClientParam LAST_DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_LAST_DATE);
+
+ /**
+ * Search parameter: manifestation-code
+ *
+ * Description: Clinical symptoms/signs associated with the Event
+ * Type: token
+ * Path: AllergyIntolerance.reaction.manifestation.concept
+ *
+ */
+ @SearchParamDefinition(name="manifestation-code", path="AllergyIntolerance.reaction.manifestation.concept", description="Clinical symptoms/signs associated with the Event", type="token" )
+ public static final String SP_MANIFESTATION_CODE = "manifestation-code";
+ /**
+ * Fluent Client search parameter constant for manifestation-code
+ *
+ * Description: Clinical symptoms/signs associated with the Event
+ * Type: token
+ * Path: AllergyIntolerance.reaction.manifestation.concept
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam MANIFESTATION_CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MANIFESTATION_CODE);
+
+ /**
+ * Search parameter: manifestation-reference
+ *
+ * Description: Clinical symptoms/signs associated with the Event
+ * Type: reference
+ * Path: AllergyIntolerance.reaction.manifestation.reference
+ *
+ */
+ @SearchParamDefinition(name="manifestation-reference", path="AllergyIntolerance.reaction.manifestation.reference", description="Clinical symptoms/signs associated with the Event", type="reference" )
+ public static final String SP_MANIFESTATION_REFERENCE = "manifestation-reference";
+ /**
+ * Fluent Client search parameter constant for manifestation-reference
+ *
+ * Description: Clinical symptoms/signs associated with the Event
+ * Type: reference
+ * Path: AllergyIntolerance.reaction.manifestation.reference
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MANIFESTATION_REFERENCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MANIFESTATION_REFERENCE);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "AllergyIntolerance:manifestation-reference".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_MANIFESTATION_REFERENCE = new ca.uhn.fhir.model.api.Include("AllergyIntolerance:manifestation-reference").toLocked();
+
/**
* Search parameter: patient
*
@@ -2713,7 +2637,7 @@ public class AllergyIntolerance extends DomainResource {
* [Consent](consent.html): Who the consent applies to
* [DetectedIssue](detectedissue.html): Associated patient
* [DeviceRequest](devicerequest.html): Individual the service is ordered for
-* [DeviceUseStatement](deviceusestatement.html): Search by subject - a patient
+* [DeviceUsage](deviceusage.html): Search by subject - a patient
* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient
* [DocumentManifest](documentmanifest.html): The subject of the set of documents
* [DocumentReference](documentreference.html): Who/what is the subject of the document
@@ -2738,10 +2662,10 @@ public class AllergyIntolerance extends DomainResource {
* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for
* Type: reference
- * Path: AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUseStatement.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient
+ * Path: AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUsage.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient
*
*/
- @SearchParamDefinition(name="patient", path="AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUseStatement.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): Who the sensitivity is for\r\n* [CarePlan](careplan.html): Who the care plan is for\r\n* [CareTeam](careteam.html): Who care team is for\r\n* [ClinicalImpression](clinicalimpression.html): Patient or group assessed\r\n* [Composition](composition.html): Who and/or what the composition is about\r\n* [Condition](condition.html): Who has the condition?\r\n* [Consent](consent.html): Who the consent applies to\r\n* [DetectedIssue](detectedissue.html): Associated patient\r\n* [DeviceRequest](devicerequest.html): Individual the service is ordered for\r\n* [DeviceUseStatement](deviceusestatement.html): Search by subject - a patient\r\n* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient\r\n* [DocumentManifest](documentmanifest.html): The subject of the set of documents\r\n* [DocumentReference](documentreference.html): Who/what is the subject of the document\r\n* [Encounter](encounter.html): The patient or group present at the encounter\r\n* [EpisodeOfCare](episodeofcare.html): The patient who is the focus of this episode of care\r\n* [FamilyMemberHistory](familymemberhistory.html): The identity of a subject to list family member history items for\r\n* [Flag](flag.html): The identity of a subject to list flags for\r\n* [Goal](goal.html): Who this goal is intended for\r\n* [ImagingStudy](imagingstudy.html): Who the study is about\r\n* [Immunization](immunization.html): The patient for the vaccination record\r\n* [List](list.html): If all resources have the same subject\r\n* [MedicationAdministration](medicationadministration.html): The identity of a patient to list administrations for\r\n* [MedicationDispense](medicationdispense.html): The identity of a patient to list dispenses for\r\n* [MedicationRequest](medicationrequest.html): Returns prescriptions for a specific patient\r\n* [MedicationUsage](medicationusage.html): Returns statements for a specific patient.\r\n* [NutritionOrder](nutritionorder.html): The identity of the person who requires the diet, formula or nutritional supplement\r\n* [Observation](observation.html): The subject that the observation is about (if patient)\r\n* [Procedure](procedure.html): Search by subject - a patient\r\n* [RiskAssessment](riskassessment.html): Who/what does assessment apply to?\r\n* [ServiceRequest](servicerequest.html): Search by subject - a patient\r\n* [SupplyDelivery](supplydelivery.html): Patient for whom the item is supplied\r\n* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for\r\n", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, target={Group.class, Patient.class } )
+ @SearchParamDefinition(name="patient", path="AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUsage.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): Who the sensitivity is for\r\n* [CarePlan](careplan.html): Who the care plan is for\r\n* [CareTeam](careteam.html): Who care team is for\r\n* [ClinicalImpression](clinicalimpression.html): Patient or group assessed\r\n* [Composition](composition.html): Who and/or what the composition is about\r\n* [Condition](condition.html): Who has the condition?\r\n* [Consent](consent.html): Who the consent applies to\r\n* [DetectedIssue](detectedissue.html): Associated patient\r\n* [DeviceRequest](devicerequest.html): Individual the service is ordered for\r\n* [DeviceUsage](deviceusage.html): Search by subject - a patient\r\n* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient\r\n* [DocumentManifest](documentmanifest.html): The subject of the set of documents\r\n* [DocumentReference](documentreference.html): Who/what is the subject of the document\r\n* [Encounter](encounter.html): The patient or group present at the encounter\r\n* [EpisodeOfCare](episodeofcare.html): The patient who is the focus of this episode of care\r\n* [FamilyMemberHistory](familymemberhistory.html): The identity of a subject to list family member history items for\r\n* [Flag](flag.html): The identity of a subject to list flags for\r\n* [Goal](goal.html): Who this goal is intended for\r\n* [ImagingStudy](imagingstudy.html): Who the study is about\r\n* [Immunization](immunization.html): The patient for the vaccination record\r\n* [List](list.html): If all resources have the same subject\r\n* [MedicationAdministration](medicationadministration.html): The identity of a patient to list administrations for\r\n* [MedicationDispense](medicationdispense.html): The identity of a patient to list dispenses for\r\n* [MedicationRequest](medicationrequest.html): Returns prescriptions for a specific patient\r\n* [MedicationUsage](medicationusage.html): Returns statements for a specific patient.\r\n* [NutritionOrder](nutritionorder.html): The identity of the person who requires the diet, formula or nutritional supplement\r\n* [Observation](observation.html): The subject that the observation is about (if patient)\r\n* [Procedure](procedure.html): Search by subject - a patient\r\n* [RiskAssessment](riskassessment.html): Who/what does assessment apply to?\r\n* [ServiceRequest](servicerequest.html): Search by subject - a patient\r\n* [SupplyDelivery](supplydelivery.html): Patient for whom the item is supplied\r\n* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for\r\n", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUsage.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, InventoryReport.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_PATIENT = "patient";
/**
* Fluent Client search parameter constant for patient
@@ -2757,7 +2681,7 @@ public class AllergyIntolerance extends DomainResource {
* [Consent](consent.html): Who the consent applies to
* [DetectedIssue](detectedissue.html): Associated patient
* [DeviceRequest](devicerequest.html): Individual the service is ordered for
-* [DeviceUseStatement](deviceusestatement.html): Search by subject - a patient
+* [DeviceUsage](deviceusage.html): Search by subject - a patient
* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient
* [DocumentManifest](documentmanifest.html): The subject of the set of documents
* [DocumentReference](documentreference.html): Who/what is the subject of the document
@@ -2782,7 +2706,7 @@ public class AllergyIntolerance extends DomainResource {
* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for
* Type: reference
- * Path: AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUseStatement.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient
+ * Path: AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUsage.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient
*
*/
public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
@@ -2793,6 +2717,72 @@ public class AllergyIntolerance extends DomainResource {
*/
public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("AllergyIntolerance:patient").toLocked();
+ /**
+ * Search parameter: recorder
+ *
+ * Description: Who recorded the sensitivity
+ * Type: reference
+ * Path: AllergyIntolerance.recorder
+ *
+ */
+ @SearchParamDefinition(name="recorder", path="AllergyIntolerance.recorder", description="Who recorded the sensitivity", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Practitioner") }, target={Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
+ public static final String SP_RECORDER = "recorder";
+ /**
+ * Fluent Client search parameter constant for recorder
+ *
+ * Description: Who recorded the sensitivity
+ * Type: reference
+ * Path: AllergyIntolerance.recorder
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECORDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECORDER);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "AllergyIntolerance:recorder".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_RECORDER = new ca.uhn.fhir.model.api.Include("AllergyIntolerance:recorder").toLocked();
+
+ /**
+ * Search parameter: route
+ *
+ * Description: How the subject was exposed to the substance
+ * Type: token
+ * Path: AllergyIntolerance.reaction.exposureRoute
+ *
+ */
+ @SearchParamDefinition(name="route", path="AllergyIntolerance.reaction.exposureRoute", description="How the subject was exposed to the substance", type="token" )
+ public static final String SP_ROUTE = "route";
+ /**
+ * Fluent Client search parameter constant for route
+ *
+ * Description: How the subject was exposed to the substance
+ * Type: token
+ * Path: AllergyIntolerance.reaction.exposureRoute
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam ROUTE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ROUTE);
+
+ /**
+ * Search parameter: severity
+ *
+ * Description: mild | moderate | severe (of event as a whole)
+ * Type: token
+ * Path: AllergyIntolerance.reaction.severity
+ *
+ */
+ @SearchParamDefinition(name="severity", path="AllergyIntolerance.reaction.severity", description="mild | moderate | severe (of event as a whole)", type="token" )
+ public static final String SP_SEVERITY = "severity";
+ /**
+ * Fluent Client search parameter constant for severity
+ *
+ * Description: mild | moderate | severe (of event as a whole)
+ * Type: token
+ * Path: AllergyIntolerance.reaction.severity
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam SEVERITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SEVERITY);
+
/**
* Search parameter: type
*
@@ -2829,6 +2819,26 @@ public class AllergyIntolerance extends DomainResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
+ /**
+ * Search parameter: verification-status
+ *
+ * Description: unconfirmed | presumed | confirmed | refuted | entered-in-error
+ * Type: token
+ * Path: AllergyIntolerance.verificationStatus
+ *
+ */
+ @SearchParamDefinition(name="verification-status", path="AllergyIntolerance.verificationStatus", description="unconfirmed | presumed | confirmed | refuted | entered-in-error", type="token" )
+ public static final String SP_VERIFICATION_STATUS = "verification-status";
+ /**
+ * Fluent Client search parameter constant for verification-status
+ *
+ * Description: unconfirmed | presumed | confirmed | refuted | entered-in-error
+ * Type: token
+ * Path: AllergyIntolerance.verificationStatus
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERIFICATION_STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERIFICATION_STATUS);
+
}
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Annotation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Annotation.java
index 8ca5873ba..bd7a8e49d 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Annotation.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Annotation.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -53,7 +53,7 @@ public class Annotation extends DataType implements ICompositeType {
/**
* The individual responsible for making the annotation.
*/
- @Child(name = "author", type = {Practitioner.class, Patient.class, RelatedPerson.class, Organization.class, StringType.class}, order=0, min=0, max=1, modifier=false, summary=true)
+ @Child(name = "author", type = {Practitioner.class, PractitionerRole.class, Patient.class, RelatedPerson.class, Organization.class, StringType.class}, order=0, min=0, max=1, modifier=false, summary=true)
@Description(shortDefinition="Individual responsible for the annotation", formalDefinition="The individual responsible for making the annotation." )
protected DataType author;
@@ -235,7 +235,7 @@ public class Annotation extends DataType implements ICompositeType {
protected void listChildren(List children) {
super.listChildren(children);
- children.add(new Property("author[x]", "Reference(Practitioner|Patient|RelatedPerson|Organization)|string", "The individual responsible for making the annotation.", 0, 1, author));
+ children.add(new Property("author[x]", "Reference(Practitioner|PractitionerRole|Patient|RelatedPerson|Organization)|string", "The individual responsible for making the annotation.", 0, 1, author));
children.add(new Property("time", "dateTime", "Indicates when this particular annotation was made.", 0, 1, time));
children.add(new Property("text", "markdown", "The text of the annotation in markdown format.", 0, 1, text));
}
@@ -243,9 +243,9 @@ public class Annotation extends DataType implements ICompositeType {
@Override
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
- case 1475597077: /*author[x]*/ return new Property("author[x]", "Reference(Practitioner|Patient|RelatedPerson|Organization)|string", "The individual responsible for making the annotation.", 0, 1, author);
- case -1406328437: /*author*/ return new Property("author[x]", "Reference(Practitioner|Patient|RelatedPerson|Organization)|string", "The individual responsible for making the annotation.", 0, 1, author);
- case 305515008: /*authorReference*/ return new Property("author[x]", "Reference(Practitioner|Patient|RelatedPerson|Organization)", "The individual responsible for making the annotation.", 0, 1, author);
+ case 1475597077: /*author[x]*/ return new Property("author[x]", "Reference(Practitioner|PractitionerRole|Patient|RelatedPerson|Organization)|string", "The individual responsible for making the annotation.", 0, 1, author);
+ case -1406328437: /*author*/ return new Property("author[x]", "Reference(Practitioner|PractitionerRole|Patient|RelatedPerson|Organization)|string", "The individual responsible for making the annotation.", 0, 1, author);
+ case 305515008: /*authorReference*/ return new Property("author[x]", "Reference(Practitioner|PractitionerRole|Patient|RelatedPerson|Organization)", "The individual responsible for making the annotation.", 0, 1, author);
case 290249084: /*authorString*/ return new Property("author[x]", "string", "The individual responsible for making the annotation.", 0, 1, author);
case 3560141: /*time*/ return new Property("time", "dateTime", "Indicates when this particular annotation was made.", 0, 1, time);
case 3556653: /*text*/ return new Property("text", "markdown", "The text of the annotation in markdown format.", 0, 1, text);
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Appointment.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Appointment.java
index 0df53ef91..4f9ac47fe 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Appointment.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Appointment.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -138,7 +138,6 @@ public class Appointment extends DomainResource {
case ENTEREDINERROR: return "entered-in-error";
case CHECKEDIN: return "checked-in";
case WAITLIST: return "waitlist";
- case NULL: return null;
default: return "?";
}
}
@@ -154,7 +153,6 @@ public class Appointment extends DomainResource {
case ENTEREDINERROR: return "http://hl7.org/fhir/appointmentstatus";
case CHECKEDIN: return "http://hl7.org/fhir/appointmentstatus";
case WAITLIST: return "http://hl7.org/fhir/appointmentstatus";
- case NULL: return null;
default: return "?";
}
}
@@ -170,7 +168,6 @@ public class Appointment extends DomainResource {
case ENTEREDINERROR: return "This instance should not have been part of this patient's medical record.";
case CHECKEDIN: return "When checked in, all pre-encounter administrative work is complete, and the encounter may begin. (where multiple patients are involved, they are all present).";
case WAITLIST: return "The appointment has been placed on a waitlist, to be scheduled/confirmed in the future when a slot/service is available.\nA specific time might or might not be pre-allocated.";
- case NULL: return null;
default: return "?";
}
}
@@ -186,7 +183,6 @@ public class Appointment extends DomainResource {
case ENTEREDINERROR: return "Entered in error";
case CHECKEDIN: return "Checked In";
case WAITLIST: return "Waitlisted";
- case NULL: return null;
default: return "?";
}
}
@@ -313,7 +309,6 @@ public class Appointment extends DomainResource {
case REQUIRED: return "required";
case OPTIONAL: return "optional";
case INFORMATIONONLY: return "information-only";
- case NULL: return null;
default: return "?";
}
}
@@ -322,7 +317,6 @@ public class Appointment extends DomainResource {
case REQUIRED: return "http://hl7.org/fhir/participantrequired";
case OPTIONAL: return "http://hl7.org/fhir/participantrequired";
case INFORMATIONONLY: return "http://hl7.org/fhir/participantrequired";
- case NULL: return null;
default: return "?";
}
}
@@ -331,7 +325,6 @@ public class Appointment extends DomainResource {
case REQUIRED: return "The participant is required to attend the appointment.";
case OPTIONAL: return "The participant may optionally attend the appointment.";
case INFORMATIONONLY: return "The participant is excluded from the appointment, and might not be informed of the appointment taking place. (Appointment is about them, not for them - such as 2 doctors discussing results about a patient's test).";
- case NULL: return null;
default: return "?";
}
}
@@ -340,7 +333,6 @@ public class Appointment extends DomainResource {
case REQUIRED: return "Required";
case OPTIONAL: return "Optional";
case INFORMATIONONLY: return "Information Only";
- case NULL: return null;
default: return "?";
}
}
@@ -887,9 +879,10 @@ public class Appointment extends DomainResource {
/**
* The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority).
*/
- @Child(name = "priority", type = {UnsignedIntType.class}, order=8, min=0, max=1, modifier=false, summary=false)
+ @Child(name = "priority", type = {CodeableConcept.class}, order=8, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Used to make informed decisions if needing to re-prioritize", formalDefinition="The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority)." )
- protected UnsignedIntType priority;
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://terminology.hl7.org/ValueSet/v3-ActPriority")
+ protected CodeableConcept priority;
/**
* The brief description of the appointment as would be shown on a subject line in a meeting request, or appointment list. Detailed or expanded information should be put in the comment field.
@@ -977,7 +970,7 @@ The duration (usually in minutes) could also be provided to indicate the length
@Description(shortDefinition="Potential date/time interval(s) requested to allocate the appointment within", formalDefinition="A set of date ranges (potentially including times) that the appointment is preferred to be scheduled within.\n\nThe duration (usually in minutes) could also be provided to indicate the length of the appointment to fill and populate the start/end times for the actual allocated time. However, in other situations the duration may be calculated by the scheduling system." )
protected List requestedPeriod;
- private static final long serialVersionUID = 1849497415L;
+ private static final long serialVersionUID = -1194073126L;
/**
* Constructor
@@ -1354,50 +1347,29 @@ The duration (usually in minutes) could also be provided to indicate the length
}
/**
- * @return {@link #priority} (The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority).). This is the underlying object with id, value and extensions. The accessor "getPriority" gives direct access to the value
+ * @return {@link #priority} (The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority).)
*/
- public UnsignedIntType getPriorityElement() {
+ public CodeableConcept getPriority() {
if (this.priority == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create Appointment.priority");
else if (Configuration.doAutoCreate())
- this.priority = new UnsignedIntType(); // bb
+ this.priority = new CodeableConcept(); // cc
return this.priority;
}
- public boolean hasPriorityElement() {
- return this.priority != null && !this.priority.isEmpty();
- }
-
public boolean hasPriority() {
return this.priority != null && !this.priority.isEmpty();
}
/**
- * @param value {@link #priority} (The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority).). This is the underlying object with id, value and extensions. The accessor "getPriority" gives direct access to the value
+ * @param value {@link #priority} (The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority).)
*/
- public Appointment setPriorityElement(UnsignedIntType value) {
+ public Appointment setPriority(CodeableConcept value) {
this.priority = value;
return this;
}
- /**
- * @return The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority).
- */
- public int getPriority() {
- return this.priority == null || this.priority.isEmpty() ? 0 : this.priority.getValue();
- }
-
- /**
- * @param value The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority).
- */
- public Appointment setPriority(int value) {
- if (this.priority == null)
- this.priority = new UnsignedIntType();
- this.priority.setValue(value);
- return this;
- }
-
/**
* @return {@link #description} (The brief description of the appointment as would be shown on a subject line in a meeting request, or appointment list. Detailed or expanded information should be put in the comment field.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
@@ -2014,7 +1986,7 @@ The duration (usually in minutes) could also be provided to indicate the length
children.add(new Property("specialty", "CodeableConcept", "The specialty of a practitioner that would be required to perform the service requested in this appointment.", 0, java.lang.Integer.MAX_VALUE, specialty));
children.add(new Property("appointmentType", "CodeableConcept", "The style of appointment or patient that has been booked in the slot (not service type).", 0, 1, appointmentType));
children.add(new Property("reason", "CodeableReference(Condition|Procedure|Observation|ImmunizationRecommendation)", "The reason that this appointment is being scheduled. This is more clinical than administrative. This can be coded, or as specified using information from another resource. When the patient arrives and the encounter begins it may be used as the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.", 0, java.lang.Integer.MAX_VALUE, reason));
- children.add(new Property("priority", "unsignedInt", "The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority).", 0, 1, priority));
+ children.add(new Property("priority", "CodeableConcept", "The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority).", 0, 1, priority));
children.add(new Property("description", "string", "The brief description of the appointment as would be shown on a subject line in a meeting request, or appointment list. Detailed or expanded information should be put in the comment field.", 0, 1, description));
children.add(new Property("supportingInformation", "Reference(Any)", "Additional information to support the appointment provided when making the appointment.", 0, java.lang.Integer.MAX_VALUE, supportingInformation));
children.add(new Property("start", "instant", "Date/Time that the appointment is to take place.", 0, 1, start));
@@ -2040,7 +2012,7 @@ The duration (usually in minutes) could also be provided to indicate the length
case -1694759682: /*specialty*/ return new Property("specialty", "CodeableConcept", "The specialty of a practitioner that would be required to perform the service requested in this appointment.", 0, java.lang.Integer.MAX_VALUE, specialty);
case -1596426375: /*appointmentType*/ return new Property("appointmentType", "CodeableConcept", "The style of appointment or patient that has been booked in the slot (not service type).", 0, 1, appointmentType);
case -934964668: /*reason*/ return new Property("reason", "CodeableReference(Condition|Procedure|Observation|ImmunizationRecommendation)", "The reason that this appointment is being scheduled. This is more clinical than administrative. This can be coded, or as specified using information from another resource. When the patient arrives and the encounter begins it may be used as the admission diagnosis. The indication will typically be a Condition (with other resources referenced in the evidence.detail), or a Procedure.", 0, java.lang.Integer.MAX_VALUE, reason);
- case -1165461084: /*priority*/ return new Property("priority", "unsignedInt", "The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority).", 0, 1, priority);
+ case -1165461084: /*priority*/ return new Property("priority", "CodeableConcept", "The priority of the appointment. Can be used to make informed decisions if needing to re-prioritize appointments. (The iCal Standard specifies 0 as undefined, 1 as highest, 9 as lowest priority).", 0, 1, priority);
case -1724546052: /*description*/ return new Property("description", "string", "The brief description of the appointment as would be shown on a subject line in a meeting request, or appointment list. Detailed or expanded information should be put in the comment field.", 0, 1, description);
case -1248768647: /*supportingInformation*/ return new Property("supportingInformation", "Reference(Any)", "Additional information to support the appointment provided when making the appointment.", 0, java.lang.Integer.MAX_VALUE, supportingInformation);
case 109757538: /*start*/ return new Property("start", "instant", "Date/Time that the appointment is to take place.", 0, 1, start);
@@ -2069,7 +2041,7 @@ The duration (usually in minutes) could also be provided to indicate the length
case -1694759682: /*specialty*/ return this.specialty == null ? new Base[0] : this.specialty.toArray(new Base[this.specialty.size()]); // CodeableConcept
case -1596426375: /*appointmentType*/ return this.appointmentType == null ? new Base[0] : new Base[] {this.appointmentType}; // CodeableConcept
case -934964668: /*reason*/ return this.reason == null ? new Base[0] : this.reason.toArray(new Base[this.reason.size()]); // CodeableReference
- case -1165461084: /*priority*/ return this.priority == null ? new Base[0] : new Base[] {this.priority}; // UnsignedIntType
+ case -1165461084: /*priority*/ return this.priority == null ? new Base[0] : new Base[] {this.priority}; // CodeableConcept
case -1724546052: /*description*/ return this.description == null ? new Base[0] : new Base[] {this.description}; // StringType
case -1248768647: /*supportingInformation*/ return this.supportingInformation == null ? new Base[0] : this.supportingInformation.toArray(new Base[this.supportingInformation.size()]); // Reference
case 109757538: /*start*/ return this.start == null ? new Base[0] : new Base[] {this.start}; // InstantType
@@ -2116,7 +2088,7 @@ The duration (usually in minutes) could also be provided to indicate the length
this.getReason().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference
return value;
case -1165461084: // priority
- this.priority = TypeConvertor.castToUnsignedInt(value); // UnsignedIntType
+ this.priority = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
return value;
case -1724546052: // description
this.description = TypeConvertor.castToString(value); // StringType
@@ -2179,7 +2151,7 @@ The duration (usually in minutes) could also be provided to indicate the length
} else if (name.equals("reason")) {
this.getReason().add(TypeConvertor.castToCodeableReference(value));
} else if (name.equals("priority")) {
- this.priority = TypeConvertor.castToUnsignedInt(value); // UnsignedIntType
+ this.priority = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
} else if (name.equals("description")) {
this.description = TypeConvertor.castToString(value); // StringType
} else if (name.equals("supportingInformation")) {
@@ -2220,7 +2192,7 @@ The duration (usually in minutes) could also be provided to indicate the length
case -1694759682: return addSpecialty();
case -1596426375: return getAppointmentType();
case -934964668: return addReason();
- case -1165461084: return getPriorityElement();
+ case -1165461084: return getPriority();
case -1724546052: return getDescriptionElement();
case -1248768647: return addSupportingInformation();
case 109757538: return getStartElement();
@@ -2249,7 +2221,7 @@ The duration (usually in minutes) could also be provided to indicate the length
case -1694759682: /*specialty*/ return new String[] {"CodeableConcept"};
case -1596426375: /*appointmentType*/ return new String[] {"CodeableConcept"};
case -934964668: /*reason*/ return new String[] {"CodeableReference"};
- case -1165461084: /*priority*/ return new String[] {"unsignedInt"};
+ case -1165461084: /*priority*/ return new String[] {"CodeableConcept"};
case -1724546052: /*description*/ return new String[] {"string"};
case -1248768647: /*supportingInformation*/ return new String[] {"Reference"};
case 109757538: /*start*/ return new String[] {"instant"};
@@ -2296,7 +2268,8 @@ The duration (usually in minutes) could also be provided to indicate the length
return addReason();
}
else if (name.equals("priority")) {
- throw new FHIRException("Cannot call addChild on a primitive type Appointment.priority");
+ this.priority = new CodeableConcept();
+ return this.priority;
}
else if (name.equals("description")) {
throw new FHIRException("Cannot call addChild on a primitive type Appointment.description");
@@ -2443,9 +2416,9 @@ The duration (usually in minutes) could also be provided to indicate the length
if (!(other_ instanceof Appointment))
return false;
Appointment o = (Appointment) other_;
- return compareValues(status, o.status, true) && compareValues(priority, o.priority, true) && compareValues(description, o.description, true)
- && compareValues(start, o.start, true) && compareValues(end, o.end, true) && compareValues(minutesDuration, o.minutesDuration, true)
- && compareValues(created, o.created, true) && compareValues(comment, o.comment, true) && compareValues(patientInstruction, o.patientInstruction, true)
+ return compareValues(status, o.status, true) && compareValues(description, o.description, true) && compareValues(start, o.start, true)
+ && compareValues(end, o.end, true) && compareValues(minutesDuration, o.minutesDuration, true) && compareValues(created, o.created, true)
+ && compareValues(comment, o.comment, true) && compareValues(patientInstruction, o.patientInstruction, true)
;
}
@@ -2581,7 +2554,7 @@ The duration (usually in minutes) could also be provided to indicate the length
* Path: Appointment.participant.actor.where(resolve() is Location)
*
*/
- @SearchParamDefinition(name="location", path="Appointment.participant.actor.where(resolve() is Location)", description="This location is listed in the participants of the appointment", type="reference", target={Location.class } )
+ @SearchParamDefinition(name="location", path="Appointment.participant.actor.where(resolve() is Location)", description="This location is listed in the participants of the appointment", type="reference", target={Device.class, HealthcareService.class, Location.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
public static final String SP_LOCATION = "location";
/**
* Fluent Client search parameter constant for location
@@ -2627,7 +2600,7 @@ The duration (usually in minutes) could also be provided to indicate the length
* Path: Appointment.participant.actor.where(resolve() is Patient)
*
*/
- @SearchParamDefinition(name="patient", path="Appointment.participant.actor.where(resolve() is Patient)", description="One of the individuals of the appointment is this patient", type="reference", target={Patient.class } )
+ @SearchParamDefinition(name="patient", path="Appointment.participant.actor.where(resolve() is Patient)", description="One of the individuals of the appointment is this patient", type="reference", target={Device.class, HealthcareService.class, Location.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
public static final String SP_PATIENT = "patient";
/**
* Fluent Client search parameter constant for patient
@@ -2653,7 +2626,7 @@ The duration (usually in minutes) could also be provided to indicate the length
* Path: Appointment.participant.actor.where(resolve() is Practitioner)
*
*/
- @SearchParamDefinition(name="practitioner", path="Appointment.participant.actor.where(resolve() is Practitioner)", description="One of the individuals of the appointment is this practitioner", type="reference", target={Practitioner.class } )
+ @SearchParamDefinition(name="practitioner", path="Appointment.participant.actor.where(resolve() is Practitioner)", description="One of the individuals of the appointment is this practitioner", type="reference", target={Device.class, HealthcareService.class, Location.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
public static final String SP_PRACTITIONER = "practitioner";
/**
* Fluent Client search parameter constant for practitioner
@@ -2831,7 +2804,7 @@ The duration (usually in minutes) could also be provided to indicate the length
* Path: Appointment.supportingInformation
*
*/
- @SearchParamDefinition(name="supporting-info", path="Appointment.supportingInformation", description="Additional information to support the appointment", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="supporting-info", path="Appointment.supportingInformation", description="Additional information to support the appointment", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUsage.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, InventoryReport.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_SUPPORTING_INFO = "supporting-info";
/**
* Fluent Client search parameter constant for supporting-info
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AppointmentResponse.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AppointmentResponse.java
index 066931b47..a9059c7ad 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AppointmentResponse.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AppointmentResponse.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -789,7 +789,7 @@ public class AppointmentResponse extends DomainResource {
* Path: AppointmentResponse.actor.where(resolve() is Location)
*
*/
- @SearchParamDefinition(name="location", path="AppointmentResponse.actor.where(resolve() is Location)", description="This Response is for this Location", type="reference", target={Location.class } )
+ @SearchParamDefinition(name="location", path="AppointmentResponse.actor.where(resolve() is Location)", description="This Response is for this Location", type="reference", target={Device.class, HealthcareService.class, Location.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
public static final String SP_LOCATION = "location";
/**
* Fluent Client search parameter constant for location
@@ -835,7 +835,7 @@ public class AppointmentResponse extends DomainResource {
* Path: AppointmentResponse.actor.where(resolve() is Patient)
*
*/
- @SearchParamDefinition(name="patient", path="AppointmentResponse.actor.where(resolve() is Patient)", description="This Response is for this Patient", type="reference", target={Patient.class } )
+ @SearchParamDefinition(name="patient", path="AppointmentResponse.actor.where(resolve() is Patient)", description="This Response is for this Patient", type="reference", target={Device.class, HealthcareService.class, Location.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
public static final String SP_PATIENT = "patient";
/**
* Fluent Client search parameter constant for patient
@@ -861,7 +861,7 @@ public class AppointmentResponse extends DomainResource {
* Path: AppointmentResponse.actor.where(resolve() is Practitioner)
*
*/
- @SearchParamDefinition(name="practitioner", path="AppointmentResponse.actor.where(resolve() is Practitioner)", description="This Response is for this Practitioner", type="reference", target={Practitioner.class } )
+ @SearchParamDefinition(name="practitioner", path="AppointmentResponse.actor.where(resolve() is Practitioner)", description="This Response is for this Practitioner", type="reference", target={Device.class, HealthcareService.class, Location.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
public static final String SP_PRACTITIONER = "practitioner";
/**
* Fluent Client search parameter constant for practitioner
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Attachment.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Attachment.java
index 0d871780c..821cd2d31 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Attachment.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Attachment.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AuditEvent.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AuditEvent.java
index 992f31df5..2d181b729 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AuditEvent.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AuditEvent.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -103,7 +103,6 @@ public class AuditEvent extends DomainResource {
case U: return "U";
case D: return "D";
case E: return "E";
- case NULL: return null;
default: return "?";
}
}
@@ -114,7 +113,6 @@ public class AuditEvent extends DomainResource {
case U: return "http://hl7.org/fhir/audit-event-action";
case D: return "http://hl7.org/fhir/audit-event-action";
case E: return "http://hl7.org/fhir/audit-event-action";
- case NULL: return null;
default: return "?";
}
}
@@ -125,7 +123,6 @@ public class AuditEvent extends DomainResource {
case U: return "Update data, such as revise patient information.";
case D: return "Delete items, such as a doctor master file record.";
case E: return "Perform a system or application function such as log-on, program execution or use of an object's method, or perform a query/search operation.";
- case NULL: return null;
default: return "?";
}
}
@@ -136,7 +133,6 @@ public class AuditEvent extends DomainResource {
case U: return "Update";
case D: return "Delete";
case E: return "Execute";
- case NULL: return null;
default: return "?";
}
}
@@ -247,7 +243,6 @@ public class AuditEvent extends DomainResource {
case _3: return "3";
case _4: return "4";
case _5: return "5";
- case NULL: return null;
default: return "?";
}
}
@@ -258,7 +253,6 @@ public class AuditEvent extends DomainResource {
case _3: return "http://hl7.org/fhir/network-type";
case _4: return "http://hl7.org/fhir/network-type";
case _5: return "http://hl7.org/fhir/network-type";
- case NULL: return null;
default: return "?";
}
}
@@ -269,7 +263,6 @@ public class AuditEvent extends DomainResource {
case _3: return "The assigned telephone number.";
case _4: return "The assigned email address.";
case _5: return "URI (User directory, HTTP-PUT, ftp, etc.).";
- case NULL: return null;
default: return "?";
}
}
@@ -280,7 +273,6 @@ public class AuditEvent extends DomainResource {
case _3: return "Telephone Number";
case _4: return "Email address";
case _5: return "URI";
- case NULL: return null;
default: return "?";
}
}
@@ -412,7 +404,6 @@ public class AuditEvent extends DomainResource {
case NOTICE: return "notice";
case INFORMATIONAL: return "informational";
case DEBUG: return "debug";
- case NULL: return null;
default: return "?";
}
}
@@ -426,7 +417,6 @@ public class AuditEvent extends DomainResource {
case NOTICE: return "http://hl7.org/fhir/audit-event-severity";
case INFORMATIONAL: return "http://hl7.org/fhir/audit-event-severity";
case DEBUG: return "http://hl7.org/fhir/audit-event-severity";
- case NULL: return null;
default: return "?";
}
}
@@ -440,7 +430,6 @@ public class AuditEvent extends DomainResource {
case NOTICE: return "Normal but significant condition.";
case INFORMATIONAL: return "Informational messages.";
case DEBUG: return "Debug-level messages.";
- case NULL: return null;
default: return "?";
}
}
@@ -454,7 +443,6 @@ public class AuditEvent extends DomainResource {
case NOTICE: return "Notice";
case INFORMATIONAL: return "Informational";
case DEBUG: return "Debug";
- case NULL: return null;
default: return "?";
}
}
@@ -1610,7 +1598,7 @@ public class AuditEvent extends DomainResource {
*/
@Child(name = "type", type = {Coding.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="The type of source where event originated", formalDefinition="Code specifying the type of source where event originated." )
- @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/audit-source-type")
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/security-source-type")
protected List type;
private static final long serialVersionUID = 31014963L;
@@ -2826,28 +2814,42 @@ public class AuditEvent extends DomainResource {
@ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://terminology.hl7.org/ValueSet/v3-PurposeOfUse")
protected List purposeOfEvent;
+ /**
+ * Allows tracing of authorizatino for the events and tracking whether proposals/recommendations were acted upon.
+ */
+ @Child(name = "basedOn", type = {CarePlan.class, DeviceRequest.class, ImmunizationRecommendation.class, MedicationRequest.class, NutritionOrder.class, ServiceRequest.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Workflow authorization within which this event occurred", formalDefinition="Allows tracing of authorizatino for the events and tracking whether proposals/recommendations were acted upon." )
+ protected List basedOn;
+
+ /**
+ * This will typically be the encounter the event occurred, but some events may be initiated prior to or after the official completion of an encounter but still be tied to the context of the encounter (e.g. pre-admission lab tests).
+ */
+ @Child(name = "encounter", type = {Encounter.class}, order=9, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Encounter within which this event occurred or which the event is tightly associated", formalDefinition="This will typically be the encounter the event occurred, but some events may be initiated prior to or after the official completion of an encounter but still be tied to the context of the encounter (e.g. pre-admission lab tests)." )
+ protected Reference encounter;
+
/**
* An actor taking an active role in the event or activity that is logged.
*/
- @Child(name = "agent", type = {}, order=8, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "agent", type = {}, order=10, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Actor involved in the event", formalDefinition="An actor taking an active role in the event or activity that is logged." )
protected List agent;
/**
* The system that is reporting the event.
*/
- @Child(name = "source", type = {}, order=9, min=1, max=1, modifier=false, summary=false)
+ @Child(name = "source", type = {}, order=11, min=1, max=1, modifier=false, summary=false)
@Description(shortDefinition="Audit Event Reporter", formalDefinition="The system that is reporting the event." )
protected AuditEventSourceComponent source;
/**
* Specific instances of data or objects that have been accessed.
*/
- @Child(name = "entity", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "entity", type = {}, order=12, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Data or objects used", formalDefinition="Specific instances of data or objects that have been accessed." )
protected List entity;
- private static final long serialVersionUID = -446219294L;
+ private static final long serialVersionUID = -702709297L;
/**
* Constructor
@@ -3188,6 +3190,83 @@ public class AuditEvent extends DomainResource {
return getPurposeOfEvent().get(0);
}
+ /**
+ * @return {@link #basedOn} (Allows tracing of authorizatino for the events and tracking whether proposals/recommendations were acted upon.)
+ */
+ public List getBasedOn() {
+ if (this.basedOn == null)
+ this.basedOn = new ArrayList();
+ return this.basedOn;
+ }
+
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public AuditEvent setBasedOn(List theBasedOn) {
+ this.basedOn = theBasedOn;
+ return this;
+ }
+
+ public boolean hasBasedOn() {
+ if (this.basedOn == null)
+ return false;
+ for (Reference item : this.basedOn)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public Reference addBasedOn() { //3
+ Reference t = new Reference();
+ if (this.basedOn == null)
+ this.basedOn = new ArrayList();
+ this.basedOn.add(t);
+ return t;
+ }
+
+ public AuditEvent addBasedOn(Reference t) { //3
+ if (t == null)
+ return this;
+ if (this.basedOn == null)
+ this.basedOn = new ArrayList();
+ this.basedOn.add(t);
+ return this;
+ }
+
+ /**
+ * @return The first repetition of repeating field {@link #basedOn}, creating it if it does not already exist {3}
+ */
+ public Reference getBasedOnFirstRep() {
+ if (getBasedOn().isEmpty()) {
+ addBasedOn();
+ }
+ return getBasedOn().get(0);
+ }
+
+ /**
+ * @return {@link #encounter} (This will typically be the encounter the event occurred, but some events may be initiated prior to or after the official completion of an encounter but still be tied to the context of the encounter (e.g. pre-admission lab tests).)
+ */
+ public Reference getEncounter() {
+ if (this.encounter == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create AuditEvent.encounter");
+ else if (Configuration.doAutoCreate())
+ this.encounter = new Reference(); // cc
+ return this.encounter;
+ }
+
+ public boolean hasEncounter() {
+ return this.encounter != null && !this.encounter.isEmpty();
+ }
+
+ /**
+ * @param value {@link #encounter} (This will typically be the encounter the event occurred, but some events may be initiated prior to or after the official completion of an encounter but still be tied to the context of the encounter (e.g. pre-admission lab tests).)
+ */
+ public AuditEvent setEncounter(Reference value) {
+ this.encounter = value;
+ return this;
+ }
+
/**
* @return {@link #agent} (An actor taking an active role in the event or activity that is logged.)
*/
@@ -3328,6 +3407,8 @@ public class AuditEvent extends DomainResource {
children.add(new Property("recorded", "instant", "The time when the event was recorded.", 0, 1, recorded));
children.add(new Property("outcome", "CodeableConcept", "Indicates whether the event succeeded or failed. A free text descripiton can be given in outcome.text.", 0, 1, outcome));
children.add(new Property("purposeOfEvent", "CodeableConcept", "The purposeOfUse (reason) that was used during the event being recorded.", 0, java.lang.Integer.MAX_VALUE, purposeOfEvent));
+ children.add(new Property("basedOn", "Reference(CarePlan|DeviceRequest|ImmunizationRecommendation|MedicationRequest|NutritionOrder|ServiceRequest)", "Allows tracing of authorizatino for the events and tracking whether proposals/recommendations were acted upon.", 0, java.lang.Integer.MAX_VALUE, basedOn));
+ children.add(new Property("encounter", "Reference(Encounter)", "This will typically be the encounter the event occurred, but some events may be initiated prior to or after the official completion of an encounter but still be tied to the context of the encounter (e.g. pre-admission lab tests).", 0, 1, encounter));
children.add(new Property("agent", "", "An actor taking an active role in the event or activity that is logged.", 0, java.lang.Integer.MAX_VALUE, agent));
children.add(new Property("source", "", "The system that is reporting the event.", 0, 1, source));
children.add(new Property("entity", "", "Specific instances of data or objects that have been accessed.", 0, java.lang.Integer.MAX_VALUE, entity));
@@ -3344,6 +3425,8 @@ public class AuditEvent extends DomainResource {
case -799233872: /*recorded*/ return new Property("recorded", "instant", "The time when the event was recorded.", 0, 1, recorded);
case -1106507950: /*outcome*/ return new Property("outcome", "CodeableConcept", "Indicates whether the event succeeded or failed. A free text descripiton can be given in outcome.text.", 0, 1, outcome);
case -341917691: /*purposeOfEvent*/ return new Property("purposeOfEvent", "CodeableConcept", "The purposeOfUse (reason) that was used during the event being recorded.", 0, java.lang.Integer.MAX_VALUE, purposeOfEvent);
+ case -332612366: /*basedOn*/ return new Property("basedOn", "Reference(CarePlan|DeviceRequest|ImmunizationRecommendation|MedicationRequest|NutritionOrder|ServiceRequest)", "Allows tracing of authorizatino for the events and tracking whether proposals/recommendations were acted upon.", 0, java.lang.Integer.MAX_VALUE, basedOn);
+ case 1524132147: /*encounter*/ return new Property("encounter", "Reference(Encounter)", "This will typically be the encounter the event occurred, but some events may be initiated prior to or after the official completion of an encounter but still be tied to the context of the encounter (e.g. pre-admission lab tests).", 0, 1, encounter);
case 92750597: /*agent*/ return new Property("agent", "", "An actor taking an active role in the event or activity that is logged.", 0, java.lang.Integer.MAX_VALUE, agent);
case -896505829: /*source*/ return new Property("source", "", "The system that is reporting the event.", 0, 1, source);
case -1298275357: /*entity*/ return new Property("entity", "", "Specific instances of data or objects that have been accessed.", 0, java.lang.Integer.MAX_VALUE, entity);
@@ -3363,6 +3446,8 @@ public class AuditEvent extends DomainResource {
case -799233872: /*recorded*/ return this.recorded == null ? new Base[0] : new Base[] {this.recorded}; // InstantType
case -1106507950: /*outcome*/ return this.outcome == null ? new Base[0] : new Base[] {this.outcome}; // CodeableConcept
case -341917691: /*purposeOfEvent*/ return this.purposeOfEvent == null ? new Base[0] : this.purposeOfEvent.toArray(new Base[this.purposeOfEvent.size()]); // CodeableConcept
+ case -332612366: /*basedOn*/ return this.basedOn == null ? new Base[0] : this.basedOn.toArray(new Base[this.basedOn.size()]); // Reference
+ case 1524132147: /*encounter*/ return this.encounter == null ? new Base[0] : new Base[] {this.encounter}; // Reference
case 92750597: /*agent*/ return this.agent == null ? new Base[0] : this.agent.toArray(new Base[this.agent.size()]); // AuditEventAgentComponent
case -896505829: /*source*/ return this.source == null ? new Base[0] : new Base[] {this.source}; // AuditEventSourceComponent
case -1298275357: /*entity*/ return this.entity == null ? new Base[0] : this.entity.toArray(new Base[this.entity.size()]); // AuditEventEntityComponent
@@ -3400,6 +3485,12 @@ public class AuditEvent extends DomainResource {
case -341917691: // purposeOfEvent
this.getPurposeOfEvent().add(TypeConvertor.castToCodeableConcept(value)); // CodeableConcept
return value;
+ case -332612366: // basedOn
+ this.getBasedOn().add(TypeConvertor.castToReference(value)); // Reference
+ return value;
+ case 1524132147: // encounter
+ this.encounter = TypeConvertor.castToReference(value); // Reference
+ return value;
case 92750597: // agent
this.getAgent().add((AuditEventAgentComponent) value); // AuditEventAgentComponent
return value;
@@ -3434,6 +3525,10 @@ public class AuditEvent extends DomainResource {
this.outcome = TypeConvertor.castToCodeableConcept(value); // CodeableConcept
} else if (name.equals("purposeOfEvent")) {
this.getPurposeOfEvent().add(TypeConvertor.castToCodeableConcept(value));
+ } else if (name.equals("basedOn")) {
+ this.getBasedOn().add(TypeConvertor.castToReference(value));
+ } else if (name.equals("encounter")) {
+ this.encounter = TypeConvertor.castToReference(value); // Reference
} else if (name.equals("agent")) {
this.getAgent().add((AuditEventAgentComponent) value);
} else if (name.equals("source")) {
@@ -3456,6 +3551,8 @@ public class AuditEvent extends DomainResource {
case -799233872: return getRecordedElement();
case -1106507950: return getOutcome();
case -341917691: return addPurposeOfEvent();
+ case -332612366: return addBasedOn();
+ case 1524132147: return getEncounter();
case 92750597: return addAgent();
case -896505829: return getSource();
case -1298275357: return addEntity();
@@ -3475,6 +3572,8 @@ public class AuditEvent extends DomainResource {
case -799233872: /*recorded*/ return new String[] {"instant"};
case -1106507950: /*outcome*/ return new String[] {"CodeableConcept"};
case -341917691: /*purposeOfEvent*/ return new String[] {"CodeableConcept"};
+ case -332612366: /*basedOn*/ return new String[] {"Reference"};
+ case 1524132147: /*encounter*/ return new String[] {"Reference"};
case 92750597: /*agent*/ return new String[] {};
case -896505829: /*source*/ return new String[] {};
case -1298275357: /*entity*/ return new String[] {};
@@ -3512,6 +3611,13 @@ public class AuditEvent extends DomainResource {
else if (name.equals("purposeOfEvent")) {
return addPurposeOfEvent();
}
+ else if (name.equals("basedOn")) {
+ return addBasedOn();
+ }
+ else if (name.equals("encounter")) {
+ this.encounter = new Reference();
+ return this.encounter;
+ }
else if (name.equals("agent")) {
return addAgent();
}
@@ -3555,6 +3661,12 @@ public class AuditEvent extends DomainResource {
for (CodeableConcept i : purposeOfEvent)
dst.purposeOfEvent.add(i.copy());
};
+ if (basedOn != null) {
+ dst.basedOn = new ArrayList();
+ for (Reference i : basedOn)
+ dst.basedOn.add(i.copy());
+ };
+ dst.encounter = encounter == null ? null : encounter.copy();
if (agent != null) {
dst.agent = new ArrayList();
for (AuditEventAgentComponent i : agent)
@@ -3582,8 +3694,8 @@ public class AuditEvent extends DomainResource {
return compareDeep(type, o.type, true) && compareDeep(subtype, o.subtype, true) && compareDeep(action, o.action, true)
&& compareDeep(severity, o.severity, true) && compareDeep(period, o.period, true) && compareDeep(recorded, o.recorded, true)
&& compareDeep(outcome, o.outcome, true) && compareDeep(purposeOfEvent, o.purposeOfEvent, true)
- && compareDeep(agent, o.agent, true) && compareDeep(source, o.source, true) && compareDeep(entity, o.entity, true)
- ;
+ && compareDeep(basedOn, o.basedOn, true) && compareDeep(encounter, o.encounter, true) && compareDeep(agent, o.agent, true)
+ && compareDeep(source, o.source, true) && compareDeep(entity, o.entity, true);
}
@Override
@@ -3599,7 +3711,8 @@ public class AuditEvent extends DomainResource {
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, subtype, action, severity
- , period, recorded, outcome, purposeOfEvent, agent, source, entity);
+ , period, recorded, outcome, purposeOfEvent, basedOn, encounter, agent, source
+ , entity);
}
@Override
@@ -3647,6 +3760,32 @@ public class AuditEvent extends DomainResource {
*/
public static final ca.uhn.fhir.rest.gclient.StringClientParam ADDRESS = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ADDRESS);
+ /**
+ * Search parameter: agent
+ *
+ * Description: Identifier of who
+ * Type: reference
+ * Path: AuditEvent.agent.who
+ *
+ */
+ @SearchParamDefinition(name="agent", path="AuditEvent.agent.who", description="Identifier of who", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Device"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Practitioner") }, target={Device.class, Organization.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
+ public static final String SP_AGENT = "agent";
+ /**
+ * Fluent Client search parameter constant for agent
+ *
+ * Description: Identifier of who
+ * Type: reference
+ * Path: AuditEvent.agent.who
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AGENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AGENT);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "AuditEvent:agent".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_AGENT = new ca.uhn.fhir.model.api.Include("AuditEvent:agent").toLocked();
+
/**
* Search parameter: agent-name
*
@@ -3687,32 +3826,6 @@ public class AuditEvent extends DomainResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam AGENT_ROLE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_AGENT_ROLE);
- /**
- * Search parameter: agent
- *
- * Description: Identifier of who
- * Type: reference
- * Path: AuditEvent.agent.who
- *
- */
- @SearchParamDefinition(name="agent", path="AuditEvent.agent.who", description="Identifier of who", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Device"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Practitioner") }, target={Device.class, Organization.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
- public static final String SP_AGENT = "agent";
- /**
- * Fluent Client search parameter constant for agent
- *
- * Description: Identifier of who
- * Type: reference
- * Path: AuditEvent.agent.who
- *
- */
- public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AGENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AGENT);
-
-/**
- * Constant for fluent queries to be used to add include statements. Specifies
- * the path value of "AuditEvent:agent".
- */
- public static final ca.uhn.fhir.model.api.Include INCLUDE_AGENT = new ca.uhn.fhir.model.api.Include("AuditEvent:agent").toLocked();
-
/**
* Search parameter: altid
*
@@ -3733,6 +3846,32 @@ public class AuditEvent extends DomainResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam ALTID = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ALTID);
+ /**
+ * Search parameter: based-on
+ *
+ * Description: Reference to the service request.
+ * Type: reference
+ * Path: AuditEvent.basedOn
+ *
+ */
+ @SearchParamDefinition(name="based-on", path="AuditEvent.basedOn", description="Reference to the service request.", type="reference", target={CarePlan.class, DeviceRequest.class, ImmunizationRecommendation.class, MedicationRequest.class, NutritionOrder.class, ServiceRequest.class } )
+ public static final String SP_BASED_ON = "based-on";
+ /**
+ * Fluent Client search parameter constant for based-on
+ *
+ * Description: Reference to the service request.
+ * Type: reference
+ * Path: AuditEvent.basedOn
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam BASED_ON = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_BASED_ON);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "AuditEvent:based-on".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_BASED_ON = new ca.uhn.fhir.model.api.Include("AuditEvent:based-on").toLocked();
+
/**
* Search parameter: date
*
@@ -3753,6 +3892,58 @@ public class AuditEvent extends DomainResource {
*/
public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+ /**
+ * Search parameter: encounter
+ *
+ * Description: Encounter related to the activity recorded in the AuditEvent
+ * Type: reference
+ * Path: AuditEvent.encounter
+ *
+ */
+ @SearchParamDefinition(name="encounter", path="AuditEvent.encounter", description="Encounter related to the activity recorded in the AuditEvent", type="reference", target={Encounter.class } )
+ public static final String SP_ENCOUNTER = "encounter";
+ /**
+ * Fluent Client search parameter constant for encounter
+ *
+ * Description: Encounter related to the activity recorded in the AuditEvent
+ * Type: reference
+ * Path: AuditEvent.encounter
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "AuditEvent:encounter".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("AuditEvent:encounter").toLocked();
+
+ /**
+ * Search parameter: entity
+ *
+ * Description: Specific instance of resource
+ * Type: reference
+ * Path: AuditEvent.entity.what
+ *
+ */
+ @SearchParamDefinition(name="entity", path="AuditEvent.entity.what", description="Specific instance of resource", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUsage.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, InventoryReport.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ public static final String SP_ENTITY = "entity";
+ /**
+ * Fluent Client search parameter constant for entity
+ *
+ * Description: Specific instance of resource
+ * Type: reference
+ * Path: AuditEvent.entity.what
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENTITY = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENTITY);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "AuditEvent:entity".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_ENTITY = new ca.uhn.fhir.model.api.Include("AuditEvent:entity").toLocked();
+
/**
* Search parameter: entity-name
*
@@ -3813,32 +4004,6 @@ public class AuditEvent extends DomainResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam ENTITY_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ENTITY_TYPE);
- /**
- * Search parameter: entity
- *
- * Description: Specific instance of resource
- * Type: reference
- * Path: AuditEvent.entity.what
- *
- */
- @SearchParamDefinition(name="entity", path="AuditEvent.entity.what", description="Specific instance of resource", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
- public static final String SP_ENTITY = "entity";
- /**
- * Fluent Client search parameter constant for entity
- *
- * Description: Specific instance of resource
- * Type: reference
- * Path: AuditEvent.entity.what
- *
- */
- public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENTITY = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENTITY);
-
-/**
- * Constant for fluent queries to be used to add include statements. Specifies
- * the path value of "AuditEvent:entity".
- */
- public static final ca.uhn.fhir.model.api.Include INCLUDE_ENTITY = new ca.uhn.fhir.model.api.Include("AuditEvent:entity").toLocked();
-
/**
* Search parameter: outcome
*
@@ -3867,7 +4032,7 @@ public class AuditEvent extends DomainResource {
* Path: AuditEvent.agent.who.where(resolve() is Patient) | AuditEvent.entity.what.where(resolve() is Patient)
*
*/
- @SearchParamDefinition(name="patient", path="AuditEvent.agent.who.where(resolve() is Patient) | AuditEvent.entity.what.where(resolve() is Patient)", description="Identifier of who", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, target={Patient.class } )
+ @SearchParamDefinition(name="patient", path="AuditEvent.agent.who.where(resolve() is Patient) | AuditEvent.entity.what.where(resolve() is Patient)", description="Identifier of who", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUsage.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, InventoryReport.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_PATIENT = "patient";
/**
* Fluent Client search parameter constant for patient
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java
index ce595f524..83e37f815 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -234,7 +234,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(modifierExtension);
}
-// Manual code (from Configuration.txt)t:
+// Manual code (from Configuration.txt):
public void checkNoModifiers(String noun, String verb) throws FHIRException {
if (hasModifierExtension()) {
throw new FHIRException("Found unknown Modifier Exceptions on "+noun+" doing "+verb);
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneType.java
index 3eaecbd25..dcb1af3e3 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneType.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneType.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -234,7 +234,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(modifierExtension);
}
-// Manual code (from Configuration.txt)t:
+// Manual code (from Configuration.txt):
public void checkNoModifiers(String noun, String verb) throws FHIRException {
if (hasModifierExtension()) {
throw new FHIRException("Found unknown Modifier Exceptions on "+noun+" doing "+verb);
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Basic.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Basic.java
index 5a16fbb5c..d01048b23 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Basic.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Basic.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -557,7 +557,7 @@ public class Basic extends DomainResource {
* Path: Basic.subject.where(resolve() is Patient)
*
*/
- @SearchParamDefinition(name="patient", path="Basic.subject.where(resolve() is Patient)", description="Identifies the focus of this resource", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, target={Patient.class } )
+ @SearchParamDefinition(name="patient", path="Basic.subject.where(resolve() is Patient)", description="Identifies the focus of this resource", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUsage.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, InventoryReport.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_PATIENT = "patient";
/**
* Fluent Client search parameter constant for patient
@@ -583,7 +583,7 @@ public class Basic extends DomainResource {
* Path: Basic.subject
*
*/
- @SearchParamDefinition(name="subject", path="Basic.subject", description="Identifies the focus of this resource", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUseStatement.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="subject", path="Basic.subject", description="Identifies the focus of this resource", type="reference", target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUsage.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, InventoryReport.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_SUBJECT = "subject";
/**
* Fluent Client search parameter constant for subject
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Binary.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Binary.java
index fc1cf5de3..1581a6c91 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Binary.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Binary.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -361,7 +361,7 @@ public class Binary extends BaseBinary implements IBaseBinary {
return ResourceType.Binary;
}
-// Manual code (from Configuration.txt)t:
+// Manual code (from Configuration.txt):
@Override
public byte[] getContent() {
return getData();
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BiologicallyDerivedProduct.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BiologicallyDerivedProduct.java
index f2ff06b9a..73eb2bd40 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BiologicallyDerivedProduct.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BiologicallyDerivedProduct.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -105,7 +105,6 @@ public class BiologicallyDerivedProduct extends DomainResource {
case FLUID: return "fluid";
case CELLS: return "cells";
case BIOLOGICALAGENT: return "biologicalAgent";
- case NULL: return null;
default: return "?";
}
}
@@ -116,7 +115,6 @@ public class BiologicallyDerivedProduct extends DomainResource {
case FLUID: return "http://hl7.org/fhir/product-category";
case CELLS: return "http://hl7.org/fhir/product-category";
case BIOLOGICALAGENT: return "http://hl7.org/fhir/product-category";
- case NULL: return null;
default: return "?";
}
}
@@ -127,7 +125,6 @@ public class BiologicallyDerivedProduct extends DomainResource {
case FLUID: return "Body fluid.";
case CELLS: return "Collection of cells.";
case BIOLOGICALAGENT: return "Biological agent of unspecified type.";
- case NULL: return null;
default: return "?";
}
}
@@ -138,7 +135,6 @@ public class BiologicallyDerivedProduct extends DomainResource {
case FLUID: return "Fluid";
case CELLS: return "Cells";
case BIOLOGICALAGENT: return "BiologicalAgent";
- case NULL: return null;
default: return "?";
}
}
@@ -228,15 +224,13 @@ public class BiologicallyDerivedProduct extends DomainResource {
switch (this) {
case AVAILABLE: return "available";
case UNAVAILABLE: return "unavailable";
- case NULL: return null;
default: return "?";
}
}
public String getSystem() {
switch (this) {
- case AVAILABLE: return "http://hl7.org/fhir/product-status";
- case UNAVAILABLE: return "http://hl7.org/fhir/product-status";
- case NULL: return null;
+ case AVAILABLE: return "http://hl7.org/fhir/biological-product-status";
+ case UNAVAILABLE: return "http://hl7.org/fhir/biological-product-status";
default: return "?";
}
}
@@ -244,7 +238,6 @@ public class BiologicallyDerivedProduct extends DomainResource {
switch (this) {
case AVAILABLE: return "Product is currently available for use.";
case UNAVAILABLE: return "Product is not currently available for use.";
- case NULL: return null;
default: return "?";
}
}
@@ -252,7 +245,6 @@ public class BiologicallyDerivedProduct extends DomainResource {
switch (this) {
case AVAILABLE: return "Available";
case UNAVAILABLE: return "Unavailable";
- case NULL: return null;
default: return "?";
}
}
@@ -331,7 +323,6 @@ public class BiologicallyDerivedProduct extends DomainResource {
case FARENHEIT: return "farenheit";
case CELSIUS: return "celsius";
case KELVIN: return "kelvin";
- case NULL: return null;
default: return "?";
}
}
@@ -340,7 +331,6 @@ public class BiologicallyDerivedProduct extends DomainResource {
case FARENHEIT: return "http://hl7.org/fhir/product-storage-scale";
case CELSIUS: return "http://hl7.org/fhir/product-storage-scale";
case KELVIN: return "http://hl7.org/fhir/product-storage-scale";
- case NULL: return null;
default: return "?";
}
}
@@ -349,7 +339,6 @@ public class BiologicallyDerivedProduct extends DomainResource {
case FARENHEIT: return "Fahrenheit temperature scale.";
case CELSIUS: return "Celsius or centigrade temperature scale.";
case KELVIN: return "Kelvin absolute thermodynamic temperature scale.";
- case NULL: return null;
default: return "?";
}
}
@@ -358,7 +347,6 @@ public class BiologicallyDerivedProduct extends DomainResource {
case FARENHEIT: return "Fahrenheit";
case CELSIUS: return "Celsius";
case KELVIN: return "Kelvin";
- case NULL: return null;
default: return "?";
}
}
@@ -1722,7 +1710,7 @@ public class BiologicallyDerivedProduct extends DomainResource {
*/
@Child(name = "status", type = {CodeType.class}, order=3, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="available | unavailable", formalDefinition="Whether the product is currently available." )
- @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/product-status")
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/biological-product-status")
protected Enumeration status;
/**
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BodyStructure.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BodyStructure.java
index c502111c1..d91a779fd 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BodyStructure.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BodyStructure.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Bundle.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Bundle.java
index 7f7386b56..1a9260e69 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Bundle.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Bundle.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -140,7 +140,6 @@ public class Bundle extends Resource implements IBaseBundle {
case SEARCHSET: return "searchset";
case COLLECTION: return "collection";
case SUBSCRIPTIONNOTIFICATION: return "subscription-notification";
- case NULL: return null;
default: return "?";
}
}
@@ -156,7 +155,6 @@ public class Bundle extends Resource implements IBaseBundle {
case SEARCHSET: return "http://hl7.org/fhir/bundle-type";
case COLLECTION: return "http://hl7.org/fhir/bundle-type";
case SUBSCRIPTIONNOTIFICATION: return "http://hl7.org/fhir/bundle-type";
- case NULL: return null;
default: return "?";
}
}
@@ -172,7 +170,6 @@ public class Bundle extends Resource implements IBaseBundle {
case SEARCHSET: return "The bundle is a list of resources returned as a result of a search/query interaction, operation, or message.";
case COLLECTION: return "The bundle is a set of resources collected into a single package for ease of distribution that imposes no processing obligations or behavioral rules beyond persistence.";
case SUBSCRIPTIONNOTIFICATION: return "The bundle has been generated by a Subscription to communicate information to a client.";
- case NULL: return null;
default: return "?";
}
}
@@ -188,7 +185,6 @@ public class Bundle extends Resource implements IBaseBundle {
case SEARCHSET: return "Search Results";
case COLLECTION: return "Collection";
case SUBSCRIPTIONNOTIFICATION: return "Subscription Notification";
- case NULL: return null;
default: return "?";
}
}
@@ -336,7 +332,6 @@ public class Bundle extends Resource implements IBaseBundle {
case PUT: return "PUT";
case DELETE: return "DELETE";
case PATCH: return "PATCH";
- case NULL: return null;
default: return "?";
}
}
@@ -348,7 +343,6 @@ public class Bundle extends Resource implements IBaseBundle {
case PUT: return "http://hl7.org/fhir/http-verb";
case DELETE: return "http://hl7.org/fhir/http-verb";
case PATCH: return "http://hl7.org/fhir/http-verb";
- case NULL: return null;
default: return "?";
}
}
@@ -360,7 +354,6 @@ public class Bundle extends Resource implements IBaseBundle {
case PUT: return "HTTP PUT Command.";
case DELETE: return "HTTP DELETE Command.";
case PATCH: return "HTTP PATCH Command.";
- case NULL: return null;
default: return "?";
}
}
@@ -372,7 +365,6 @@ public class Bundle extends Resource implements IBaseBundle {
case PUT: return "PUT";
case DELETE: return "DELETE";
case PATCH: return "PATCH";
- case NULL: return null;
default: return "?";
}
}
@@ -475,7 +467,6 @@ public class Bundle extends Resource implements IBaseBundle {
case MATCH: return "match";
case INCLUDE: return "include";
case OUTCOME: return "outcome";
- case NULL: return null;
default: return "?";
}
}
@@ -484,7 +475,6 @@ public class Bundle extends Resource implements IBaseBundle {
case MATCH: return "http://hl7.org/fhir/search-entry-mode";
case INCLUDE: return "http://hl7.org/fhir/search-entry-mode";
case OUTCOME: return "http://hl7.org/fhir/search-entry-mode";
- case NULL: return null;
default: return "?";
}
}
@@ -493,7 +483,6 @@ public class Bundle extends Resource implements IBaseBundle {
case MATCH: return "This resource matched the search specification.";
case INCLUDE: return "This resource is returned because it is referred to from another resource in the search set.";
case OUTCOME: return "An OperationOutcome that provides additional information about the processing of a search.";
- case NULL: return null;
default: return "?";
}
}
@@ -502,7 +491,6 @@ public class Bundle extends Resource implements IBaseBundle {
case MATCH: return "Match";
case INCLUDE: return "Include";
case OUTCOME: return "Outcome";
- case NULL: return null;
default: return "?";
}
}
@@ -3129,7 +3117,7 @@ public class Bundle extends Resource implements IBaseBundle {
* Path: Bundle.entry[0].resource
*
*/
- @SearchParamDefinition(name="composition", path="Bundle.entry[0].resource", description="The first resource in the bundle, if the bundle type is \"document\" - this is a composition, and this parameter provides access to search its contents", type="reference", target={Composition.class } )
+ @SearchParamDefinition(name="composition", path="Bundle.entry[0].resource", description="The first resource in the bundle, if the bundle type is \"document\" - this is a composition, and this parameter provides access to search its contents", type="reference" )
public static final String SP_COMPOSITION = "composition";
/**
* Fluent Client search parameter constant for composition
@@ -3175,7 +3163,7 @@ public class Bundle extends Resource implements IBaseBundle {
* Path: Bundle.entry[0].resource
*
*/
- @SearchParamDefinition(name="message", path="Bundle.entry[0].resource", description="The first resource in the bundle, if the bundle type is \"message\" - this is a message header, and this parameter provides access to search its contents", type="reference", target={MessageHeader.class } )
+ @SearchParamDefinition(name="message", path="Bundle.entry[0].resource", description="The first resource in the bundle, if the bundle type is \"message\" - this is a message header, and this parameter provides access to search its contents", type="reference" )
public static final String SP_MESSAGE = "message";
/**
* Fluent Client search parameter constant for message
@@ -3233,7 +3221,7 @@ public class Bundle extends Resource implements IBaseBundle {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
-// Manual code (from Configuration.txt)t:
+// Manual code (from Configuration.txt):
/**
* Returns the {@link #getLink() link} which matches a given {@link BundleLinkComponent#getRelation() relation}.
* If no link is found which matches the given relation, returns null
. If more than one
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalResource.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalResource.java
index c28dac081..207dc68f8 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalResource.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalResource.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -442,8 +442,7 @@ public abstract class CanonicalResource extends DomainResource {
/**
* @param value A copyright statement relating to the canonical resource and/or its contents. Copyright statements are generally legal restrictions on the use and publishing of the canonical resource.
*/
- public abstract CanonicalResource setCopyright(String value);
-
+ public abstract CanonicalResource setCopyright(String value);
protected void listChildren(List children) {
super.listChildren(children);
}
@@ -533,27 +532,28 @@ public abstract class CanonicalResource extends DomainResource {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty();
}
-// Manual code (from Configuration.txt)t:
- @Override
- public String toString() {
- return fhirType()+"["+getUrl()+"]";
- }
-
- public String present() {
- if (hasTitle())
- return getTitle();
- if (hasName())
- return getName();
- return toString();
- }
-
- public String getVUrl() {
- return getUrl() + (hasVersion() ? "|"+getVersion() : "");
- }
-
- public boolean supportsCopyright() {
- return true;
- }
+// Manual code (from Configuration.txt):
+ @Override
+ public String toString() {
+ return fhirType()+"["+getUrl()+"]";
+ }
+
+ public String present() {
+ if (hasTitle())
+ return getTitle();
+ if (hasName())
+ return getName();
+ return toString();
+ }
+
+ public String getVUrl() {
+ return getUrl() + (hasVersion() ? "|"+getVersion() : "");
+ }
+
+ public boolean supportsCopyright() {
+ return true;
+ }
+
// end addition
}
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement.java
index 0b974820c..26c4e457b 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -90,7 +90,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case NOTSUPPORTED: return "not-supported";
case SINGLE: return "single";
case MULTIPLE: return "multiple";
- case NULL: return null;
default: return "?";
}
}
@@ -99,7 +98,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case NOTSUPPORTED: return "http://hl7.org/fhir/conditional-delete-status";
case SINGLE: return "http://hl7.org/fhir/conditional-delete-status";
case MULTIPLE: return "http://hl7.org/fhir/conditional-delete-status";
- case NULL: return null;
default: return "?";
}
}
@@ -108,7 +106,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case NOTSUPPORTED: return "No support for conditional deletes.";
case SINGLE: return "Conditional deletes are supported, but only single resources at a time.";
case MULTIPLE: return "Conditional deletes are supported, and multiple resources can be deleted in a single interaction.";
- case NULL: return null;
default: return "?";
}
}
@@ -117,7 +114,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case NOTSUPPORTED: return "Not Supported";
case SINGLE: return "Single Deletes Supported";
case MULTIPLE: return "Multiple Deletes Supported";
- case NULL: return null;
default: return "?";
}
}
@@ -209,7 +205,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case MODIFIEDSINCE: return "modified-since";
case NOTMATCH: return "not-match";
case FULLSUPPORT: return "full-support";
- case NULL: return null;
default: return "?";
}
}
@@ -219,7 +214,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case MODIFIEDSINCE: return "http://hl7.org/fhir/conditional-read-status";
case NOTMATCH: return "http://hl7.org/fhir/conditional-read-status";
case FULLSUPPORT: return "http://hl7.org/fhir/conditional-read-status";
- case NULL: return null;
default: return "?";
}
}
@@ -229,7 +223,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case MODIFIEDSINCE: return "Conditional reads are supported, but only with the If-Modified-Since HTTP Header.";
case NOTMATCH: return "Conditional reads are supported, but only with the If-None-Match HTTP Header.";
case FULLSUPPORT: return "Conditional reads are supported, with both If-Modified-Since and If-None-Match HTTP Headers.";
- case NULL: return null;
default: return "?";
}
}
@@ -239,7 +232,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case MODIFIEDSINCE: return "If-Modified-Since";
case NOTMATCH: return "If-None-Match";
case FULLSUPPORT: return "Full Support";
- case NULL: return null;
default: return "?";
}
}
@@ -323,7 +315,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
switch (this) {
case PRODUCER: return "producer";
case CONSUMER: return "consumer";
- case NULL: return null;
default: return "?";
}
}
@@ -331,7 +322,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
switch (this) {
case PRODUCER: return "http://hl7.org/fhir/document-mode";
case CONSUMER: return "http://hl7.org/fhir/document-mode";
- case NULL: return null;
default: return "?";
}
}
@@ -339,7 +329,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
switch (this) {
case PRODUCER: return "The application produces documents of the specified type.";
case CONSUMER: return "The application consumes documents of the specified type.";
- case NULL: return null;
default: return "?";
}
}
@@ -347,7 +336,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
switch (this) {
case PRODUCER: return "Producer";
case CONSUMER: return "Consumer";
- case NULL: return null;
default: return "?";
}
}
@@ -419,7 +407,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
switch (this) {
case SENDER: return "sender";
case RECEIVER: return "receiver";
- case NULL: return null;
default: return "?";
}
}
@@ -427,7 +414,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
switch (this) {
case SENDER: return "http://hl7.org/fhir/event-capability-mode";
case RECEIVER: return "http://hl7.org/fhir/event-capability-mode";
- case NULL: return null;
default: return "?";
}
}
@@ -435,7 +421,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
switch (this) {
case SENDER: return "The application sends requests and receives responses.";
case RECEIVER: return "The application receives requests and sends responses.";
- case NULL: return null;
default: return "?";
}
}
@@ -443,7 +428,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
switch (this) {
case SENDER: return "Sender";
case RECEIVER: return "Receiver";
- case NULL: return null;
default: return "?";
}
}
@@ -536,7 +520,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case RESOLVES: return "resolves";
case ENFORCED: return "enforced";
case LOCAL: return "local";
- case NULL: return null;
default: return "?";
}
}
@@ -547,7 +530,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case RESOLVES: return "http://hl7.org/fhir/reference-handling-policy";
case ENFORCED: return "http://hl7.org/fhir/reference-handling-policy";
case LOCAL: return "http://hl7.org/fhir/reference-handling-policy";
- case NULL: return null;
default: return "?";
}
}
@@ -558,7 +540,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case RESOLVES: return "The server will attempt to resolve logical references to literal references - i.e. converting Reference.identifier to Reference.reference (if resolution fails, the server may still accept resources; see logical).";
case ENFORCED: return "The server enforces that references have integrity - e.g. it ensures that references can always be resolved. This is typically the case for clinical record systems, but often not the case for middleware/proxy systems.";
case LOCAL: return "The server does not support references that point to other servers.";
- case NULL: return null;
default: return "?";
}
}
@@ -569,7 +550,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case RESOLVES: return "Resolves References";
case ENFORCED: return "Reference Integrity Enforced";
case LOCAL: return "Local References Only";
- case NULL: return null;
default: return "?";
}
}
@@ -666,7 +646,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case NOVERSION: return "no-version";
case VERSIONED: return "versioned";
case VERSIONEDUPDATE: return "versioned-update";
- case NULL: return null;
default: return "?";
}
}
@@ -675,7 +654,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case NOVERSION: return "http://hl7.org/fhir/versioning-policy";
case VERSIONED: return "http://hl7.org/fhir/versioning-policy";
case VERSIONEDUPDATE: return "http://hl7.org/fhir/versioning-policy";
- case NULL: return null;
default: return "?";
}
}
@@ -684,7 +662,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case NOVERSION: return "VersionId meta-property is not supported (server) or used (client).";
case VERSIONED: return "VersionId meta-property is supported (server) or used (client).";
case VERSIONEDUPDATE: return "VersionId must be correct for updates (server) or will be specified (If-match header) for updates (client).";
- case NULL: return null;
default: return "?";
}
}
@@ -693,7 +670,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case NOVERSION: return "No VersionId Support";
case VERSIONED: return "Versioned";
case VERSIONEDUPDATE: return "VersionId tracked fully";
- case NULL: return null;
default: return "?";
}
}
@@ -785,7 +761,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case BATCH: return "batch";
case SEARCHSYSTEM: return "search-system";
case HISTORYSYSTEM: return "history-system";
- case NULL: return null;
default: return "?";
}
}
@@ -795,7 +770,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case BATCH: return "http://hl7.org/fhir/restful-interaction";
case SEARCHSYSTEM: return "http://hl7.org/fhir/restful-interaction";
case HISTORYSYSTEM: return "http://hl7.org/fhir/restful-interaction";
- case NULL: return null;
default: return "?";
}
}
@@ -805,7 +779,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case BATCH: return "perform a set of a separate interactions in a single http operation";
case SEARCHSYSTEM: return "Search all resources based on some filter criteria.";
case HISTORYSYSTEM: return "Retrieve the change history for all resources on a system.";
- case NULL: return null;
default: return "?";
}
}
@@ -815,7 +788,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case BATCH: return "batch";
case SEARCHSYSTEM: return "search-system";
case HISTORYSYSTEM: return "history-system";
- case NULL: return null;
default: return "?";
}
}
@@ -948,7 +920,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case HISTORYTYPE: return "history-type";
case CREATE: return "create";
case SEARCHTYPE: return "search-type";
- case NULL: return null;
default: return "?";
}
}
@@ -963,7 +934,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case HISTORYTYPE: return "http://hl7.org/fhir/restful-interaction";
case CREATE: return "http://hl7.org/fhir/restful-interaction";
case SEARCHTYPE: return "http://hl7.org/fhir/restful-interaction";
- case NULL: return null;
default: return "?";
}
}
@@ -978,7 +948,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case HISTORYTYPE: return "Retrieve the change history for all resources of a particular type.";
case CREATE: return "Create a new resource with a server assigned id.";
case SEARCHTYPE: return "Search all resources of the specified type based on some filter criteria.";
- case NULL: return null;
default: return "?";
}
}
@@ -993,7 +962,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
case HISTORYTYPE: return "history-type";
case CREATE: return "create";
case SEARCHTYPE: return "search-type";
- case NULL: return null;
default: return "?";
}
}
@@ -8657,202 +8625,56 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
}
/**
- * Search parameter: fhirversion
+ * Search parameter: context
*
- * Description: The version of FHIR
+ * Description: Multiple Resources:
+
+* [CapabilityStatement](capabilitystatement.html): A use context assigned to the capability statement
+* [CodeSystem](codesystem.html): A use context assigned to the code system
+* [CompartmentDefinition](compartmentdefinition.html): A use context assigned to the compartment definition
+* [ConceptMap](conceptmap.html): A use context assigned to the concept map
+* [GraphDefinition](graphdefinition.html): A use context assigned to the graph definition
+* [ImplementationGuide](implementationguide.html): A use context assigned to the implementation guide
+* [MessageDefinition](messagedefinition.html): A use context assigned to the message definition
+* [NamingSystem](namingsystem.html): A use context assigned to the naming system
+* [OperationDefinition](operationdefinition.html): A use context assigned to the operation definition
+* [SearchParameter](searchparameter.html): A use context assigned to the search parameter
+* [StructureDefinition](structuredefinition.html): A use context assigned to the structure definition
+* [StructureMap](structuremap.html): A use context assigned to the structure map
+* [TerminologyCapabilities](terminologycapabilities.html): A use context assigned to the terminology capabilities
+* [ValueSet](valueset.html): A use context assigned to the value set
+
* Type: token
- * Path: CapabilityStatement.version
+ * Path: (CapabilityStatement.useContext.value as CodeableConcept) | (CodeSystem.useContext.value as CodeableConcept) | (CompartmentDefinition.useContext.value as CodeableConcept) | (ConceptMap.useContext.value as CodeableConcept) | (GraphDefinition.useContext.value as CodeableConcept) | (ImplementationGuide.useContext.value as CodeableConcept) | (MessageDefinition.useContext.value as CodeableConcept) | (NamingSystem.useContext.value as CodeableConcept) | (OperationDefinition.useContext.value as CodeableConcept) | (SearchParameter.useContext.value as CodeableConcept) | (StructureDefinition.useContext.value as CodeableConcept) | (StructureMap.useContext.value as CodeableConcept) | (TerminologyCapabilities.useContext.value as CodeableConcept) | (ValueSet.useContext.value as CodeableConcept)
*
*/
- @SearchParamDefinition(name="fhirversion", path="CapabilityStatement.version", description="The version of FHIR", type="token" )
- public static final String SP_FHIRVERSION = "fhirversion";
+ @SearchParamDefinition(name="context", path="(CapabilityStatement.useContext.value as CodeableConcept) | (CodeSystem.useContext.value as CodeableConcept) | (CompartmentDefinition.useContext.value as CodeableConcept) | (ConceptMap.useContext.value as CodeableConcept) | (GraphDefinition.useContext.value as CodeableConcept) | (ImplementationGuide.useContext.value as CodeableConcept) | (MessageDefinition.useContext.value as CodeableConcept) | (NamingSystem.useContext.value as CodeableConcept) | (OperationDefinition.useContext.value as CodeableConcept) | (SearchParameter.useContext.value as CodeableConcept) | (StructureDefinition.useContext.value as CodeableConcept) | (StructureMap.useContext.value as CodeableConcept) | (TerminologyCapabilities.useContext.value as CodeableConcept) | (ValueSet.useContext.value as CodeableConcept)", description="Multiple Resources: \r\n\r\n* [CapabilityStatement](capabilitystatement.html): A use context assigned to the capability statement\r\n* [CodeSystem](codesystem.html): A use context assigned to the code system\r\n* [CompartmentDefinition](compartmentdefinition.html): A use context assigned to the compartment definition\r\n* [ConceptMap](conceptmap.html): A use context assigned to the concept map\r\n* [GraphDefinition](graphdefinition.html): A use context assigned to the graph definition\r\n* [ImplementationGuide](implementationguide.html): A use context assigned to the implementation guide\r\n* [MessageDefinition](messagedefinition.html): A use context assigned to the message definition\r\n* [NamingSystem](namingsystem.html): A use context assigned to the naming system\r\n* [OperationDefinition](operationdefinition.html): A use context assigned to the operation definition\r\n* [SearchParameter](searchparameter.html): A use context assigned to the search parameter\r\n* [StructureDefinition](structuredefinition.html): A use context assigned to the structure definition\r\n* [StructureMap](structuremap.html): A use context assigned to the structure map\r\n* [TerminologyCapabilities](terminologycapabilities.html): A use context assigned to the terminology capabilities\r\n* [ValueSet](valueset.html): A use context assigned to the value set\r\n", type="token" )
+ public static final String SP_CONTEXT = "context";
/**
- * Fluent Client search parameter constant for fhirversion
+ * Fluent Client search parameter constant for context
*
- * Description: The version of FHIR
+ * Description: Multiple Resources:
+
+* [CapabilityStatement](capabilitystatement.html): A use context assigned to the capability statement
+* [CodeSystem](codesystem.html): A use context assigned to the code system
+* [CompartmentDefinition](compartmentdefinition.html): A use context assigned to the compartment definition
+* [ConceptMap](conceptmap.html): A use context assigned to the concept map
+* [GraphDefinition](graphdefinition.html): A use context assigned to the graph definition
+* [ImplementationGuide](implementationguide.html): A use context assigned to the implementation guide
+* [MessageDefinition](messagedefinition.html): A use context assigned to the message definition
+* [NamingSystem](namingsystem.html): A use context assigned to the naming system
+* [OperationDefinition](operationdefinition.html): A use context assigned to the operation definition
+* [SearchParameter](searchparameter.html): A use context assigned to the search parameter
+* [StructureDefinition](structuredefinition.html): A use context assigned to the structure definition
+* [StructureMap](structuremap.html): A use context assigned to the structure map
+* [TerminologyCapabilities](terminologycapabilities.html): A use context assigned to the terminology capabilities
+* [ValueSet](valueset.html): A use context assigned to the value set
+
* Type: token
- * Path: CapabilityStatement.version
+ * Path: (CapabilityStatement.useContext.value as CodeableConcept) | (CodeSystem.useContext.value as CodeableConcept) | (CompartmentDefinition.useContext.value as CodeableConcept) | (ConceptMap.useContext.value as CodeableConcept) | (GraphDefinition.useContext.value as CodeableConcept) | (ImplementationGuide.useContext.value as CodeableConcept) | (MessageDefinition.useContext.value as CodeableConcept) | (NamingSystem.useContext.value as CodeableConcept) | (OperationDefinition.useContext.value as CodeableConcept) | (SearchParameter.useContext.value as CodeableConcept) | (StructureDefinition.useContext.value as CodeableConcept) | (StructureMap.useContext.value as CodeableConcept) | (TerminologyCapabilities.useContext.value as CodeableConcept) | (ValueSet.useContext.value as CodeableConcept)
*
*/
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam FHIRVERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FHIRVERSION);
-
- /**
- * Search parameter: format
- *
- * Description: formats supported (xml | json | ttl | mime type)
- * Type: token
- * Path: CapabilityStatement.format
- *
- */
- @SearchParamDefinition(name="format", path="CapabilityStatement.format", description="formats supported (xml | json | ttl | mime type)", type="token" )
- public static final String SP_FORMAT = "format";
- /**
- * Fluent Client search parameter constant for format
- *
- * Description: formats supported (xml | json | ttl | mime type)
- * Type: token
- * Path: CapabilityStatement.format
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam FORMAT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FORMAT);
-
- /**
- * Search parameter: guide
- *
- * Description: Implementation guides supported
- * Type: reference
- * Path: CapabilityStatement.implementationGuide
- *
- */
- @SearchParamDefinition(name="guide", path="CapabilityStatement.implementationGuide", description="Implementation guides supported", type="reference", target={ImplementationGuide.class } )
- public static final String SP_GUIDE = "guide";
- /**
- * Fluent Client search parameter constant for guide
- *
- * Description: Implementation guides supported
- * Type: reference
- * Path: CapabilityStatement.implementationGuide
- *
- */
- public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam GUIDE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_GUIDE);
-
-/**
- * Constant for fluent queries to be used to add include statements. Specifies
- * the path value of "CapabilityStatement:guide".
- */
- public static final ca.uhn.fhir.model.api.Include INCLUDE_GUIDE = new ca.uhn.fhir.model.api.Include("CapabilityStatement:guide").toLocked();
-
- /**
- * Search parameter: mode
- *
- * Description: Mode - restful (server/client) or messaging (sender/receiver)
- * Type: token
- * Path: CapabilityStatement.rest.mode
- *
- */
- @SearchParamDefinition(name="mode", path="CapabilityStatement.rest.mode", description="Mode - restful (server/client) or messaging (sender/receiver)", type="token" )
- public static final String SP_MODE = "mode";
- /**
- * Fluent Client search parameter constant for mode
- *
- * Description: Mode - restful (server/client) or messaging (sender/receiver)
- * Type: token
- * Path: CapabilityStatement.rest.mode
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam MODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MODE);
-
- /**
- * Search parameter: resource-profile
- *
- * Description: A profile id invoked in a capability statement
- * Type: reference
- * Path: CapabilityStatement.rest.resource.profile
- *
- */
- @SearchParamDefinition(name="resource-profile", path="CapabilityStatement.rest.resource.profile", description="A profile id invoked in a capability statement", type="reference", target={StructureDefinition.class } )
- public static final String SP_RESOURCE_PROFILE = "resource-profile";
- /**
- * Fluent Client search parameter constant for resource-profile
- *
- * Description: A profile id invoked in a capability statement
- * Type: reference
- * Path: CapabilityStatement.rest.resource.profile
- *
- */
- public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RESOURCE_PROFILE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RESOURCE_PROFILE);
-
-/**
- * Constant for fluent queries to be used to add include statements. Specifies
- * the path value of "CapabilityStatement:resource-profile".
- */
- public static final ca.uhn.fhir.model.api.Include INCLUDE_RESOURCE_PROFILE = new ca.uhn.fhir.model.api.Include("CapabilityStatement:resource-profile").toLocked();
-
- /**
- * Search parameter: resource
- *
- * Description: Name of a resource mentioned in a capability statement
- * Type: token
- * Path: CapabilityStatement.rest.resource.type
- *
- */
- @SearchParamDefinition(name="resource", path="CapabilityStatement.rest.resource.type", description="Name of a resource mentioned in a capability statement", type="token" )
- public static final String SP_RESOURCE = "resource";
- /**
- * Fluent Client search parameter constant for resource
- *
- * Description: Name of a resource mentioned in a capability statement
- * Type: token
- * Path: CapabilityStatement.rest.resource.type
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam RESOURCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RESOURCE);
-
- /**
- * Search parameter: security-service
- *
- * Description: OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates
- * Type: token
- * Path: CapabilityStatement.rest.security.service
- *
- */
- @SearchParamDefinition(name="security-service", path="CapabilityStatement.rest.security.service", description="OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates", type="token" )
- public static final String SP_SECURITY_SERVICE = "security-service";
- /**
- * Fluent Client search parameter constant for security-service
- *
- * Description: OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates
- * Type: token
- * Path: CapabilityStatement.rest.security.service
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam SECURITY_SERVICE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SECURITY_SERVICE);
-
- /**
- * Search parameter: software
- *
- * Description: Part of the name of a software application
- * Type: string
- * Path: CapabilityStatement.software.name
- *
- */
- @SearchParamDefinition(name="software", path="CapabilityStatement.software.name", description="Part of the name of a software application", type="string" )
- public static final String SP_SOFTWARE = "software";
- /**
- * Fluent Client search parameter constant for software
- *
- * Description: Part of the name of a software application
- * Type: string
- * Path: CapabilityStatement.software.name
- *
- */
- public static final ca.uhn.fhir.rest.gclient.StringClientParam SOFTWARE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_SOFTWARE);
-
- /**
- * Search parameter: supported-profile
- *
- * Description: Profiles for use cases supported
- * Type: reference
- * Path: CapabilityStatement.rest.resource.supportedProfile
- *
- */
- @SearchParamDefinition(name="supported-profile", path="CapabilityStatement.rest.resource.supportedProfile", description="Profiles for use cases supported", type="reference", target={StructureDefinition.class } )
- public static final String SP_SUPPORTED_PROFILE = "supported-profile";
- /**
- * Fluent Client search parameter constant for supported-profile
- *
- * Description: Profiles for use cases supported
- * Type: reference
- * Path: CapabilityStatement.rest.resource.supportedProfile
- *
- */
- public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUPPORTED_PROFILE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUPPORTED_PROFILE);
-
-/**
- * Constant for fluent queries to be used to add include statements. Specifies
- * the path value of "CapabilityStatement:supported-profile".
- */
- public static final ca.uhn.fhir.model.api.Include INCLUDE_SUPPORTED_PROFILE = new ca.uhn.fhir.model.api.Include("CapabilityStatement:supported-profile").toLocked();
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT);
/**
* Search parameter: context-quantity
@@ -8906,110 +8728,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
*/
public static final ca.uhn.fhir.rest.gclient.QuantityClientParam CONTEXT_QUANTITY = new ca.uhn.fhir.rest.gclient.QuantityClientParam(SP_CONTEXT_QUANTITY);
- /**
- * Search parameter: context-type-quantity
- *
- * Description: Multiple Resources:
-
-* [CapabilityStatement](capabilitystatement.html): A use context type and quantity- or range-based value assigned to the capability statement
-* [CodeSystem](codesystem.html): A use context type and quantity- or range-based value assigned to the code system
-* [CompartmentDefinition](compartmentdefinition.html): A use context type and quantity- or range-based value assigned to the compartment definition
-* [ConceptMap](conceptmap.html): A use context type and quantity- or range-based value assigned to the concept map
-* [GraphDefinition](graphdefinition.html): A use context type and quantity- or range-based value assigned to the graph definition
-* [ImplementationGuide](implementationguide.html): A use context type and quantity- or range-based value assigned to the implementation guide
-* [MessageDefinition](messagedefinition.html): A use context type and quantity- or range-based value assigned to the message definition
-* [NamingSystem](namingsystem.html): A use context type and quantity- or range-based value assigned to the naming system
-* [OperationDefinition](operationdefinition.html): A use context type and quantity- or range-based value assigned to the operation definition
-* [SearchParameter](searchparameter.html): A use context type and quantity- or range-based value assigned to the search parameter
-* [StructureDefinition](structuredefinition.html): A use context type and quantity- or range-based value assigned to the structure definition
-* [StructureMap](structuremap.html): A use context type and quantity- or range-based value assigned to the structure map
-* [TerminologyCapabilities](terminologycapabilities.html): A use context type and quantity- or range-based value assigned to the terminology capabilities
-* [ValueSet](valueset.html): A use context type and quantity- or range-based value assigned to the value set
-
- * Type: composite
- * Path: CapabilityStatement.useContext | CodeSystem.useContext | CompartmentDefinition.useContext | ConceptMap.useContext | GraphDefinition.useContext | ImplementationGuide.useContext | MessageDefinition.useContext | NamingSystem.useContext | OperationDefinition.useContext | SearchParameter.useContext | StructureDefinition.useContext | StructureMap.useContext | TerminologyCapabilities.useContext | ValueSet.useContext
- *
- */
- @SearchParamDefinition(name="context-type-quantity", path="CapabilityStatement.useContext | CodeSystem.useContext | CompartmentDefinition.useContext | ConceptMap.useContext | GraphDefinition.useContext | ImplementationGuide.useContext | MessageDefinition.useContext | NamingSystem.useContext | OperationDefinition.useContext | SearchParameter.useContext | StructureDefinition.useContext | StructureMap.useContext | TerminologyCapabilities.useContext | ValueSet.useContext", description="Multiple Resources: \r\n\r\n* [CapabilityStatement](capabilitystatement.html): A use context type and quantity- or range-based value assigned to the capability statement\r\n* [CodeSystem](codesystem.html): A use context type and quantity- or range-based value assigned to the code system\r\n* [CompartmentDefinition](compartmentdefinition.html): A use context type and quantity- or range-based value assigned to the compartment definition\r\n* [ConceptMap](conceptmap.html): A use context type and quantity- or range-based value assigned to the concept map\r\n* [GraphDefinition](graphdefinition.html): A use context type and quantity- or range-based value assigned to the graph definition\r\n* [ImplementationGuide](implementationguide.html): A use context type and quantity- or range-based value assigned to the implementation guide\r\n* [MessageDefinition](messagedefinition.html): A use context type and quantity- or range-based value assigned to the message definition\r\n* [NamingSystem](namingsystem.html): A use context type and quantity- or range-based value assigned to the naming system\r\n* [OperationDefinition](operationdefinition.html): A use context type and quantity- or range-based value assigned to the operation definition\r\n* [SearchParameter](searchparameter.html): A use context type and quantity- or range-based value assigned to the search parameter\r\n* [StructureDefinition](structuredefinition.html): A use context type and quantity- or range-based value assigned to the structure definition\r\n* [StructureMap](structuremap.html): A use context type and quantity- or range-based value assigned to the structure map\r\n* [TerminologyCapabilities](terminologycapabilities.html): A use context type and quantity- or range-based value assigned to the terminology capabilities\r\n* [ValueSet](valueset.html): A use context type and quantity- or range-based value assigned to the value set\r\n", type="composite", compositeOf={"context-type", "context-quantity"} )
- public static final String SP_CONTEXT_TYPE_QUANTITY = "context-type-quantity";
- /**
- * Fluent Client search parameter constant for context-type-quantity
- *
- * Description: Multiple Resources:
-
-* [CapabilityStatement](capabilitystatement.html): A use context type and quantity- or range-based value assigned to the capability statement
-* [CodeSystem](codesystem.html): A use context type and quantity- or range-based value assigned to the code system
-* [CompartmentDefinition](compartmentdefinition.html): A use context type and quantity- or range-based value assigned to the compartment definition
-* [ConceptMap](conceptmap.html): A use context type and quantity- or range-based value assigned to the concept map
-* [GraphDefinition](graphdefinition.html): A use context type and quantity- or range-based value assigned to the graph definition
-* [ImplementationGuide](implementationguide.html): A use context type and quantity- or range-based value assigned to the implementation guide
-* [MessageDefinition](messagedefinition.html): A use context type and quantity- or range-based value assigned to the message definition
-* [NamingSystem](namingsystem.html): A use context type and quantity- or range-based value assigned to the naming system
-* [OperationDefinition](operationdefinition.html): A use context type and quantity- or range-based value assigned to the operation definition
-* [SearchParameter](searchparameter.html): A use context type and quantity- or range-based value assigned to the search parameter
-* [StructureDefinition](structuredefinition.html): A use context type and quantity- or range-based value assigned to the structure definition
-* [StructureMap](structuremap.html): A use context type and quantity- or range-based value assigned to the structure map
-* [TerminologyCapabilities](terminologycapabilities.html): A use context type and quantity- or range-based value assigned to the terminology capabilities
-* [ValueSet](valueset.html): A use context type and quantity- or range-based value assigned to the value set
-
- * Type: composite
- * Path: CapabilityStatement.useContext | CodeSystem.useContext | CompartmentDefinition.useContext | ConceptMap.useContext | GraphDefinition.useContext | ImplementationGuide.useContext | MessageDefinition.useContext | NamingSystem.useContext | OperationDefinition.useContext | SearchParameter.useContext | StructureDefinition.useContext | StructureMap.useContext | TerminologyCapabilities.useContext | ValueSet.useContext
- *
- */
- public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_QUANTITY);
-
- /**
- * Search parameter: context-type-value
- *
- * Description: Multiple Resources:
-
-* [CapabilityStatement](capabilitystatement.html): A use context type and value assigned to the capability statement
-* [CodeSystem](codesystem.html): A use context type and value assigned to the code system
-* [CompartmentDefinition](compartmentdefinition.html): A use context type and value assigned to the compartment definition
-* [ConceptMap](conceptmap.html): A use context type and value assigned to the concept map
-* [GraphDefinition](graphdefinition.html): A use context type and value assigned to the graph definition
-* [ImplementationGuide](implementationguide.html): A use context type and value assigned to the implementation guide
-* [MessageDefinition](messagedefinition.html): A use context type and value assigned to the message definition
-* [NamingSystem](namingsystem.html): A use context type and value assigned to the naming system
-* [OperationDefinition](operationdefinition.html): A use context type and value assigned to the operation definition
-* [SearchParameter](searchparameter.html): A use context type and value assigned to the search parameter
-* [StructureDefinition](structuredefinition.html): A use context type and value assigned to the structure definition
-* [StructureMap](structuremap.html): A use context type and value assigned to the structure map
-* [TerminologyCapabilities](terminologycapabilities.html): A use context type and value assigned to the terminology capabilities
-* [ValueSet](valueset.html): A use context type and value assigned to the value set
-
- * Type: composite
- * Path: CapabilityStatement.useContext | CodeSystem.useContext | CompartmentDefinition.useContext | ConceptMap.useContext | GraphDefinition.useContext | ImplementationGuide.useContext | MessageDefinition.useContext | NamingSystem.useContext | OperationDefinition.useContext | SearchParameter.useContext | StructureDefinition.useContext | StructureMap.useContext | TerminologyCapabilities.useContext | ValueSet.useContext
- *
- */
- @SearchParamDefinition(name="context-type-value", path="CapabilityStatement.useContext | CodeSystem.useContext | CompartmentDefinition.useContext | ConceptMap.useContext | GraphDefinition.useContext | ImplementationGuide.useContext | MessageDefinition.useContext | NamingSystem.useContext | OperationDefinition.useContext | SearchParameter.useContext | StructureDefinition.useContext | StructureMap.useContext | TerminologyCapabilities.useContext | ValueSet.useContext", description="Multiple Resources: \r\n\r\n* [CapabilityStatement](capabilitystatement.html): A use context type and value assigned to the capability statement\r\n* [CodeSystem](codesystem.html): A use context type and value assigned to the code system\r\n* [CompartmentDefinition](compartmentdefinition.html): A use context type and value assigned to the compartment definition\r\n* [ConceptMap](conceptmap.html): A use context type and value assigned to the concept map\r\n* [GraphDefinition](graphdefinition.html): A use context type and value assigned to the graph definition\r\n* [ImplementationGuide](implementationguide.html): A use context type and value assigned to the implementation guide\r\n* [MessageDefinition](messagedefinition.html): A use context type and value assigned to the message definition\r\n* [NamingSystem](namingsystem.html): A use context type and value assigned to the naming system\r\n* [OperationDefinition](operationdefinition.html): A use context type and value assigned to the operation definition\r\n* [SearchParameter](searchparameter.html): A use context type and value assigned to the search parameter\r\n* [StructureDefinition](structuredefinition.html): A use context type and value assigned to the structure definition\r\n* [StructureMap](structuremap.html): A use context type and value assigned to the structure map\r\n* [TerminologyCapabilities](terminologycapabilities.html): A use context type and value assigned to the terminology capabilities\r\n* [ValueSet](valueset.html): A use context type and value assigned to the value set\r\n", type="composite", compositeOf={"context-type", "context"} )
- public static final String SP_CONTEXT_TYPE_VALUE = "context-type-value";
- /**
- * Fluent Client search parameter constant for context-type-value
- *
- * Description: Multiple Resources:
-
-* [CapabilityStatement](capabilitystatement.html): A use context type and value assigned to the capability statement
-* [CodeSystem](codesystem.html): A use context type and value assigned to the code system
-* [CompartmentDefinition](compartmentdefinition.html): A use context type and value assigned to the compartment definition
-* [ConceptMap](conceptmap.html): A use context type and value assigned to the concept map
-* [GraphDefinition](graphdefinition.html): A use context type and value assigned to the graph definition
-* [ImplementationGuide](implementationguide.html): A use context type and value assigned to the implementation guide
-* [MessageDefinition](messagedefinition.html): A use context type and value assigned to the message definition
-* [NamingSystem](namingsystem.html): A use context type and value assigned to the naming system
-* [OperationDefinition](operationdefinition.html): A use context type and value assigned to the operation definition
-* [SearchParameter](searchparameter.html): A use context type and value assigned to the search parameter
-* [StructureDefinition](structuredefinition.html): A use context type and value assigned to the structure definition
-* [StructureMap](structuremap.html): A use context type and value assigned to the structure map
-* [TerminologyCapabilities](terminologycapabilities.html): A use context type and value assigned to the terminology capabilities
-* [ValueSet](valueset.html): A use context type and value assigned to the value set
-
- * Type: composite
- * Path: CapabilityStatement.useContext | CodeSystem.useContext | CompartmentDefinition.useContext | ConceptMap.useContext | GraphDefinition.useContext | ImplementationGuide.useContext | MessageDefinition.useContext | NamingSystem.useContext | OperationDefinition.useContext | SearchParameter.useContext | StructureDefinition.useContext | StructureMap.useContext | TerminologyCapabilities.useContext | ValueSet.useContext
- *
- */
- public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_VALUE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_VALUE);
-
/**
* Search parameter: context-type
*
@@ -9062,58 +8780,6 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT_TYPE);
- /**
- * Search parameter: context
- *
- * Description: Multiple Resources:
-
-* [CapabilityStatement](capabilitystatement.html): A use context assigned to the capability statement
-* [CodeSystem](codesystem.html): A use context assigned to the code system
-* [CompartmentDefinition](compartmentdefinition.html): A use context assigned to the compartment definition
-* [ConceptMap](conceptmap.html): A use context assigned to the concept map
-* [GraphDefinition](graphdefinition.html): A use context assigned to the graph definition
-* [ImplementationGuide](implementationguide.html): A use context assigned to the implementation guide
-* [MessageDefinition](messagedefinition.html): A use context assigned to the message definition
-* [NamingSystem](namingsystem.html): A use context assigned to the naming system
-* [OperationDefinition](operationdefinition.html): A use context assigned to the operation definition
-* [SearchParameter](searchparameter.html): A use context assigned to the search parameter
-* [StructureDefinition](structuredefinition.html): A use context assigned to the structure definition
-* [StructureMap](structuremap.html): A use context assigned to the structure map
-* [TerminologyCapabilities](terminologycapabilities.html): A use context assigned to the terminology capabilities
-* [ValueSet](valueset.html): A use context assigned to the value set
-
- * Type: token
- * Path: (CapabilityStatement.useContext.value as CodeableConcept) | (CodeSystem.useContext.value as CodeableConcept) | (CompartmentDefinition.useContext.value as CodeableConcept) | (ConceptMap.useContext.value as CodeableConcept) | (GraphDefinition.useContext.value as CodeableConcept) | (ImplementationGuide.useContext.value as CodeableConcept) | (MessageDefinition.useContext.value as CodeableConcept) | (NamingSystem.useContext.value as CodeableConcept) | (OperationDefinition.useContext.value as CodeableConcept) | (SearchParameter.useContext.value as CodeableConcept) | (StructureDefinition.useContext.value as CodeableConcept) | (StructureMap.useContext.value as CodeableConcept) | (TerminologyCapabilities.useContext.value as CodeableConcept) | (ValueSet.useContext.value as CodeableConcept)
- *
- */
- @SearchParamDefinition(name="context", path="(CapabilityStatement.useContext.value as CodeableConcept) | (CodeSystem.useContext.value as CodeableConcept) | (CompartmentDefinition.useContext.value as CodeableConcept) | (ConceptMap.useContext.value as CodeableConcept) | (GraphDefinition.useContext.value as CodeableConcept) | (ImplementationGuide.useContext.value as CodeableConcept) | (MessageDefinition.useContext.value as CodeableConcept) | (NamingSystem.useContext.value as CodeableConcept) | (OperationDefinition.useContext.value as CodeableConcept) | (SearchParameter.useContext.value as CodeableConcept) | (StructureDefinition.useContext.value as CodeableConcept) | (StructureMap.useContext.value as CodeableConcept) | (TerminologyCapabilities.useContext.value as CodeableConcept) | (ValueSet.useContext.value as CodeableConcept)", description="Multiple Resources: \r\n\r\n* [CapabilityStatement](capabilitystatement.html): A use context assigned to the capability statement\r\n* [CodeSystem](codesystem.html): A use context assigned to the code system\r\n* [CompartmentDefinition](compartmentdefinition.html): A use context assigned to the compartment definition\r\n* [ConceptMap](conceptmap.html): A use context assigned to the concept map\r\n* [GraphDefinition](graphdefinition.html): A use context assigned to the graph definition\r\n* [ImplementationGuide](implementationguide.html): A use context assigned to the implementation guide\r\n* [MessageDefinition](messagedefinition.html): A use context assigned to the message definition\r\n* [NamingSystem](namingsystem.html): A use context assigned to the naming system\r\n* [OperationDefinition](operationdefinition.html): A use context assigned to the operation definition\r\n* [SearchParameter](searchparameter.html): A use context assigned to the search parameter\r\n* [StructureDefinition](structuredefinition.html): A use context assigned to the structure definition\r\n* [StructureMap](structuremap.html): A use context assigned to the structure map\r\n* [TerminologyCapabilities](terminologycapabilities.html): A use context assigned to the terminology capabilities\r\n* [ValueSet](valueset.html): A use context assigned to the value set\r\n", type="token" )
- public static final String SP_CONTEXT = "context";
- /**
- * Fluent Client search parameter constant for context
- *
- * Description: Multiple Resources:
-
-* [CapabilityStatement](capabilitystatement.html): A use context assigned to the capability statement
-* [CodeSystem](codesystem.html): A use context assigned to the code system
-* [CompartmentDefinition](compartmentdefinition.html): A use context assigned to the compartment definition
-* [ConceptMap](conceptmap.html): A use context assigned to the concept map
-* [GraphDefinition](graphdefinition.html): A use context assigned to the graph definition
-* [ImplementationGuide](implementationguide.html): A use context assigned to the implementation guide
-* [MessageDefinition](messagedefinition.html): A use context assigned to the message definition
-* [NamingSystem](namingsystem.html): A use context assigned to the naming system
-* [OperationDefinition](operationdefinition.html): A use context assigned to the operation definition
-* [SearchParameter](searchparameter.html): A use context assigned to the search parameter
-* [StructureDefinition](structuredefinition.html): A use context assigned to the structure definition
-* [StructureMap](structuremap.html): A use context assigned to the structure map
-* [TerminologyCapabilities](terminologycapabilities.html): A use context assigned to the terminology capabilities
-* [ValueSet](valueset.html): A use context assigned to the value set
-
- * Type: token
- * Path: (CapabilityStatement.useContext.value as CodeableConcept) | (CodeSystem.useContext.value as CodeableConcept) | (CompartmentDefinition.useContext.value as CodeableConcept) | (ConceptMap.useContext.value as CodeableConcept) | (GraphDefinition.useContext.value as CodeableConcept) | (ImplementationGuide.useContext.value as CodeableConcept) | (MessageDefinition.useContext.value as CodeableConcept) | (NamingSystem.useContext.value as CodeableConcept) | (OperationDefinition.useContext.value as CodeableConcept) | (SearchParameter.useContext.value as CodeableConcept) | (StructureDefinition.useContext.value as CodeableConcept) | (StructureMap.useContext.value as CodeableConcept) | (TerminologyCapabilities.useContext.value as CodeableConcept) | (ValueSet.useContext.value as CodeableConcept)
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT);
-
/**
* Search parameter: date
*
@@ -9218,6 +8884,72 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
*/
public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION);
+ /**
+ * Search parameter: fhirversion
+ *
+ * Description: The version of FHIR
+ * Type: token
+ * Path: CapabilityStatement.version
+ *
+ */
+ @SearchParamDefinition(name="fhirversion", path="CapabilityStatement.version", description="The version of FHIR", type="token" )
+ public static final String SP_FHIRVERSION = "fhirversion";
+ /**
+ * Fluent Client search parameter constant for fhirversion
+ *
+ * Description: The version of FHIR
+ * Type: token
+ * Path: CapabilityStatement.version
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam FHIRVERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FHIRVERSION);
+
+ /**
+ * Search parameter: format
+ *
+ * Description: formats supported (xml | json | ttl | mime type)
+ * Type: token
+ * Path: CapabilityStatement.format
+ *
+ */
+ @SearchParamDefinition(name="format", path="CapabilityStatement.format", description="formats supported (xml | json | ttl | mime type)", type="token" )
+ public static final String SP_FORMAT = "format";
+ /**
+ * Fluent Client search parameter constant for format
+ *
+ * Description: formats supported (xml | json | ttl | mime type)
+ * Type: token
+ * Path: CapabilityStatement.format
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam FORMAT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FORMAT);
+
+ /**
+ * Search parameter: guide
+ *
+ * Description: Implementation guides supported
+ * Type: reference
+ * Path: CapabilityStatement.implementationGuide
+ *
+ */
+ @SearchParamDefinition(name="guide", path="CapabilityStatement.implementationGuide", description="Implementation guides supported", type="reference", target={ImplementationGuide.class } )
+ public static final String SP_GUIDE = "guide";
+ /**
+ * Fluent Client search parameter constant for guide
+ *
+ * Description: Implementation guides supported
+ * Type: reference
+ * Path: CapabilityStatement.implementationGuide
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam GUIDE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_GUIDE);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "CapabilityStatement:guide".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_GUIDE = new ca.uhn.fhir.model.api.Include("CapabilityStatement:guide").toLocked();
+
/**
* Search parameter: jurisdiction
*
@@ -9268,6 +9000,26 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam JURISDICTION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_JURISDICTION);
+ /**
+ * Search parameter: mode
+ *
+ * Description: Mode - restful (server/client) or messaging (sender/receiver)
+ * Type: token
+ * Path: CapabilityStatement.rest.mode
+ *
+ */
+ @SearchParamDefinition(name="mode", path="CapabilityStatement.rest.mode", description="Mode - restful (server/client) or messaging (sender/receiver)", type="token" )
+ public static final String SP_MODE = "mode";
+ /**
+ * Fluent Client search parameter constant for mode
+ *
+ * Description: Mode - restful (server/client) or messaging (sender/receiver)
+ * Type: token
+ * Path: CapabilityStatement.rest.mode
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam MODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MODE);
+
/**
* Search parameter: name
*
@@ -9372,6 +9124,92 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
*/
public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER);
+ /**
+ * Search parameter: resource
+ *
+ * Description: Name of a resource mentioned in a capability statement
+ * Type: token
+ * Path: CapabilityStatement.rest.resource.type
+ *
+ */
+ @SearchParamDefinition(name="resource", path="CapabilityStatement.rest.resource.type", description="Name of a resource mentioned in a capability statement", type="token" )
+ public static final String SP_RESOURCE = "resource";
+ /**
+ * Fluent Client search parameter constant for resource
+ *
+ * Description: Name of a resource mentioned in a capability statement
+ * Type: token
+ * Path: CapabilityStatement.rest.resource.type
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam RESOURCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RESOURCE);
+
+ /**
+ * Search parameter: resource-profile
+ *
+ * Description: A profile id invoked in a capability statement
+ * Type: reference
+ * Path: CapabilityStatement.rest.resource.profile
+ *
+ */
+ @SearchParamDefinition(name="resource-profile", path="CapabilityStatement.rest.resource.profile", description="A profile id invoked in a capability statement", type="reference", target={StructureDefinition.class } )
+ public static final String SP_RESOURCE_PROFILE = "resource-profile";
+ /**
+ * Fluent Client search parameter constant for resource-profile
+ *
+ * Description: A profile id invoked in a capability statement
+ * Type: reference
+ * Path: CapabilityStatement.rest.resource.profile
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RESOURCE_PROFILE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RESOURCE_PROFILE);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "CapabilityStatement:resource-profile".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_RESOURCE_PROFILE = new ca.uhn.fhir.model.api.Include("CapabilityStatement:resource-profile").toLocked();
+
+ /**
+ * Search parameter: security-service
+ *
+ * Description: OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates
+ * Type: token
+ * Path: CapabilityStatement.rest.security.service
+ *
+ */
+ @SearchParamDefinition(name="security-service", path="CapabilityStatement.rest.security.service", description="OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates", type="token" )
+ public static final String SP_SECURITY_SERVICE = "security-service";
+ /**
+ * Fluent Client search parameter constant for security-service
+ *
+ * Description: OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates
+ * Type: token
+ * Path: CapabilityStatement.rest.security.service
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam SECURITY_SERVICE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SECURITY_SERVICE);
+
+ /**
+ * Search parameter: software
+ *
+ * Description: Part of the name of a software application
+ * Type: string
+ * Path: CapabilityStatement.software.name
+ *
+ */
+ @SearchParamDefinition(name="software", path="CapabilityStatement.software.name", description="Part of the name of a software application", type="string" )
+ public static final String SP_SOFTWARE = "software";
+ /**
+ * Fluent Client search parameter constant for software
+ *
+ * Description: Part of the name of a software application
+ * Type: string
+ * Path: CapabilityStatement.software.name
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.StringClientParam SOFTWARE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_SOFTWARE);
+
/**
* Search parameter: status
*
@@ -9424,6 +9262,32 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+ /**
+ * Search parameter: supported-profile
+ *
+ * Description: Profiles for use cases supported
+ * Type: reference
+ * Path: CapabilityStatement.rest.resource.supportedProfile
+ *
+ */
+ @SearchParamDefinition(name="supported-profile", path="CapabilityStatement.rest.resource.supportedProfile", description="Profiles for use cases supported", type="reference", target={StructureDefinition.class } )
+ public static final String SP_SUPPORTED_PROFILE = "supported-profile";
+ /**
+ * Fluent Client search parameter constant for supported-profile
+ *
+ * Description: Profiles for use cases supported
+ * Type: reference
+ * Path: CapabilityStatement.rest.resource.supportedProfile
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUPPORTED_PROFILE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUPPORTED_PROFILE);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "CapabilityStatement:supported-profile".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUPPORTED_PROFILE = new ca.uhn.fhir.model.api.Include("CapabilityStatement:supported-profile").toLocked();
+
/**
* Search parameter: title
*
@@ -9572,7 +9436,111 @@ public class CapabilityStatement extends CanonicalResource implements IBaseConfo
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
-// Manual code (from Configuration.txt)t:
+ /**
+ * Search parameter: context-type-quantity
+ *
+ * Description: Multiple Resources:
+
+* [CapabilityStatement](capabilitystatement.html): A use context type and quantity- or range-based value assigned to the capability statement
+* [CodeSystem](codesystem.html): A use context type and quantity- or range-based value assigned to the code system
+* [CompartmentDefinition](compartmentdefinition.html): A use context type and quantity- or range-based value assigned to the compartment definition
+* [ConceptMap](conceptmap.html): A use context type and quantity- or range-based value assigned to the concept map
+* [GraphDefinition](graphdefinition.html): A use context type and quantity- or range-based value assigned to the graph definition
+* [ImplementationGuide](implementationguide.html): A use context type and quantity- or range-based value assigned to the implementation guide
+* [MessageDefinition](messagedefinition.html): A use context type and quantity- or range-based value assigned to the message definition
+* [NamingSystem](namingsystem.html): A use context type and quantity- or range-based value assigned to the naming system
+* [OperationDefinition](operationdefinition.html): A use context type and quantity- or range-based value assigned to the operation definition
+* [SearchParameter](searchparameter.html): A use context type and quantity- or range-based value assigned to the search parameter
+* [StructureDefinition](structuredefinition.html): A use context type and quantity- or range-based value assigned to the structure definition
+* [StructureMap](structuremap.html): A use context type and quantity- or range-based value assigned to the structure map
+* [TerminologyCapabilities](terminologycapabilities.html): A use context type and quantity- or range-based value assigned to the terminology capabilities
+* [ValueSet](valueset.html): A use context type and quantity- or range-based value assigned to the value set
+
+ * Type: composite
+ * Path: CapabilityStatement.useContext | CodeSystem.useContext | CompartmentDefinition.useContext | ConceptMap.useContext | GraphDefinition.useContext | ImplementationGuide.useContext | MessageDefinition.useContext | NamingSystem.useContext | OperationDefinition.useContext | SearchParameter.useContext | StructureDefinition.useContext | StructureMap.useContext | TerminologyCapabilities.useContext | ValueSet.useContext
+ *
+ */
+ @SearchParamDefinition(name="context-type-quantity", path="CapabilityStatement.useContext | CodeSystem.useContext | CompartmentDefinition.useContext | ConceptMap.useContext | GraphDefinition.useContext | ImplementationGuide.useContext | MessageDefinition.useContext | NamingSystem.useContext | OperationDefinition.useContext | SearchParameter.useContext | StructureDefinition.useContext | StructureMap.useContext | TerminologyCapabilities.useContext | ValueSet.useContext", description="Multiple Resources: \r\n\r\n* [CapabilityStatement](capabilitystatement.html): A use context type and quantity- or range-based value assigned to the capability statement\r\n* [CodeSystem](codesystem.html): A use context type and quantity- or range-based value assigned to the code system\r\n* [CompartmentDefinition](compartmentdefinition.html): A use context type and quantity- or range-based value assigned to the compartment definition\r\n* [ConceptMap](conceptmap.html): A use context type and quantity- or range-based value assigned to the concept map\r\n* [GraphDefinition](graphdefinition.html): A use context type and quantity- or range-based value assigned to the graph definition\r\n* [ImplementationGuide](implementationguide.html): A use context type and quantity- or range-based value assigned to the implementation guide\r\n* [MessageDefinition](messagedefinition.html): A use context type and quantity- or range-based value assigned to the message definition\r\n* [NamingSystem](namingsystem.html): A use context type and quantity- or range-based value assigned to the naming system\r\n* [OperationDefinition](operationdefinition.html): A use context type and quantity- or range-based value assigned to the operation definition\r\n* [SearchParameter](searchparameter.html): A use context type and quantity- or range-based value assigned to the search parameter\r\n* [StructureDefinition](structuredefinition.html): A use context type and quantity- or range-based value assigned to the structure definition\r\n* [StructureMap](structuremap.html): A use context type and quantity- or range-based value assigned to the structure map\r\n* [TerminologyCapabilities](terminologycapabilities.html): A use context type and quantity- or range-based value assigned to the terminology capabilities\r\n* [ValueSet](valueset.html): A use context type and quantity- or range-based value assigned to the value set\r\n", type="composite", compositeOf={"context-type", "context-quantity"} )
+ public static final String SP_CONTEXT_TYPE_QUANTITY = "context-type-quantity";
+ /**
+ * Fluent Client search parameter constant for context-type-quantity
+ *
+ * Description: Multiple Resources:
+
+* [CapabilityStatement](capabilitystatement.html): A use context type and quantity- or range-based value assigned to the capability statement
+* [CodeSystem](codesystem.html): A use context type and quantity- or range-based value assigned to the code system
+* [CompartmentDefinition](compartmentdefinition.html): A use context type and quantity- or range-based value assigned to the compartment definition
+* [ConceptMap](conceptmap.html): A use context type and quantity- or range-based value assigned to the concept map
+* [GraphDefinition](graphdefinition.html): A use context type and quantity- or range-based value assigned to the graph definition
+* [ImplementationGuide](implementationguide.html): A use context type and quantity- or range-based value assigned to the implementation guide
+* [MessageDefinition](messagedefinition.html): A use context type and quantity- or range-based value assigned to the message definition
+* [NamingSystem](namingsystem.html): A use context type and quantity- or range-based value assigned to the naming system
+* [OperationDefinition](operationdefinition.html): A use context type and quantity- or range-based value assigned to the operation definition
+* [SearchParameter](searchparameter.html): A use context type and quantity- or range-based value assigned to the search parameter
+* [StructureDefinition](structuredefinition.html): A use context type and quantity- or range-based value assigned to the structure definition
+* [StructureMap](structuremap.html): A use context type and quantity- or range-based value assigned to the structure map
+* [TerminologyCapabilities](terminologycapabilities.html): A use context type and quantity- or range-based value assigned to the terminology capabilities
+* [ValueSet](valueset.html): A use context type and quantity- or range-based value assigned to the value set
+
+ * Type: composite
+ * Path: CapabilityStatement.useContext | CodeSystem.useContext | CompartmentDefinition.useContext | ConceptMap.useContext | GraphDefinition.useContext | ImplementationGuide.useContext | MessageDefinition.useContext | NamingSystem.useContext | OperationDefinition.useContext | SearchParameter.useContext | StructureDefinition.useContext | StructureMap.useContext | TerminologyCapabilities.useContext | ValueSet.useContext
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_QUANTITY);
+
+ /**
+ * Search parameter: context-type-value
+ *
+ * Description: Multiple Resources:
+
+* [CapabilityStatement](capabilitystatement.html): A use context type and value assigned to the capability statement
+* [CodeSystem](codesystem.html): A use context type and value assigned to the code system
+* [CompartmentDefinition](compartmentdefinition.html): A use context type and value assigned to the compartment definition
+* [ConceptMap](conceptmap.html): A use context type and value assigned to the concept map
+* [GraphDefinition](graphdefinition.html): A use context type and value assigned to the graph definition
+* [ImplementationGuide](implementationguide.html): A use context type and value assigned to the implementation guide
+* [MessageDefinition](messagedefinition.html): A use context type and value assigned to the message definition
+* [NamingSystem](namingsystem.html): A use context type and value assigned to the naming system
+* [OperationDefinition](operationdefinition.html): A use context type and value assigned to the operation definition
+* [SearchParameter](searchparameter.html): A use context type and value assigned to the search parameter
+* [StructureDefinition](structuredefinition.html): A use context type and value assigned to the structure definition
+* [StructureMap](structuremap.html): A use context type and value assigned to the structure map
+* [TerminologyCapabilities](terminologycapabilities.html): A use context type and value assigned to the terminology capabilities
+* [ValueSet](valueset.html): A use context type and value assigned to the value set
+
+ * Type: composite
+ * Path: CapabilityStatement.useContext | CodeSystem.useContext | CompartmentDefinition.useContext | ConceptMap.useContext | GraphDefinition.useContext | ImplementationGuide.useContext | MessageDefinition.useContext | NamingSystem.useContext | OperationDefinition.useContext | SearchParameter.useContext | StructureDefinition.useContext | StructureMap.useContext | TerminologyCapabilities.useContext | ValueSet.useContext
+ *
+ */
+ @SearchParamDefinition(name="context-type-value", path="CapabilityStatement.useContext | CodeSystem.useContext | CompartmentDefinition.useContext | ConceptMap.useContext | GraphDefinition.useContext | ImplementationGuide.useContext | MessageDefinition.useContext | NamingSystem.useContext | OperationDefinition.useContext | SearchParameter.useContext | StructureDefinition.useContext | StructureMap.useContext | TerminologyCapabilities.useContext | ValueSet.useContext", description="Multiple Resources: \r\n\r\n* [CapabilityStatement](capabilitystatement.html): A use context type and value assigned to the capability statement\r\n* [CodeSystem](codesystem.html): A use context type and value assigned to the code system\r\n* [CompartmentDefinition](compartmentdefinition.html): A use context type and value assigned to the compartment definition\r\n* [ConceptMap](conceptmap.html): A use context type and value assigned to the concept map\r\n* [GraphDefinition](graphdefinition.html): A use context type and value assigned to the graph definition\r\n* [ImplementationGuide](implementationguide.html): A use context type and value assigned to the implementation guide\r\n* [MessageDefinition](messagedefinition.html): A use context type and value assigned to the message definition\r\n* [NamingSystem](namingsystem.html): A use context type and value assigned to the naming system\r\n* [OperationDefinition](operationdefinition.html): A use context type and value assigned to the operation definition\r\n* [SearchParameter](searchparameter.html): A use context type and value assigned to the search parameter\r\n* [StructureDefinition](structuredefinition.html): A use context type and value assigned to the structure definition\r\n* [StructureMap](structuremap.html): A use context type and value assigned to the structure map\r\n* [TerminologyCapabilities](terminologycapabilities.html): A use context type and value assigned to the terminology capabilities\r\n* [ValueSet](valueset.html): A use context type and value assigned to the value set\r\n", type="composite", compositeOf={"context-type", "context"} )
+ public static final String SP_CONTEXT_TYPE_VALUE = "context-type-value";
+ /**
+ * Fluent Client search parameter constant for context-type-value
+ *
+ * Description: Multiple Resources:
+
+* [CapabilityStatement](capabilitystatement.html): A use context type and value assigned to the capability statement
+* [CodeSystem](codesystem.html): A use context type and value assigned to the code system
+* [CompartmentDefinition](compartmentdefinition.html): A use context type and value assigned to the compartment definition
+* [ConceptMap](conceptmap.html): A use context type and value assigned to the concept map
+* [GraphDefinition](graphdefinition.html): A use context type and value assigned to the graph definition
+* [ImplementationGuide](implementationguide.html): A use context type and value assigned to the implementation guide
+* [MessageDefinition](messagedefinition.html): A use context type and value assigned to the message definition
+* [NamingSystem](namingsystem.html): A use context type and value assigned to the naming system
+* [OperationDefinition](operationdefinition.html): A use context type and value assigned to the operation definition
+* [SearchParameter](searchparameter.html): A use context type and value assigned to the search parameter
+* [StructureDefinition](structuredefinition.html): A use context type and value assigned to the structure definition
+* [StructureMap](structuremap.html): A use context type and value assigned to the structure map
+* [TerminologyCapabilities](terminologycapabilities.html): A use context type and value assigned to the terminology capabilities
+* [ValueSet](valueset.html): A use context type and value assigned to the value set
+
+ * Type: composite
+ * Path: CapabilityStatement.useContext | CodeSystem.useContext | CompartmentDefinition.useContext | ConceptMap.useContext | GraphDefinition.useContext | ImplementationGuide.useContext | MessageDefinition.useContext | NamingSystem.useContext | OperationDefinition.useContext | SearchParameter.useContext | StructureDefinition.useContext | StructureMap.useContext | TerminologyCapabilities.useContext | ValueSet.useContext
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_VALUE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_VALUE);
+
+// Manual code (from Configuration.txt):
// end addition
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement2.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement2.java
index 08b31a5b1..0431135db 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement2.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement2.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -53,6 +53,590 @@ import ca.uhn.fhir.model.api.annotation.Block;
@ResourceDef(name="CapabilityStatement2", profile="http://hl7.org/fhir/StructureDefinition/CapabilityStatement2")
public class CapabilityStatement2 extends CanonicalResource {
+ public enum CapabilityFeature {
+ /**
+ *
+ */
+ FEATUREHEADER,
+ /**
+ *
+ */
+ SECURITYCORS,
+ /**
+ *
+ */
+ SECURITYSERVICE,
+ /**
+ *
+ */
+ VERSIONING,
+ /**
+ *
+ */
+ READHISTORY,
+ /**
+ *
+ */
+ UPDATECREATE,
+ /**
+ *
+ */
+ CONDITIONALCREATE,
+ /**
+ *
+ */
+ CONDITIONALREAD,
+ /**
+ *
+ */
+ CONDITIONALUPDATE,
+ /**
+ *
+ */
+ CONDITIONALDELETE,
+ /**
+ *
+ */
+ REFERENCEPOLICY,
+ /**
+ *
+ */
+ SEARCHINCLUDE,
+ /**
+ *
+ */
+ SEARCHREVINCLUDE,
+ /**
+ * added to help the parsers with the generic types
+ */
+ NULL;
+ public static CapabilityFeature fromCode(String codeString) throws FHIRException {
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("feature-header".equals(codeString))
+ return FEATUREHEADER;
+ if ("security-cors".equals(codeString))
+ return SECURITYCORS;
+ if ("security-service".equals(codeString))
+ return SECURITYSERVICE;
+ if ("versioning".equals(codeString))
+ return VERSIONING;
+ if ("readHistory".equals(codeString))
+ return READHISTORY;
+ if ("updateCreate".equals(codeString))
+ return UPDATECREATE;
+ if ("conditionalCreate".equals(codeString))
+ return CONDITIONALCREATE;
+ if ("conditionalRead".equals(codeString))
+ return CONDITIONALREAD;
+ if ("conditionalUpdate".equals(codeString))
+ return CONDITIONALUPDATE;
+ if ("conditionalDelete".equals(codeString))
+ return CONDITIONALDELETE;
+ if ("referencePolicy".equals(codeString))
+ return REFERENCEPOLICY;
+ if ("searchInclude".equals(codeString))
+ return SEARCHINCLUDE;
+ if ("searchRevInclude".equals(codeString))
+ return SEARCHREVINCLUDE;
+ if (Configuration.isAcceptInvalidEnums())
+ return null;
+ else
+ throw new FHIRException("Unknown CapabilityFeature code '"+codeString+"'");
+ }
+ public String toCode() {
+ switch (this) {
+ case FEATUREHEADER: return "feature-header";
+ case SECURITYCORS: return "security-cors";
+ case SECURITYSERVICE: return "security-service";
+ case VERSIONING: return "versioning";
+ case READHISTORY: return "readHistory";
+ case UPDATECREATE: return "updateCreate";
+ case CONDITIONALCREATE: return "conditionalCreate";
+ case CONDITIONALREAD: return "conditionalRead";
+ case CONDITIONALUPDATE: return "conditionalUpdate";
+ case CONDITIONALDELETE: return "conditionalDelete";
+ case REFERENCEPOLICY: return "referencePolicy";
+ case SEARCHINCLUDE: return "searchInclude";
+ case SEARCHREVINCLUDE: return "searchRevInclude";
+ default: return "?";
+ }
+ }
+ public String getSystem() {
+ switch (this) {
+ case FEATUREHEADER: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case SECURITYCORS: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case SECURITYSERVICE: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case VERSIONING: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case READHISTORY: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case UPDATECREATE: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case CONDITIONALCREATE: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case CONDITIONALREAD: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case CONDITIONALUPDATE: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case CONDITIONALDELETE: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case REFERENCEPOLICY: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case SEARCHINCLUDE: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case SEARCHREVINCLUDE: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ default: return "?";
+ }
+ }
+ public String getDefinition() {
+ switch (this) {
+ case FEATUREHEADER: return "";
+ case SECURITYCORS: return "";
+ case SECURITYSERVICE: return "";
+ case VERSIONING: return "";
+ case READHISTORY: return "";
+ case UPDATECREATE: return "";
+ case CONDITIONALCREATE: return "";
+ case CONDITIONALREAD: return "";
+ case CONDITIONALUPDATE: return "";
+ case CONDITIONALDELETE: return "";
+ case REFERENCEPOLICY: return "";
+ case SEARCHINCLUDE: return "";
+ case SEARCHREVINCLUDE: return "";
+ default: return "?";
+ }
+ }
+ public String getDisplay() {
+ switch (this) {
+ case FEATUREHEADER: return "Whether the server supports the Required-Feature header by which a client makes a feature as mandatory for processing a requrest properly";
+ case SECURITYCORS: return "security-cors";
+ case SECURITYSERVICE: return "security-service";
+ case VERSIONING: return "versioning";
+ case READHISTORY: return "readHistory";
+ case UPDATECREATE: return "updateCreate";
+ case CONDITIONALCREATE: return "conditionalCreate";
+ case CONDITIONALREAD: return "conditionalRead";
+ case CONDITIONALUPDATE: return "conditionalUpdate";
+ case CONDITIONALDELETE: return "conditionalDelete";
+ case REFERENCEPOLICY: return "referencePolicy";
+ case SEARCHINCLUDE: return "searchInclude";
+ case SEARCHREVINCLUDE: return "searchRevInclude";
+ default: return "?";
+ }
+ }
+ }
+
+ public static class CapabilityFeatureEnumFactory implements EnumFactory {
+ public CapabilityFeature fromCode(String codeString) throws IllegalArgumentException {
+ if (codeString == null || "".equals(codeString))
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("feature-header".equals(codeString))
+ return CapabilityFeature.FEATUREHEADER;
+ if ("security-cors".equals(codeString))
+ return CapabilityFeature.SECURITYCORS;
+ if ("security-service".equals(codeString))
+ return CapabilityFeature.SECURITYSERVICE;
+ if ("versioning".equals(codeString))
+ return CapabilityFeature.VERSIONING;
+ if ("readHistory".equals(codeString))
+ return CapabilityFeature.READHISTORY;
+ if ("updateCreate".equals(codeString))
+ return CapabilityFeature.UPDATECREATE;
+ if ("conditionalCreate".equals(codeString))
+ return CapabilityFeature.CONDITIONALCREATE;
+ if ("conditionalRead".equals(codeString))
+ return CapabilityFeature.CONDITIONALREAD;
+ if ("conditionalUpdate".equals(codeString))
+ return CapabilityFeature.CONDITIONALUPDATE;
+ if ("conditionalDelete".equals(codeString))
+ return CapabilityFeature.CONDITIONALDELETE;
+ if ("referencePolicy".equals(codeString))
+ return CapabilityFeature.REFERENCEPOLICY;
+ if ("searchInclude".equals(codeString))
+ return CapabilityFeature.SEARCHINCLUDE;
+ if ("searchRevInclude".equals(codeString))
+ return CapabilityFeature.SEARCHREVINCLUDE;
+ throw new IllegalArgumentException("Unknown CapabilityFeature code '"+codeString+"'");
+ }
+ public Enumeration fromType(Base code) throws FHIRException {
+ if (code == null)
+ return null;
+ if (code.isEmpty())
+ return new Enumeration(this);
+ String codeString = ((PrimitiveType) code).asStringValue();
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("feature-header".equals(codeString))
+ return new Enumeration(this, CapabilityFeature.FEATUREHEADER);
+ if ("security-cors".equals(codeString))
+ return new Enumeration(this, CapabilityFeature.SECURITYCORS);
+ if ("security-service".equals(codeString))
+ return new Enumeration(this, CapabilityFeature.SECURITYSERVICE);
+ if ("versioning".equals(codeString))
+ return new Enumeration(this, CapabilityFeature.VERSIONING);
+ if ("readHistory".equals(codeString))
+ return new Enumeration(this, CapabilityFeature.READHISTORY);
+ if ("updateCreate".equals(codeString))
+ return new Enumeration(this, CapabilityFeature.UPDATECREATE);
+ if ("conditionalCreate".equals(codeString))
+ return new Enumeration(this, CapabilityFeature.CONDITIONALCREATE);
+ if ("conditionalRead".equals(codeString))
+ return new Enumeration(this, CapabilityFeature.CONDITIONALREAD);
+ if ("conditionalUpdate".equals(codeString))
+ return new Enumeration(this, CapabilityFeature.CONDITIONALUPDATE);
+ if ("conditionalDelete".equals(codeString))
+ return new Enumeration(this, CapabilityFeature.CONDITIONALDELETE);
+ if ("referencePolicy".equals(codeString))
+ return new Enumeration(this, CapabilityFeature.REFERENCEPOLICY);
+ if ("searchInclude".equals(codeString))
+ return new Enumeration(this, CapabilityFeature.SEARCHINCLUDE);
+ if ("searchRevInclude".equals(codeString))
+ return new Enumeration(this, CapabilityFeature.SEARCHREVINCLUDE);
+ throw new FHIRException("Unknown CapabilityFeature code '"+codeString+"'");
+ }
+ public String toCode(CapabilityFeature code) {
+ if (code == CapabilityFeature.FEATUREHEADER)
+ return "feature-header";
+ if (code == CapabilityFeature.SECURITYCORS)
+ return "security-cors";
+ if (code == CapabilityFeature.SECURITYSERVICE)
+ return "security-service";
+ if (code == CapabilityFeature.VERSIONING)
+ return "versioning";
+ if (code == CapabilityFeature.READHISTORY)
+ return "readHistory";
+ if (code == CapabilityFeature.UPDATECREATE)
+ return "updateCreate";
+ if (code == CapabilityFeature.CONDITIONALCREATE)
+ return "conditionalCreate";
+ if (code == CapabilityFeature.CONDITIONALREAD)
+ return "conditionalRead";
+ if (code == CapabilityFeature.CONDITIONALUPDATE)
+ return "conditionalUpdate";
+ if (code == CapabilityFeature.CONDITIONALDELETE)
+ return "conditionalDelete";
+ if (code == CapabilityFeature.REFERENCEPOLICY)
+ return "referencePolicy";
+ if (code == CapabilityFeature.SEARCHINCLUDE)
+ return "searchInclude";
+ if (code == CapabilityFeature.SEARCHREVINCLUDE)
+ return "searchRevInclude";
+ return "?";
+ }
+ public String toSystem(CapabilityFeature code) {
+ return code.getSystem();
+ }
+ }
+
+ public enum CapabilityFeatureValue {
+ /**
+ *
+ */
+ TRUE,
+ /**
+ *
+ */
+ FALSE,
+ /**
+ * VersionId meta-property is not supported (server) or used (client).
+ */
+ NOVERSION,
+ /**
+ * VersionId meta-property is supported (server) or used (client).
+ */
+ VERSIONED,
+ /**
+ * VersionId must be correct for updates (server) or will be specified (If-match header) for updates (client).
+ */
+ VERSIONEDUPDATE,
+ /**
+ * No support for conditional reads.
+ */
+ NOTSUPPORTED,
+ /**
+ * Conditional reads are supported, but only with the If-Modified-Since HTTP Header.
+ */
+ MODIFIEDSINCE,
+ /**
+ * Conditional reads are supported, but only with the If-None-Match HTTP Header.
+ */
+ NOTMATCH,
+ /**
+ * Conditional reads are supported, with both If-Modified-Since and If-None-Match HTTP Headers.
+ */
+ FULLSUPPORT,
+ /**
+ * Conditional deletes are supported, but only single resources at a time.
+ */
+ SINGLE,
+ /**
+ * Conditional deletes are supported, and multiple resources can be deleted in a single interaction.
+ */
+ MULTIPLE,
+ /**
+ * The server supports and populates Literal references (i.e. using Reference.reference) where they are known (this code does not guarantee that all references are literal; see 'enforced').
+ */
+ LITERAL,
+ /**
+ * The server allows logical references (i.e. using Reference.identifier).
+ */
+ LOGICAL,
+ /**
+ * The server will attempt to resolve logical references to literal references - i.e. converting Reference.identifier to Reference.reference (if resolution fails, the server may still accept resources; see logical).
+ */
+ RESOLVES,
+ /**
+ * The server enforces that references have integrity - e.g. it ensures that references can always be resolved. This is typically the case for clinical record systems, but often not the case for middleware/proxy systems.
+ */
+ ENFORCED,
+ /**
+ * The server does not support references that point to other servers.
+ */
+ LOCAL,
+ /**
+ * added to help the parsers with the generic types
+ */
+ NULL;
+ public static CapabilityFeatureValue fromCode(String codeString) throws FHIRException {
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("true".equals(codeString))
+ return TRUE;
+ if ("false".equals(codeString))
+ return FALSE;
+ if ("no-version".equals(codeString))
+ return NOVERSION;
+ if ("versioned".equals(codeString))
+ return VERSIONED;
+ if ("versioned-update".equals(codeString))
+ return VERSIONEDUPDATE;
+ if ("not-supported".equals(codeString))
+ return NOTSUPPORTED;
+ if ("modified-since".equals(codeString))
+ return MODIFIEDSINCE;
+ if ("not-match".equals(codeString))
+ return NOTMATCH;
+ if ("full-support".equals(codeString))
+ return FULLSUPPORT;
+ if ("single".equals(codeString))
+ return SINGLE;
+ if ("multiple".equals(codeString))
+ return MULTIPLE;
+ if ("literal".equals(codeString))
+ return LITERAL;
+ if ("logical".equals(codeString))
+ return LOGICAL;
+ if ("resolves".equals(codeString))
+ return RESOLVES;
+ if ("enforced".equals(codeString))
+ return ENFORCED;
+ if ("local".equals(codeString))
+ return LOCAL;
+ if (Configuration.isAcceptInvalidEnums())
+ return null;
+ else
+ throw new FHIRException("Unknown CapabilityFeatureValue code '"+codeString+"'");
+ }
+ public String toCode() {
+ switch (this) {
+ case TRUE: return "true";
+ case FALSE: return "false";
+ case NOVERSION: return "no-version";
+ case VERSIONED: return "versioned";
+ case VERSIONEDUPDATE: return "versioned-update";
+ case NOTSUPPORTED: return "not-supported";
+ case MODIFIEDSINCE: return "modified-since";
+ case NOTMATCH: return "not-match";
+ case FULLSUPPORT: return "full-support";
+ case SINGLE: return "single";
+ case MULTIPLE: return "multiple";
+ case LITERAL: return "literal";
+ case LOGICAL: return "logical";
+ case RESOLVES: return "resolves";
+ case ENFORCED: return "enforced";
+ case LOCAL: return "local";
+ default: return "?";
+ }
+ }
+ public String getSystem() {
+ switch (this) {
+ case TRUE: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case FALSE: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case NOVERSION: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case VERSIONED: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case VERSIONEDUPDATE: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case NOTSUPPORTED: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case MODIFIEDSINCE: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case NOTMATCH: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case FULLSUPPORT: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case SINGLE: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case MULTIPLE: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case LITERAL: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case LOGICAL: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case RESOLVES: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case ENFORCED: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ case LOCAL: return "http://hl7.org/fhir/CodeSystem/capability-features";
+ default: return "?";
+ }
+ }
+ public String getDefinition() {
+ switch (this) {
+ case TRUE: return "";
+ case FALSE: return "";
+ case NOVERSION: return "VersionId meta-property is not supported (server) or used (client).";
+ case VERSIONED: return "VersionId meta-property is supported (server) or used (client).";
+ case VERSIONEDUPDATE: return "VersionId must be correct for updates (server) or will be specified (If-match header) for updates (client).";
+ case NOTSUPPORTED: return "No support for conditional reads.";
+ case MODIFIEDSINCE: return "Conditional reads are supported, but only with the If-Modified-Since HTTP Header.";
+ case NOTMATCH: return "Conditional reads are supported, but only with the If-None-Match HTTP Header.";
+ case FULLSUPPORT: return "Conditional reads are supported, with both If-Modified-Since and If-None-Match HTTP Headers.";
+ case SINGLE: return "Conditional deletes are supported, but only single resources at a time.";
+ case MULTIPLE: return "Conditional deletes are supported, and multiple resources can be deleted in a single interaction.";
+ case LITERAL: return "The server supports and populates Literal references (i.e. using Reference.reference) where they are known (this code does not guarantee that all references are literal; see 'enforced').";
+ case LOGICAL: return "The server allows logical references (i.e. using Reference.identifier).";
+ case RESOLVES: return "The server will attempt to resolve logical references to literal references - i.e. converting Reference.identifier to Reference.reference (if resolution fails, the server may still accept resources; see logical).";
+ case ENFORCED: return "The server enforces that references have integrity - e.g. it ensures that references can always be resolved. This is typically the case for clinical record systems, but often not the case for middleware/proxy systems.";
+ case LOCAL: return "The server does not support references that point to other servers.";
+ default: return "?";
+ }
+ }
+ public String getDisplay() {
+ switch (this) {
+ case TRUE: return "Value is true";
+ case FALSE: return "Value is false";
+ case NOVERSION: return "No VersionId Support";
+ case VERSIONED: return "Versioned";
+ case VERSIONEDUPDATE: return "VersionId tracked fully";
+ case NOTSUPPORTED: return "Not Supported";
+ case MODIFIEDSINCE: return "If-Modified-Since";
+ case NOTMATCH: return "If-None-Match";
+ case FULLSUPPORT: return "Full Support";
+ case SINGLE: return "Single Deletes Supported";
+ case MULTIPLE: return "Multiple Deletes Supported";
+ case LITERAL: return "Literal References";
+ case LOGICAL: return "Logical References";
+ case RESOLVES: return "Resolves References";
+ case ENFORCED: return "Reference Integrity Enforced";
+ case LOCAL: return "Local References Only";
+ default: return "?";
+ }
+ }
+ }
+
+ public static class CapabilityFeatureValueEnumFactory implements EnumFactory {
+ public CapabilityFeatureValue fromCode(String codeString) throws IllegalArgumentException {
+ if (codeString == null || "".equals(codeString))
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("true".equals(codeString))
+ return CapabilityFeatureValue.TRUE;
+ if ("false".equals(codeString))
+ return CapabilityFeatureValue.FALSE;
+ if ("no-version".equals(codeString))
+ return CapabilityFeatureValue.NOVERSION;
+ if ("versioned".equals(codeString))
+ return CapabilityFeatureValue.VERSIONED;
+ if ("versioned-update".equals(codeString))
+ return CapabilityFeatureValue.VERSIONEDUPDATE;
+ if ("not-supported".equals(codeString))
+ return CapabilityFeatureValue.NOTSUPPORTED;
+ if ("modified-since".equals(codeString))
+ return CapabilityFeatureValue.MODIFIEDSINCE;
+ if ("not-match".equals(codeString))
+ return CapabilityFeatureValue.NOTMATCH;
+ if ("full-support".equals(codeString))
+ return CapabilityFeatureValue.FULLSUPPORT;
+ if ("single".equals(codeString))
+ return CapabilityFeatureValue.SINGLE;
+ if ("multiple".equals(codeString))
+ return CapabilityFeatureValue.MULTIPLE;
+ if ("literal".equals(codeString))
+ return CapabilityFeatureValue.LITERAL;
+ if ("logical".equals(codeString))
+ return CapabilityFeatureValue.LOGICAL;
+ if ("resolves".equals(codeString))
+ return CapabilityFeatureValue.RESOLVES;
+ if ("enforced".equals(codeString))
+ return CapabilityFeatureValue.ENFORCED;
+ if ("local".equals(codeString))
+ return CapabilityFeatureValue.LOCAL;
+ throw new IllegalArgumentException("Unknown CapabilityFeatureValue code '"+codeString+"'");
+ }
+ public Enumeration fromType(Base code) throws FHIRException {
+ if (code == null)
+ return null;
+ if (code.isEmpty())
+ return new Enumeration(this);
+ String codeString = ((PrimitiveType) code).asStringValue();
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("true".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.TRUE);
+ if ("false".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.FALSE);
+ if ("no-version".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.NOVERSION);
+ if ("versioned".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.VERSIONED);
+ if ("versioned-update".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.VERSIONEDUPDATE);
+ if ("not-supported".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.NOTSUPPORTED);
+ if ("modified-since".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.MODIFIEDSINCE);
+ if ("not-match".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.NOTMATCH);
+ if ("full-support".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.FULLSUPPORT);
+ if ("single".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.SINGLE);
+ if ("multiple".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.MULTIPLE);
+ if ("literal".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.LITERAL);
+ if ("logical".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.LOGICAL);
+ if ("resolves".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.RESOLVES);
+ if ("enforced".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.ENFORCED);
+ if ("local".equals(codeString))
+ return new Enumeration(this, CapabilityFeatureValue.LOCAL);
+ throw new FHIRException("Unknown CapabilityFeatureValue code '"+codeString+"'");
+ }
+ public String toCode(CapabilityFeatureValue code) {
+ if (code == CapabilityFeatureValue.TRUE)
+ return "true";
+ if (code == CapabilityFeatureValue.FALSE)
+ return "false";
+ if (code == CapabilityFeatureValue.NOVERSION)
+ return "no-version";
+ if (code == CapabilityFeatureValue.VERSIONED)
+ return "versioned";
+ if (code == CapabilityFeatureValue.VERSIONEDUPDATE)
+ return "versioned-update";
+ if (code == CapabilityFeatureValue.NOTSUPPORTED)
+ return "not-supported";
+ if (code == CapabilityFeatureValue.MODIFIEDSINCE)
+ return "modified-since";
+ if (code == CapabilityFeatureValue.NOTMATCH)
+ return "not-match";
+ if (code == CapabilityFeatureValue.FULLSUPPORT)
+ return "full-support";
+ if (code == CapabilityFeatureValue.SINGLE)
+ return "single";
+ if (code == CapabilityFeatureValue.MULTIPLE)
+ return "multiple";
+ if (code == CapabilityFeatureValue.LITERAL)
+ return "literal";
+ if (code == CapabilityFeatureValue.LOGICAL)
+ return "logical";
+ if (code == CapabilityFeatureValue.RESOLVES)
+ return "resolves";
+ if (code == CapabilityFeatureValue.ENFORCED)
+ return "enforced";
+ if (code == CapabilityFeatureValue.LOCAL)
+ return "local";
+ return "?";
+ }
+ public String toSystem(CapabilityFeatureValue code) {
+ return code.getSystem();
+ }
+ }
+
public enum SystemRestfulInteraction {
/**
* Update, create or delete a set of resources as a single transaction.
@@ -96,7 +680,6 @@ public class CapabilityStatement2 extends CanonicalResource {
case BATCH: return "batch";
case SEARCHSYSTEM: return "search-system";
case HISTORYSYSTEM: return "history-system";
- case NULL: return null;
default: return "?";
}
}
@@ -106,7 +689,6 @@ public class CapabilityStatement2 extends CanonicalResource {
case BATCH: return "http://hl7.org/fhir/restful-interaction";
case SEARCHSYSTEM: return "http://hl7.org/fhir/restful-interaction";
case HISTORYSYSTEM: return "http://hl7.org/fhir/restful-interaction";
- case NULL: return null;
default: return "?";
}
}
@@ -116,7 +698,6 @@ public class CapabilityStatement2 extends CanonicalResource {
case BATCH: return "perform a set of a separate interactions in a single http operation";
case SEARCHSYSTEM: return "Search all resources based on some filter criteria.";
case HISTORYSYSTEM: return "Retrieve the change history for all resources on a system.";
- case NULL: return null;
default: return "?";
}
}
@@ -126,7 +707,6 @@ public class CapabilityStatement2 extends CanonicalResource {
case BATCH: return "batch";
case SEARCHSYSTEM: return "search-system";
case HISTORYSYSTEM: return "history-system";
- case NULL: return null;
default: return "?";
}
}
@@ -259,7 +839,6 @@ public class CapabilityStatement2 extends CanonicalResource {
case HISTORYTYPE: return "history-type";
case CREATE: return "create";
case SEARCHTYPE: return "search-type";
- case NULL: return null;
default: return "?";
}
}
@@ -274,7 +853,6 @@ public class CapabilityStatement2 extends CanonicalResource {
case HISTORYTYPE: return "http://hl7.org/fhir/restful-interaction";
case CREATE: return "http://hl7.org/fhir/restful-interaction";
case SEARCHTYPE: return "http://hl7.org/fhir/restful-interaction";
- case NULL: return null;
default: return "?";
}
}
@@ -289,7 +867,6 @@ public class CapabilityStatement2 extends CanonicalResource {
case HISTORYTYPE: return "Retrieve the change history for all resources of a particular type.";
case CREATE: return "Create a new resource with a server assigned id.";
case SEARCHTYPE: return "Search all resources of the specified type based on some filter criteria.";
- case NULL: return null;
default: return "?";
}
}
@@ -304,7 +881,6 @@ public class CapabilityStatement2 extends CanonicalResource {
case HISTORYTYPE: return "history-type";
case CREATE: return "create";
case SEARCHTYPE: return "search-type";
- case NULL: return null;
default: return "?";
}
}
@@ -1033,42 +1609,49 @@ public class CapabilityStatement2 extends CanonicalResource {
@Description(shortDefinition="General description of implementation", formalDefinition="Information about the system's restful capabilities that apply across all applications, such as security." )
protected MarkdownType documentation;
+ /**
+ * A statement that affirms support for a feature.
+ */
+ @Child(name = "feature", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Statement of support for a feature", formalDefinition="A statement that affirms support for a feature." )
+ protected List feature;
+
/**
* A specification of the restful capabilities of the solution for a specific resource type.
*/
- @Child(name = "resource", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+ @Child(name = "resource", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Resource served on the REST interface", formalDefinition="A specification of the restful capabilities of the solution for a specific resource type." )
protected List resource;
/**
* A specification of restful operations supported by the system.
*/
- @Child(name = "interaction", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "interaction", type = {}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="What operations are supported?", formalDefinition="A specification of restful operations supported by the system." )
protected List interaction;
/**
* Search parameters that are supported for searching all resources for implementations to support and/or make use of - either references to ones defined in the specification, or additional ones defined for/by the implementation.
*/
- @Child(name = "searchParam", type = {CapabilityStatement2RestResourceSearchParamComponent.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "searchParam", type = {CapabilityStatement2RestResourceSearchParamComponent.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Search parameters for searching all resources", formalDefinition="Search parameters that are supported for searching all resources for implementations to support and/or make use of - either references to ones defined in the specification, or additional ones defined for/by the implementation." )
protected List searchParam;
/**
* Definition of an operation or a named query together with its parameters and their meaning and type.
*/
- @Child(name = "operation", type = {CapabilityStatement2RestResourceOperationComponent.class}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+ @Child(name = "operation", type = {CapabilityStatement2RestResourceOperationComponent.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Definition of a system level operation", formalDefinition="Definition of an operation or a named query together with its parameters and their meaning and type." )
protected List operation;
/**
* An absolute URI which is a reference to the definition of a compartment that the system supports. The reference is to a CompartmentDefinition resource by its canonical URL .
*/
- @Child(name = "compartment", type = {CanonicalType.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "compartment", type = {CanonicalType.class}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Compartments served/used by system", formalDefinition="An absolute URI which is a reference to the definition of a compartment that the system supports. The reference is to a CompartmentDefinition resource by its canonical URL ." )
protected List compartment;
- private static final long serialVersionUID = -476653235L;
+ private static final long serialVersionUID = 2139914073L;
/**
* Constructor
@@ -1179,6 +1762,59 @@ public class CapabilityStatement2 extends CanonicalResource {
return this;
}
+ /**
+ * @return {@link #feature} (A statement that affirms support for a feature.)
+ */
+ public List getFeature() {
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ return this.feature;
+ }
+
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public CapabilityStatement2RestComponent setFeature(List theFeature) {
+ this.feature = theFeature;
+ return this;
+ }
+
+ public boolean hasFeature() {
+ if (this.feature == null)
+ return false;
+ for (CapabilityStatement2RestFeatureComponent item : this.feature)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public CapabilityStatement2RestFeatureComponent addFeature() { //3
+ CapabilityStatement2RestFeatureComponent t = new CapabilityStatement2RestFeatureComponent();
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ this.feature.add(t);
+ return t;
+ }
+
+ public CapabilityStatement2RestComponent addFeature(CapabilityStatement2RestFeatureComponent t) { //3
+ if (t == null)
+ return this;
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ this.feature.add(t);
+ return this;
+ }
+
+ /**
+ * @return The first repetition of repeating field {@link #feature}, creating it if it does not already exist {3}
+ */
+ public CapabilityStatement2RestFeatureComponent getFeatureFirstRep() {
+ if (getFeature().isEmpty()) {
+ addFeature();
+ }
+ return getFeature().get(0);
+ }
+
/**
* @return {@link #resource} (A specification of the restful capabilities of the solution for a specific resource type.)
*/
@@ -1456,6 +2092,7 @@ public class CapabilityStatement2 extends CanonicalResource {
super.listChildren(children);
children.add(new Property("mode", "code", "Identifies whether this portion of the statement is describing the ability to initiate or receive restful operations.", 0, 1, mode));
children.add(new Property("documentation", "markdown", "Information about the system's restful capabilities that apply across all applications, such as security.", 0, 1, documentation));
+ children.add(new Property("feature", "", "A statement that affirms support for a feature.", 0, java.lang.Integer.MAX_VALUE, feature));
children.add(new Property("resource", "", "A specification of the restful capabilities of the solution for a specific resource type.", 0, java.lang.Integer.MAX_VALUE, resource));
children.add(new Property("interaction", "", "A specification of restful operations supported by the system.", 0, java.lang.Integer.MAX_VALUE, interaction));
children.add(new Property("searchParam", "@CapabilityStatement2.rest.resource.searchParam", "Search parameters that are supported for searching all resources for implementations to support and/or make use of - either references to ones defined in the specification, or additional ones defined for/by the implementation.", 0, java.lang.Integer.MAX_VALUE, searchParam));
@@ -1468,6 +2105,7 @@ public class CapabilityStatement2 extends CanonicalResource {
switch (_hash) {
case 3357091: /*mode*/ return new Property("mode", "code", "Identifies whether this portion of the statement is describing the ability to initiate or receive restful operations.", 0, 1, mode);
case 1587405498: /*documentation*/ return new Property("documentation", "markdown", "Information about the system's restful capabilities that apply across all applications, such as security.", 0, 1, documentation);
+ case -979207434: /*feature*/ return new Property("feature", "", "A statement that affirms support for a feature.", 0, java.lang.Integer.MAX_VALUE, feature);
case -341064690: /*resource*/ return new Property("resource", "", "A specification of the restful capabilities of the solution for a specific resource type.", 0, java.lang.Integer.MAX_VALUE, resource);
case 1844104722: /*interaction*/ return new Property("interaction", "", "A specification of restful operations supported by the system.", 0, java.lang.Integer.MAX_VALUE, interaction);
case -553645115: /*searchParam*/ return new Property("searchParam", "@CapabilityStatement2.rest.resource.searchParam", "Search parameters that are supported for searching all resources for implementations to support and/or make use of - either references to ones defined in the specification, or additional ones defined for/by the implementation.", 0, java.lang.Integer.MAX_VALUE, searchParam);
@@ -1483,6 +2121,7 @@ public class CapabilityStatement2 extends CanonicalResource {
switch (hash) {
case 3357091: /*mode*/ return this.mode == null ? new Base[0] : new Base[] {this.mode}; // Enumeration
case 1587405498: /*documentation*/ return this.documentation == null ? new Base[0] : new Base[] {this.documentation}; // MarkdownType
+ case -979207434: /*feature*/ return this.feature == null ? new Base[0] : this.feature.toArray(new Base[this.feature.size()]); // CapabilityStatement2RestFeatureComponent
case -341064690: /*resource*/ return this.resource == null ? new Base[0] : this.resource.toArray(new Base[this.resource.size()]); // CapabilityStatement2RestResourceComponent
case 1844104722: /*interaction*/ return this.interaction == null ? new Base[0] : this.interaction.toArray(new Base[this.interaction.size()]); // SystemInteractionComponent
case -553645115: /*searchParam*/ return this.searchParam == null ? new Base[0] : this.searchParam.toArray(new Base[this.searchParam.size()]); // CapabilityStatement2RestResourceSearchParamComponent
@@ -1503,6 +2142,9 @@ public class CapabilityStatement2 extends CanonicalResource {
case 1587405498: // documentation
this.documentation = TypeConvertor.castToMarkdown(value); // MarkdownType
return value;
+ case -979207434: // feature
+ this.getFeature().add((CapabilityStatement2RestFeatureComponent) value); // CapabilityStatement2RestFeatureComponent
+ return value;
case -341064690: // resource
this.getResource().add((CapabilityStatement2RestResourceComponent) value); // CapabilityStatement2RestResourceComponent
return value;
@@ -1530,6 +2172,8 @@ public class CapabilityStatement2 extends CanonicalResource {
this.mode = (Enumeration) value; // Enumeration
} else if (name.equals("documentation")) {
this.documentation = TypeConvertor.castToMarkdown(value); // MarkdownType
+ } else if (name.equals("feature")) {
+ this.getFeature().add((CapabilityStatement2RestFeatureComponent) value);
} else if (name.equals("resource")) {
this.getResource().add((CapabilityStatement2RestResourceComponent) value);
} else if (name.equals("interaction")) {
@@ -1550,6 +2194,7 @@ public class CapabilityStatement2 extends CanonicalResource {
switch (hash) {
case 3357091: return getModeElement();
case 1587405498: return getDocumentationElement();
+ case -979207434: return addFeature();
case -341064690: return addResource();
case 1844104722: return addInteraction();
case -553645115: return addSearchParam();
@@ -1565,6 +2210,7 @@ public class CapabilityStatement2 extends CanonicalResource {
switch (hash) {
case 3357091: /*mode*/ return new String[] {"code"};
case 1587405498: /*documentation*/ return new String[] {"markdown"};
+ case -979207434: /*feature*/ return new String[] {};
case -341064690: /*resource*/ return new String[] {};
case 1844104722: /*interaction*/ return new String[] {};
case -553645115: /*searchParam*/ return new String[] {"@CapabilityStatement2.rest.resource.searchParam"};
@@ -1583,6 +2229,9 @@ public class CapabilityStatement2 extends CanonicalResource {
else if (name.equals("documentation")) {
throw new FHIRException("Cannot call addChild on a primitive type CapabilityStatement2.rest.documentation");
}
+ else if (name.equals("feature")) {
+ return addFeature();
+ }
else if (name.equals("resource")) {
return addResource();
}
@@ -1612,6 +2261,11 @@ public class CapabilityStatement2 extends CanonicalResource {
super.copyValues(dst);
dst.mode = mode == null ? null : mode.copy();
dst.documentation = documentation == null ? null : documentation.copy();
+ if (feature != null) {
+ dst.feature = new ArrayList();
+ for (CapabilityStatement2RestFeatureComponent i : feature)
+ dst.feature.add(i.copy());
+ };
if (resource != null) {
dst.resource = new ArrayList();
for (CapabilityStatement2RestResourceComponent i : resource)
@@ -1646,8 +2300,8 @@ public class CapabilityStatement2 extends CanonicalResource {
if (!(other_ instanceof CapabilityStatement2RestComponent))
return false;
CapabilityStatement2RestComponent o = (CapabilityStatement2RestComponent) other_;
- return compareDeep(mode, o.mode, true) && compareDeep(documentation, o.documentation, true) && compareDeep(resource, o.resource, true)
- && compareDeep(interaction, o.interaction, true) && compareDeep(searchParam, o.searchParam, true)
+ return compareDeep(mode, o.mode, true) && compareDeep(documentation, o.documentation, true) && compareDeep(feature, o.feature, true)
+ && compareDeep(resource, o.resource, true) && compareDeep(interaction, o.interaction, true) && compareDeep(searchParam, o.searchParam, true)
&& compareDeep(operation, o.operation, true) && compareDeep(compartment, o.compartment, true);
}
@@ -1663,8 +2317,8 @@ public class CapabilityStatement2 extends CanonicalResource {
}
public boolean isEmpty() {
- return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(mode, documentation, resource
- , interaction, searchParam, operation, compartment);
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(mode, documentation, feature
+ , resource, interaction, searchParam, operation, compartment);
}
public String fhirType() {
@@ -1672,6 +2326,262 @@ public class CapabilityStatement2 extends CanonicalResource {
}
+ }
+
+ @Block()
+ public static class CapabilityStatement2RestFeatureComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * A code that describes the feature being reported on.
+ */
+ @Child(name = "code", type = {CodeType.class}, order=1, min=1, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Feature that is being reported", formalDefinition="A code that describes the feature being reported on." )
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/capability-feature")
+ protected Enumeration code;
+
+ /**
+ * A value for the feature - maybe true, false, or one of the set of codes allowed in the definition of the feature code.
+ */
+ @Child(name = "value", type = {CodeType.class}, order=2, min=1, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Value of the feature (true, false, or a code)", formalDefinition="A value for the feature - maybe true, false, or one of the set of codes allowed in the definition of the feature code." )
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/capability-feature-value")
+ protected Enumeration value;
+
+ private static final long serialVersionUID = 782619829L;
+
+ /**
+ * Constructor
+ */
+ public CapabilityStatement2RestFeatureComponent() {
+ super();
+ }
+
+ /**
+ * Constructor
+ */
+ public CapabilityStatement2RestFeatureComponent(CapabilityFeature code, CapabilityFeatureValue value) {
+ super();
+ this.setCode(code);
+ this.setValue(value);
+ }
+
+ /**
+ * @return {@link #code} (A code that describes the feature being reported on.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value
+ */
+ public Enumeration getCodeElement() {
+ if (this.code == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CapabilityStatement2RestFeatureComponent.code");
+ else if (Configuration.doAutoCreate())
+ this.code = new Enumeration(new CapabilityFeatureEnumFactory()); // bb
+ return this.code;
+ }
+
+ public boolean hasCodeElement() {
+ return this.code != null && !this.code.isEmpty();
+ }
+
+ public boolean hasCode() {
+ return this.code != null && !this.code.isEmpty();
+ }
+
+ /**
+ * @param value {@link #code} (A code that describes the feature being reported on.). This is the underlying object with id, value and extensions. The accessor "getCode" gives direct access to the value
+ */
+ public CapabilityStatement2RestFeatureComponent setCodeElement(Enumeration value) {
+ this.code = value;
+ return this;
+ }
+
+ /**
+ * @return A code that describes the feature being reported on.
+ */
+ public CapabilityFeature getCode() {
+ return this.code == null ? null : this.code.getValue();
+ }
+
+ /**
+ * @param value A code that describes the feature being reported on.
+ */
+ public CapabilityStatement2RestFeatureComponent setCode(CapabilityFeature value) {
+ if (this.code == null)
+ this.code = new Enumeration(new CapabilityFeatureEnumFactory());
+ this.code.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #value} (A value for the feature - maybe true, false, or one of the set of codes allowed in the definition of the feature code.). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
+ */
+ public Enumeration getValueElement() {
+ if (this.value == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create CapabilityStatement2RestFeatureComponent.value");
+ else if (Configuration.doAutoCreate())
+ this.value = new Enumeration(new CapabilityFeatureValueEnumFactory()); // bb
+ return this.value;
+ }
+
+ public boolean hasValueElement() {
+ return this.value != null && !this.value.isEmpty();
+ }
+
+ public boolean hasValue() {
+ return this.value != null && !this.value.isEmpty();
+ }
+
+ /**
+ * @param value {@link #value} (A value for the feature - maybe true, false, or one of the set of codes allowed in the definition of the feature code.). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
+ */
+ public CapabilityStatement2RestFeatureComponent setValueElement(Enumeration value) {
+ this.value = value;
+ return this;
+ }
+
+ /**
+ * @return A value for the feature - maybe true, false, or one of the set of codes allowed in the definition of the feature code.
+ */
+ public CapabilityFeatureValue getValue() {
+ return this.value == null ? null : this.value.getValue();
+ }
+
+ /**
+ * @param value A value for the feature - maybe true, false, or one of the set of codes allowed in the definition of the feature code.
+ */
+ public CapabilityStatement2RestFeatureComponent setValue(CapabilityFeatureValue value) {
+ if (this.value == null)
+ this.value = new Enumeration(new CapabilityFeatureValueEnumFactory());
+ this.value.setValue(value);
+ return this;
+ }
+
+ protected void listChildren(List children) {
+ super.listChildren(children);
+ children.add(new Property("code", "code", "A code that describes the feature being reported on.", 0, 1, code));
+ children.add(new Property("value", "code", "A value for the feature - maybe true, false, or one of the set of codes allowed in the definition of the feature code.", 0, 1, value));
+ }
+
+ @Override
+ public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
+ switch (_hash) {
+ case 3059181: /*code*/ return new Property("code", "code", "A code that describes the feature being reported on.", 0, 1, code);
+ case 111972721: /*value*/ return new Property("value", "code", "A value for the feature - maybe true, false, or one of the set of codes allowed in the definition of the feature code.", 0, 1, value);
+ default: return super.getNamedProperty(_hash, _name, _checkValid);
+ }
+
+ }
+
+ @Override
+ public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
+ switch (hash) {
+ case 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // Enumeration
+ case 111972721: /*value*/ return this.value == null ? new Base[0] : new Base[] {this.value}; // Enumeration
+ default: return super.getProperty(hash, name, checkValid);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(int hash, String name, Base value) throws FHIRException {
+ switch (hash) {
+ case 3059181: // code
+ value = new CapabilityFeatureEnumFactory().fromType(TypeConvertor.castToCode(value));
+ this.code = (Enumeration) value; // Enumeration
+ return value;
+ case 111972721: // value
+ value = new CapabilityFeatureValueEnumFactory().fromType(TypeConvertor.castToCode(value));
+ this.value = (Enumeration) value; // Enumeration
+ return value;
+ default: return super.setProperty(hash, name, value);
+ }
+
+ }
+
+ @Override
+ public Base setProperty(String name, Base value) throws FHIRException {
+ if (name.equals("code")) {
+ value = new CapabilityFeatureEnumFactory().fromType(TypeConvertor.castToCode(value));
+ this.code = (Enumeration) value; // Enumeration
+ } else if (name.equals("value")) {
+ value = new CapabilityFeatureValueEnumFactory().fromType(TypeConvertor.castToCode(value));
+ this.value = (Enumeration) value; // Enumeration
+ } else
+ return super.setProperty(name, value);
+ return value;
+ }
+
+ @Override
+ public Base makeProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 3059181: return getCodeElement();
+ case 111972721: return getValueElement();
+ default: return super.makeProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public String[] getTypesForProperty(int hash, String name) throws FHIRException {
+ switch (hash) {
+ case 3059181: /*code*/ return new String[] {"code"};
+ case 111972721: /*value*/ return new String[] {"code"};
+ default: return super.getTypesForProperty(hash, name);
+ }
+
+ }
+
+ @Override
+ public Base addChild(String name) throws FHIRException {
+ if (name.equals("code")) {
+ throw new FHIRException("Cannot call addChild on a primitive type CapabilityStatement2.rest.feature.code");
+ }
+ else if (name.equals("value")) {
+ throw new FHIRException("Cannot call addChild on a primitive type CapabilityStatement2.rest.feature.value");
+ }
+ else
+ return super.addChild(name);
+ }
+
+ public CapabilityStatement2RestFeatureComponent copy() {
+ CapabilityStatement2RestFeatureComponent dst = new CapabilityStatement2RestFeatureComponent();
+ copyValues(dst);
+ return dst;
+ }
+
+ public void copyValues(CapabilityStatement2RestFeatureComponent dst) {
+ super.copyValues(dst);
+ dst.code = code == null ? null : code.copy();
+ dst.value = value == null ? null : value.copy();
+ }
+
+ @Override
+ public boolean equalsDeep(Base other_) {
+ if (!super.equalsDeep(other_))
+ return false;
+ if (!(other_ instanceof CapabilityStatement2RestFeatureComponent))
+ return false;
+ CapabilityStatement2RestFeatureComponent o = (CapabilityStatement2RestFeatureComponent) other_;
+ return compareDeep(code, o.code, true) && compareDeep(value, o.value, true);
+ }
+
+ @Override
+ public boolean equalsShallow(Base other_) {
+ if (!super.equalsShallow(other_))
+ return false;
+ if (!(other_ instanceof CapabilityStatement2RestFeatureComponent))
+ return false;
+ CapabilityStatement2RestFeatureComponent o = (CapabilityStatement2RestFeatureComponent) other_;
+ return compareValues(code, o.code, true) && compareValues(value, o.value, true);
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(code, value);
+ }
+
+ public String fhirType() {
+ return "CapabilityStatement2.rest.feature";
+
+ }
+
}
@Block()
@@ -1705,28 +2615,35 @@ public class CapabilityStatement2 extends CanonicalResource {
@Description(shortDefinition="Additional information about the use of the resource type", formalDefinition="Additional information about the resource type used by the system." )
protected MarkdownType documentation;
+ /**
+ * A statement that affirms support for a feature, in this context.
+ */
+ @Child(name = "feature", type = {CapabilityStatement2RestFeatureComponent.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Statement of support for a feature in this context", formalDefinition="A statement that affirms support for a feature, in this context." )
+ protected List feature;
+
/**
* Identifies a restful operation supported by the solution.
*/
- @Child(name = "interaction", type = {}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "interaction", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="What operations are supported?", formalDefinition="Identifies a restful operation supported by the solution." )
protected List interaction;
/**
* Search parameters for implementations to support and/or make use of - either references to ones defined in the specification, or additional ones defined for/by the implementation.
*/
- @Child(name = "searchParam", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Child(name = "searchParam", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
@Description(shortDefinition="Search parameters supported by implementation", formalDefinition="Search parameters for implementations to support and/or make use of - either references to ones defined in the specification, or additional ones defined for/by the implementation." )
protected List searchParam;
/**
* Definition of an operation or a named query together with its parameters and their meaning and type. Consult the definition of the operation for details about how to invoke the operation, and the parameters.
*/
- @Child(name = "operation", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
+ @Child(name = "operation", type = {}, order=8, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true)
@Description(shortDefinition="Definition of a resource operation", formalDefinition="Definition of an operation or a named query together with its parameters and their meaning and type. Consult the definition of the operation for details about how to invoke the operation, and the parameters." )
protected List operation;
- private static final long serialVersionUID = 1394978037L;
+ private static final long serialVersionUID = -815167785L;
/**
* Constructor
@@ -1947,6 +2864,59 @@ public class CapabilityStatement2 extends CanonicalResource {
return this;
}
+ /**
+ * @return {@link #feature} (A statement that affirms support for a feature, in this context.)
+ */
+ public List getFeature() {
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ return this.feature;
+ }
+
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public CapabilityStatement2RestResourceComponent setFeature(List theFeature) {
+ this.feature = theFeature;
+ return this;
+ }
+
+ public boolean hasFeature() {
+ if (this.feature == null)
+ return false;
+ for (CapabilityStatement2RestFeatureComponent item : this.feature)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public CapabilityStatement2RestFeatureComponent addFeature() { //3
+ CapabilityStatement2RestFeatureComponent t = new CapabilityStatement2RestFeatureComponent();
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ this.feature.add(t);
+ return t;
+ }
+
+ public CapabilityStatement2RestResourceComponent addFeature(CapabilityStatement2RestFeatureComponent t) { //3
+ if (t == null)
+ return this;
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ this.feature.add(t);
+ return this;
+ }
+
+ /**
+ * @return The first repetition of repeating field {@link #feature}, creating it if it does not already exist {3}
+ */
+ public CapabilityStatement2RestFeatureComponent getFeatureFirstRep() {
+ if (getFeature().isEmpty()) {
+ addFeature();
+ }
+ return getFeature().get(0);
+ }
+
/**
* @return {@link #interaction} (Identifies a restful operation supported by the solution.)
*/
@@ -2112,6 +3082,7 @@ public class CapabilityStatement2 extends CanonicalResource {
children.add(new Property("profile", "canonical(StructureDefinition)", "A specification of the profile that describes the solution's overall support for the resource, including any constraints on cardinality, bindings, lengths or other limitations. See further discussion in [Using Profiles](profiling.html#profile-uses).", 0, 1, profile));
children.add(new Property("supportedProfile", "canonical(StructureDefinition)", "A list of profiles that represent different use cases supported by the system. For a server, \"supported by the system\" means the system hosts/produces a set of resources that are conformant to a particular profile, and allows clients that use its services to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile. See further discussion in [Using Profiles](profiling.html#profile-uses).", 0, java.lang.Integer.MAX_VALUE, supportedProfile));
children.add(new Property("documentation", "markdown", "Additional information about the resource type used by the system.", 0, 1, documentation));
+ children.add(new Property("feature", "@CapabilityStatement2.rest.feature", "A statement that affirms support for a feature, in this context.", 0, java.lang.Integer.MAX_VALUE, feature));
children.add(new Property("interaction", "", "Identifies a restful operation supported by the solution.", 0, java.lang.Integer.MAX_VALUE, interaction));
children.add(new Property("searchParam", "", "Search parameters for implementations to support and/or make use of - either references to ones defined in the specification, or additional ones defined for/by the implementation.", 0, java.lang.Integer.MAX_VALUE, searchParam));
children.add(new Property("operation", "", "Definition of an operation or a named query together with its parameters and their meaning and type. Consult the definition of the operation for details about how to invoke the operation, and the parameters.", 0, java.lang.Integer.MAX_VALUE, operation));
@@ -2124,6 +3095,7 @@ public class CapabilityStatement2 extends CanonicalResource {
case -309425751: /*profile*/ return new Property("profile", "canonical(StructureDefinition)", "A specification of the profile that describes the solution's overall support for the resource, including any constraints on cardinality, bindings, lengths or other limitations. See further discussion in [Using Profiles](profiling.html#profile-uses).", 0, 1, profile);
case 1225477403: /*supportedProfile*/ return new Property("supportedProfile", "canonical(StructureDefinition)", "A list of profiles that represent different use cases supported by the system. For a server, \"supported by the system\" means the system hosts/produces a set of resources that are conformant to a particular profile, and allows clients that use its services to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile. See further discussion in [Using Profiles](profiling.html#profile-uses).", 0, java.lang.Integer.MAX_VALUE, supportedProfile);
case 1587405498: /*documentation*/ return new Property("documentation", "markdown", "Additional information about the resource type used by the system.", 0, 1, documentation);
+ case -979207434: /*feature*/ return new Property("feature", "@CapabilityStatement2.rest.feature", "A statement that affirms support for a feature, in this context.", 0, java.lang.Integer.MAX_VALUE, feature);
case 1844104722: /*interaction*/ return new Property("interaction", "", "Identifies a restful operation supported by the solution.", 0, java.lang.Integer.MAX_VALUE, interaction);
case -553645115: /*searchParam*/ return new Property("searchParam", "", "Search parameters for implementations to support and/or make use of - either references to ones defined in the specification, or additional ones defined for/by the implementation.", 0, java.lang.Integer.MAX_VALUE, searchParam);
case 1662702951: /*operation*/ return new Property("operation", "", "Definition of an operation or a named query together with its parameters and their meaning and type. Consult the definition of the operation for details about how to invoke the operation, and the parameters.", 0, java.lang.Integer.MAX_VALUE, operation);
@@ -2139,6 +3111,7 @@ public class CapabilityStatement2 extends CanonicalResource {
case -309425751: /*profile*/ return this.profile == null ? new Base[0] : new Base[] {this.profile}; // CanonicalType
case 1225477403: /*supportedProfile*/ return this.supportedProfile == null ? new Base[0] : this.supportedProfile.toArray(new Base[this.supportedProfile.size()]); // CanonicalType
case 1587405498: /*documentation*/ return this.documentation == null ? new Base[0] : new Base[] {this.documentation}; // MarkdownType
+ case -979207434: /*feature*/ return this.feature == null ? new Base[0] : this.feature.toArray(new Base[this.feature.size()]); // CapabilityStatement2RestFeatureComponent
case 1844104722: /*interaction*/ return this.interaction == null ? new Base[0] : this.interaction.toArray(new Base[this.interaction.size()]); // ResourceInteractionComponent
case -553645115: /*searchParam*/ return this.searchParam == null ? new Base[0] : this.searchParam.toArray(new Base[this.searchParam.size()]); // CapabilityStatement2RestResourceSearchParamComponent
case 1662702951: /*operation*/ return this.operation == null ? new Base[0] : this.operation.toArray(new Base[this.operation.size()]); // CapabilityStatement2RestResourceOperationComponent
@@ -2162,6 +3135,9 @@ public class CapabilityStatement2 extends CanonicalResource {
case 1587405498: // documentation
this.documentation = TypeConvertor.castToMarkdown(value); // MarkdownType
return value;
+ case -979207434: // feature
+ this.getFeature().add((CapabilityStatement2RestFeatureComponent) value); // CapabilityStatement2RestFeatureComponent
+ return value;
case 1844104722: // interaction
this.getInteraction().add((ResourceInteractionComponent) value); // ResourceInteractionComponent
return value;
@@ -2186,6 +3162,8 @@ public class CapabilityStatement2 extends CanonicalResource {
this.getSupportedProfile().add(TypeConvertor.castToCanonical(value));
} else if (name.equals("documentation")) {
this.documentation = TypeConvertor.castToMarkdown(value); // MarkdownType
+ } else if (name.equals("feature")) {
+ this.getFeature().add((CapabilityStatement2RestFeatureComponent) value);
} else if (name.equals("interaction")) {
this.getInteraction().add((ResourceInteractionComponent) value);
} else if (name.equals("searchParam")) {
@@ -2204,6 +3182,7 @@ public class CapabilityStatement2 extends CanonicalResource {
case -309425751: return getProfileElement();
case 1225477403: return addSupportedProfileElement();
case 1587405498: return getDocumentationElement();
+ case -979207434: return addFeature();
case 1844104722: return addInteraction();
case -553645115: return addSearchParam();
case 1662702951: return addOperation();
@@ -2219,6 +3198,7 @@ public class CapabilityStatement2 extends CanonicalResource {
case -309425751: /*profile*/ return new String[] {"canonical"};
case 1225477403: /*supportedProfile*/ return new String[] {"canonical"};
case 1587405498: /*documentation*/ return new String[] {"markdown"};
+ case -979207434: /*feature*/ return new String[] {"@CapabilityStatement2.rest.feature"};
case 1844104722: /*interaction*/ return new String[] {};
case -553645115: /*searchParam*/ return new String[] {};
case 1662702951: /*operation*/ return new String[] {};
@@ -2241,6 +3221,9 @@ public class CapabilityStatement2 extends CanonicalResource {
else if (name.equals("documentation")) {
throw new FHIRException("Cannot call addChild on a primitive type CapabilityStatement2.rest.resource.documentation");
}
+ else if (name.equals("feature")) {
+ return addFeature();
+ }
else if (name.equals("interaction")) {
return addInteraction();
}
@@ -2270,6 +3253,11 @@ public class CapabilityStatement2 extends CanonicalResource {
dst.supportedProfile.add(i.copy());
};
dst.documentation = documentation == null ? null : documentation.copy();
+ if (feature != null) {
+ dst.feature = new ArrayList();
+ for (CapabilityStatement2RestFeatureComponent i : feature)
+ dst.feature.add(i.copy());
+ };
if (interaction != null) {
dst.interaction = new ArrayList();
for (ResourceInteractionComponent i : interaction)
@@ -2295,7 +3283,7 @@ public class CapabilityStatement2 extends CanonicalResource {
return false;
CapabilityStatement2RestResourceComponent o = (CapabilityStatement2RestResourceComponent) other_;
return compareDeep(type, o.type, true) && compareDeep(profile, o.profile, true) && compareDeep(supportedProfile, o.supportedProfile, true)
- && compareDeep(documentation, o.documentation, true) && compareDeep(interaction, o.interaction, true)
+ && compareDeep(documentation, o.documentation, true) && compareDeep(feature, o.feature, true) && compareDeep(interaction, o.interaction, true)
&& compareDeep(searchParam, o.searchParam, true) && compareDeep(operation, o.operation, true);
}
@@ -2312,7 +3300,7 @@ public class CapabilityStatement2 extends CanonicalResource {
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(type, profile, supportedProfile
- , documentation, interaction, searchParam, operation);
+ , documentation, feature, interaction, searchParam, operation);
}
public String fhirType() {
@@ -2339,7 +3327,14 @@ public class CapabilityStatement2 extends CanonicalResource {
@Description(shortDefinition="Anything special about operation behavior", formalDefinition="Guidance specific to the implementation of this operation, such as 'delete is a logical delete' or 'updates are only allowed with version id' or 'creates permitted from pre-authorized certificates only'." )
protected MarkdownType documentation;
- private static final long serialVersionUID = 2128937796L;
+ /**
+ * A statement that affirms support for a feature, in this context.
+ */
+ @Child(name = "feature", type = {CapabilityStatement2RestFeatureComponent.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Statement of support for a feature in this context", formalDefinition="A statement that affirms support for a feature, in this context." )
+ protected List feature;
+
+ private static final long serialVersionUID = -543206334L;
/**
* Constructor
@@ -2450,10 +3445,64 @@ public class CapabilityStatement2 extends CanonicalResource {
return this;
}
+ /**
+ * @return {@link #feature} (A statement that affirms support for a feature, in this context.)
+ */
+ public List getFeature() {
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ return this.feature;
+ }
+
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public ResourceInteractionComponent setFeature(List theFeature) {
+ this.feature = theFeature;
+ return this;
+ }
+
+ public boolean hasFeature() {
+ if (this.feature == null)
+ return false;
+ for (CapabilityStatement2RestFeatureComponent item : this.feature)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public CapabilityStatement2RestFeatureComponent addFeature() { //3
+ CapabilityStatement2RestFeatureComponent t = new CapabilityStatement2RestFeatureComponent();
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ this.feature.add(t);
+ return t;
+ }
+
+ public ResourceInteractionComponent addFeature(CapabilityStatement2RestFeatureComponent t) { //3
+ if (t == null)
+ return this;
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ this.feature.add(t);
+ return this;
+ }
+
+ /**
+ * @return The first repetition of repeating field {@link #feature}, creating it if it does not already exist {3}
+ */
+ public CapabilityStatement2RestFeatureComponent getFeatureFirstRep() {
+ if (getFeature().isEmpty()) {
+ addFeature();
+ }
+ return getFeature().get(0);
+ }
+
protected void listChildren(List children) {
super.listChildren(children);
children.add(new Property("code", "code", "Coded identifier of the operation, supported by the system resource.", 0, 1, code));
children.add(new Property("documentation", "markdown", "Guidance specific to the implementation of this operation, such as 'delete is a logical delete' or 'updates are only allowed with version id' or 'creates permitted from pre-authorized certificates only'.", 0, 1, documentation));
+ children.add(new Property("feature", "@CapabilityStatement2.rest.feature", "A statement that affirms support for a feature, in this context.", 0, java.lang.Integer.MAX_VALUE, feature));
}
@Override
@@ -2461,6 +3510,7 @@ public class CapabilityStatement2 extends CanonicalResource {
switch (_hash) {
case 3059181: /*code*/ return new Property("code", "code", "Coded identifier of the operation, supported by the system resource.", 0, 1, code);
case 1587405498: /*documentation*/ return new Property("documentation", "markdown", "Guidance specific to the implementation of this operation, such as 'delete is a logical delete' or 'updates are only allowed with version id' or 'creates permitted from pre-authorized certificates only'.", 0, 1, documentation);
+ case -979207434: /*feature*/ return new Property("feature", "@CapabilityStatement2.rest.feature", "A statement that affirms support for a feature, in this context.", 0, java.lang.Integer.MAX_VALUE, feature);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -2471,6 +3521,7 @@ public class CapabilityStatement2 extends CanonicalResource {
switch (hash) {
case 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // Enumeration
case 1587405498: /*documentation*/ return this.documentation == null ? new Base[0] : new Base[] {this.documentation}; // MarkdownType
+ case -979207434: /*feature*/ return this.feature == null ? new Base[0] : this.feature.toArray(new Base[this.feature.size()]); // CapabilityStatement2RestFeatureComponent
default: return super.getProperty(hash, name, checkValid);
}
@@ -2486,6 +3537,9 @@ public class CapabilityStatement2 extends CanonicalResource {
case 1587405498: // documentation
this.documentation = TypeConvertor.castToMarkdown(value); // MarkdownType
return value;
+ case -979207434: // feature
+ this.getFeature().add((CapabilityStatement2RestFeatureComponent) value); // CapabilityStatement2RestFeatureComponent
+ return value;
default: return super.setProperty(hash, name, value);
}
@@ -2498,6 +3552,8 @@ public class CapabilityStatement2 extends CanonicalResource {
this.code = (Enumeration) value; // Enumeration
} else if (name.equals("documentation")) {
this.documentation = TypeConvertor.castToMarkdown(value); // MarkdownType
+ } else if (name.equals("feature")) {
+ this.getFeature().add((CapabilityStatement2RestFeatureComponent) value);
} else
return super.setProperty(name, value);
return value;
@@ -2508,6 +3564,7 @@ public class CapabilityStatement2 extends CanonicalResource {
switch (hash) {
case 3059181: return getCodeElement();
case 1587405498: return getDocumentationElement();
+ case -979207434: return addFeature();
default: return super.makeProperty(hash, name);
}
@@ -2518,6 +3575,7 @@ public class CapabilityStatement2 extends CanonicalResource {
switch (hash) {
case 3059181: /*code*/ return new String[] {"code"};
case 1587405498: /*documentation*/ return new String[] {"markdown"};
+ case -979207434: /*feature*/ return new String[] {"@CapabilityStatement2.rest.feature"};
default: return super.getTypesForProperty(hash, name);
}
@@ -2531,6 +3589,9 @@ public class CapabilityStatement2 extends CanonicalResource {
else if (name.equals("documentation")) {
throw new FHIRException("Cannot call addChild on a primitive type CapabilityStatement2.rest.resource.interaction.documentation");
}
+ else if (name.equals("feature")) {
+ return addFeature();
+ }
else
return super.addChild(name);
}
@@ -2545,6 +3606,11 @@ public class CapabilityStatement2 extends CanonicalResource {
super.copyValues(dst);
dst.code = code == null ? null : code.copy();
dst.documentation = documentation == null ? null : documentation.copy();
+ if (feature != null) {
+ dst.feature = new ArrayList();
+ for (CapabilityStatement2RestFeatureComponent i : feature)
+ dst.feature.add(i.copy());
+ };
}
@Override
@@ -2554,7 +3620,8 @@ public class CapabilityStatement2 extends CanonicalResource {
if (!(other_ instanceof ResourceInteractionComponent))
return false;
ResourceInteractionComponent o = (ResourceInteractionComponent) other_;
- return compareDeep(code, o.code, true) && compareDeep(documentation, o.documentation, true);
+ return compareDeep(code, o.code, true) && compareDeep(documentation, o.documentation, true) && compareDeep(feature, o.feature, true)
+ ;
}
@Override
@@ -2568,7 +3635,8 @@ public class CapabilityStatement2 extends CanonicalResource {
}
public boolean isEmpty() {
- return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(code, documentation);
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(code, documentation, feature
+ );
}
public String fhirType() {
@@ -2609,7 +3677,14 @@ public class CapabilityStatement2 extends CanonicalResource {
@Description(shortDefinition="Server-specific usage", formalDefinition="This allows documentation of any distinct behaviors about how the search parameter is used. For example, text matching algorithms." )
protected MarkdownType documentation;
- private static final long serialVersionUID = -171123928L;
+ /**
+ * A statement that affirms support for a feature, in this context.
+ */
+ @Child(name = "feature", type = {CapabilityStatement2RestFeatureComponent.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Statement of support for a feature in this context", formalDefinition="A statement that affirms support for a feature, in this context." )
+ protected List feature;
+
+ private static final long serialVersionUID = -300448290L;
/**
* Constructor
@@ -2815,12 +3890,66 @@ public class CapabilityStatement2 extends CanonicalResource {
return this;
}
+ /**
+ * @return {@link #feature} (A statement that affirms support for a feature, in this context.)
+ */
+ public List getFeature() {
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ return this.feature;
+ }
+
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public CapabilityStatement2RestResourceSearchParamComponent setFeature(List theFeature) {
+ this.feature = theFeature;
+ return this;
+ }
+
+ public boolean hasFeature() {
+ if (this.feature == null)
+ return false;
+ for (CapabilityStatement2RestFeatureComponent item : this.feature)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public CapabilityStatement2RestFeatureComponent addFeature() { //3
+ CapabilityStatement2RestFeatureComponent t = new CapabilityStatement2RestFeatureComponent();
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ this.feature.add(t);
+ return t;
+ }
+
+ public CapabilityStatement2RestResourceSearchParamComponent addFeature(CapabilityStatement2RestFeatureComponent t) { //3
+ if (t == null)
+ return this;
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ this.feature.add(t);
+ return this;
+ }
+
+ /**
+ * @return The first repetition of repeating field {@link #feature}, creating it if it does not already exist {3}
+ */
+ public CapabilityStatement2RestFeatureComponent getFeatureFirstRep() {
+ if (getFeature().isEmpty()) {
+ addFeature();
+ }
+ return getFeature().get(0);
+ }
+
protected void listChildren(List children) {
super.listChildren(children);
children.add(new Property("name", "string", "The name of the search parameter used in the interface.", 0, 1, name));
children.add(new Property("definition", "canonical(SearchParameter)", "An absolute URI that is a formal reference to where this parameter was first defined, so that a client can be confident of the meaning of the search parameter (a reference to [SearchParameter.url](searchparameter-definitions.html#SearchParameter.url)). This element SHALL be populated if the search parameter refers to a SearchParameter defined by the FHIR core specification or externally defined IGs.", 0, 1, definition));
children.add(new Property("type", "code", "The type of value a search parameter refers to, and how the content is interpreted.", 0, 1, type));
children.add(new Property("documentation", "markdown", "This allows documentation of any distinct behaviors about how the search parameter is used. For example, text matching algorithms.", 0, 1, documentation));
+ children.add(new Property("feature", "@CapabilityStatement2.rest.feature", "A statement that affirms support for a feature, in this context.", 0, java.lang.Integer.MAX_VALUE, feature));
}
@Override
@@ -2830,6 +3959,7 @@ public class CapabilityStatement2 extends CanonicalResource {
case -1014418093: /*definition*/ return new Property("definition", "canonical(SearchParameter)", "An absolute URI that is a formal reference to where this parameter was first defined, so that a client can be confident of the meaning of the search parameter (a reference to [SearchParameter.url](searchparameter-definitions.html#SearchParameter.url)). This element SHALL be populated if the search parameter refers to a SearchParameter defined by the FHIR core specification or externally defined IGs.", 0, 1, definition);
case 3575610: /*type*/ return new Property("type", "code", "The type of value a search parameter refers to, and how the content is interpreted.", 0, 1, type);
case 1587405498: /*documentation*/ return new Property("documentation", "markdown", "This allows documentation of any distinct behaviors about how the search parameter is used. For example, text matching algorithms.", 0, 1, documentation);
+ case -979207434: /*feature*/ return new Property("feature", "@CapabilityStatement2.rest.feature", "A statement that affirms support for a feature, in this context.", 0, java.lang.Integer.MAX_VALUE, feature);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -2842,6 +3972,7 @@ public class CapabilityStatement2 extends CanonicalResource {
case -1014418093: /*definition*/ return this.definition == null ? new Base[0] : new Base[] {this.definition}; // CanonicalType
case 3575610: /*type*/ return this.type == null ? new Base[0] : new Base[] {this.type}; // Enumeration
case 1587405498: /*documentation*/ return this.documentation == null ? new Base[0] : new Base[] {this.documentation}; // MarkdownType
+ case -979207434: /*feature*/ return this.feature == null ? new Base[0] : this.feature.toArray(new Base[this.feature.size()]); // CapabilityStatement2RestFeatureComponent
default: return super.getProperty(hash, name, checkValid);
}
@@ -2863,6 +3994,9 @@ public class CapabilityStatement2 extends CanonicalResource {
case 1587405498: // documentation
this.documentation = TypeConvertor.castToMarkdown(value); // MarkdownType
return value;
+ case -979207434: // feature
+ this.getFeature().add((CapabilityStatement2RestFeatureComponent) value); // CapabilityStatement2RestFeatureComponent
+ return value;
default: return super.setProperty(hash, name, value);
}
@@ -2879,6 +4013,8 @@ public class CapabilityStatement2 extends CanonicalResource {
this.type = (Enumeration) value; // Enumeration
} else if (name.equals("documentation")) {
this.documentation = TypeConvertor.castToMarkdown(value); // MarkdownType
+ } else if (name.equals("feature")) {
+ this.getFeature().add((CapabilityStatement2RestFeatureComponent) value);
} else
return super.setProperty(name, value);
return value;
@@ -2891,6 +4027,7 @@ public class CapabilityStatement2 extends CanonicalResource {
case -1014418093: return getDefinitionElement();
case 3575610: return getTypeElement();
case 1587405498: return getDocumentationElement();
+ case -979207434: return addFeature();
default: return super.makeProperty(hash, name);
}
@@ -2903,6 +4040,7 @@ public class CapabilityStatement2 extends CanonicalResource {
case -1014418093: /*definition*/ return new String[] {"canonical"};
case 3575610: /*type*/ return new String[] {"code"};
case 1587405498: /*documentation*/ return new String[] {"markdown"};
+ case -979207434: /*feature*/ return new String[] {"@CapabilityStatement2.rest.feature"};
default: return super.getTypesForProperty(hash, name);
}
@@ -2922,6 +4060,9 @@ public class CapabilityStatement2 extends CanonicalResource {
else if (name.equals("documentation")) {
throw new FHIRException("Cannot call addChild on a primitive type CapabilityStatement2.rest.resource.searchParam.documentation");
}
+ else if (name.equals("feature")) {
+ return addFeature();
+ }
else
return super.addChild(name);
}
@@ -2938,6 +4079,11 @@ public class CapabilityStatement2 extends CanonicalResource {
dst.definition = definition == null ? null : definition.copy();
dst.type = type == null ? null : type.copy();
dst.documentation = documentation == null ? null : documentation.copy();
+ if (feature != null) {
+ dst.feature = new ArrayList();
+ for (CapabilityStatement2RestFeatureComponent i : feature)
+ dst.feature.add(i.copy());
+ };
}
@Override
@@ -2948,7 +4094,7 @@ public class CapabilityStatement2 extends CanonicalResource {
return false;
CapabilityStatement2RestResourceSearchParamComponent o = (CapabilityStatement2RestResourceSearchParamComponent) other_;
return compareDeep(name, o.name, true) && compareDeep(definition, o.definition, true) && compareDeep(type, o.type, true)
- && compareDeep(documentation, o.documentation, true);
+ && compareDeep(documentation, o.documentation, true) && compareDeep(feature, o.feature, true);
}
@Override
@@ -2964,7 +4110,7 @@ public class CapabilityStatement2 extends CanonicalResource {
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(name, definition, type, documentation
- );
+ , feature);
}
public String fhirType() {
@@ -2997,7 +4143,14 @@ public class CapabilityStatement2 extends CanonicalResource {
@Description(shortDefinition="Specific details about operation behavior", formalDefinition="Documentation that describes anything special about the operation behavior, possibly detailing different behavior for system, type and instance-level invocation of the operation." )
protected MarkdownType documentation;
- private static final long serialVersionUID = -388608084L;
+ /**
+ * A statement that affirms support for a feature, in this context.
+ */
+ @Child(name = "feature", type = {CapabilityStatement2RestFeatureComponent.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Statement of support for a feature in this context", formalDefinition="A statement that affirms support for a feature, in this context." )
+ protected List feature;
+
+ private static final long serialVersionUID = 1206974170L;
/**
* Constructor
@@ -3154,11 +4307,65 @@ public class CapabilityStatement2 extends CanonicalResource {
return this;
}
+ /**
+ * @return {@link #feature} (A statement that affirms support for a feature, in this context.)
+ */
+ public List getFeature() {
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ return this.feature;
+ }
+
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public CapabilityStatement2RestResourceOperationComponent setFeature(List theFeature) {
+ this.feature = theFeature;
+ return this;
+ }
+
+ public boolean hasFeature() {
+ if (this.feature == null)
+ return false;
+ for (CapabilityStatement2RestFeatureComponent item : this.feature)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public CapabilityStatement2RestFeatureComponent addFeature() { //3
+ CapabilityStatement2RestFeatureComponent t = new CapabilityStatement2RestFeatureComponent();
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ this.feature.add(t);
+ return t;
+ }
+
+ public CapabilityStatement2RestResourceOperationComponent addFeature(CapabilityStatement2RestFeatureComponent t) { //3
+ if (t == null)
+ return this;
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ this.feature.add(t);
+ return this;
+ }
+
+ /**
+ * @return The first repetition of repeating field {@link #feature}, creating it if it does not already exist {3}
+ */
+ public CapabilityStatement2RestFeatureComponent getFeatureFirstRep() {
+ if (getFeature().isEmpty()) {
+ addFeature();
+ }
+ return getFeature().get(0);
+ }
+
protected void listChildren(List children) {
super.listChildren(children);
children.add(new Property("name", "string", "The name of the operation or query. For an operation, this is the name prefixed with $ and used in the URL. For a query, this is the name used in the _query parameter when the query is called.", 0, 1, name));
children.add(new Property("definition", "canonical(OperationDefinition)", "Where the formal definition can be found. If a server references the base definition of an Operation (i.e. from the specification itself such as ```http://hl7.org/fhir/OperationDefinition/ValueSet-expand```), that means it supports the full capabilities of the operation - e.g. both GET and POST invocation. If it only supports a subset, it must define its own custom [OperationDefinition](operationdefinition.html#) with a 'base' of the original OperationDefinition. The custom definition would describe the specific subset of functionality supported.", 0, 1, definition));
children.add(new Property("documentation", "markdown", "Documentation that describes anything special about the operation behavior, possibly detailing different behavior for system, type and instance-level invocation of the operation.", 0, 1, documentation));
+ children.add(new Property("feature", "@CapabilityStatement2.rest.feature", "A statement that affirms support for a feature, in this context.", 0, java.lang.Integer.MAX_VALUE, feature));
}
@Override
@@ -3167,6 +4374,7 @@ public class CapabilityStatement2 extends CanonicalResource {
case 3373707: /*name*/ return new Property("name", "string", "The name of the operation or query. For an operation, this is the name prefixed with $ and used in the URL. For a query, this is the name used in the _query parameter when the query is called.", 0, 1, name);
case -1014418093: /*definition*/ return new Property("definition", "canonical(OperationDefinition)", "Where the formal definition can be found. If a server references the base definition of an Operation (i.e. from the specification itself such as ```http://hl7.org/fhir/OperationDefinition/ValueSet-expand```), that means it supports the full capabilities of the operation - e.g. both GET and POST invocation. If it only supports a subset, it must define its own custom [OperationDefinition](operationdefinition.html#) with a 'base' of the original OperationDefinition. The custom definition would describe the specific subset of functionality supported.", 0, 1, definition);
case 1587405498: /*documentation*/ return new Property("documentation", "markdown", "Documentation that describes anything special about the operation behavior, possibly detailing different behavior for system, type and instance-level invocation of the operation.", 0, 1, documentation);
+ case -979207434: /*feature*/ return new Property("feature", "@CapabilityStatement2.rest.feature", "A statement that affirms support for a feature, in this context.", 0, java.lang.Integer.MAX_VALUE, feature);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -3178,6 +4386,7 @@ public class CapabilityStatement2 extends CanonicalResource {
case 3373707: /*name*/ return this.name == null ? new Base[0] : new Base[] {this.name}; // StringType
case -1014418093: /*definition*/ return this.definition == null ? new Base[0] : new Base[] {this.definition}; // CanonicalType
case 1587405498: /*documentation*/ return this.documentation == null ? new Base[0] : new Base[] {this.documentation}; // MarkdownType
+ case -979207434: /*feature*/ return this.feature == null ? new Base[0] : this.feature.toArray(new Base[this.feature.size()]); // CapabilityStatement2RestFeatureComponent
default: return super.getProperty(hash, name, checkValid);
}
@@ -3195,6 +4404,9 @@ public class CapabilityStatement2 extends CanonicalResource {
case 1587405498: // documentation
this.documentation = TypeConvertor.castToMarkdown(value); // MarkdownType
return value;
+ case -979207434: // feature
+ this.getFeature().add((CapabilityStatement2RestFeatureComponent) value); // CapabilityStatement2RestFeatureComponent
+ return value;
default: return super.setProperty(hash, name, value);
}
@@ -3208,6 +4420,8 @@ public class CapabilityStatement2 extends CanonicalResource {
this.definition = TypeConvertor.castToCanonical(value); // CanonicalType
} else if (name.equals("documentation")) {
this.documentation = TypeConvertor.castToMarkdown(value); // MarkdownType
+ } else if (name.equals("feature")) {
+ this.getFeature().add((CapabilityStatement2RestFeatureComponent) value);
} else
return super.setProperty(name, value);
return value;
@@ -3219,6 +4433,7 @@ public class CapabilityStatement2 extends CanonicalResource {
case 3373707: return getNameElement();
case -1014418093: return getDefinitionElement();
case 1587405498: return getDocumentationElement();
+ case -979207434: return addFeature();
default: return super.makeProperty(hash, name);
}
@@ -3230,6 +4445,7 @@ public class CapabilityStatement2 extends CanonicalResource {
case 3373707: /*name*/ return new String[] {"string"};
case -1014418093: /*definition*/ return new String[] {"canonical"};
case 1587405498: /*documentation*/ return new String[] {"markdown"};
+ case -979207434: /*feature*/ return new String[] {"@CapabilityStatement2.rest.feature"};
default: return super.getTypesForProperty(hash, name);
}
@@ -3246,6 +4462,9 @@ public class CapabilityStatement2 extends CanonicalResource {
else if (name.equals("documentation")) {
throw new FHIRException("Cannot call addChild on a primitive type CapabilityStatement2.rest.resource.operation.documentation");
}
+ else if (name.equals("feature")) {
+ return addFeature();
+ }
else
return super.addChild(name);
}
@@ -3261,6 +4480,11 @@ public class CapabilityStatement2 extends CanonicalResource {
dst.name = name == null ? null : name.copy();
dst.definition = definition == null ? null : definition.copy();
dst.documentation = documentation == null ? null : documentation.copy();
+ if (feature != null) {
+ dst.feature = new ArrayList();
+ for (CapabilityStatement2RestFeatureComponent i : feature)
+ dst.feature.add(i.copy());
+ };
}
@Override
@@ -3271,7 +4495,7 @@ public class CapabilityStatement2 extends CanonicalResource {
return false;
CapabilityStatement2RestResourceOperationComponent o = (CapabilityStatement2RestResourceOperationComponent) other_;
return compareDeep(name, o.name, true) && compareDeep(definition, o.definition, true) && compareDeep(documentation, o.documentation, true)
- ;
+ && compareDeep(feature, o.feature, true);
}
@Override
@@ -3287,7 +4511,7 @@ public class CapabilityStatement2 extends CanonicalResource {
public boolean isEmpty() {
return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(name, definition, documentation
- );
+ , feature);
}
public String fhirType() {
@@ -3314,7 +4538,14 @@ public class CapabilityStatement2 extends CanonicalResource {
@Description(shortDefinition="Anything special about operation behavior", formalDefinition="Guidance specific to the implementation of this operation, such as limitations on the kind of transactions allowed, or information about system wide search is implemented." )
protected MarkdownType documentation;
- private static final long serialVersionUID = -1495143879L;
+ /**
+ * A statement that affirms support for a feature, in this context.
+ */
+ @Child(name = "feature", type = {CapabilityStatement2RestFeatureComponent.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Statement of support for a feature in this context", formalDefinition="A statement that affirms support for a feature, in this context." )
+ protected List feature;
+
+ private static final long serialVersionUID = 353704493L;
/**
* Constructor
@@ -3425,10 +4656,64 @@ public class CapabilityStatement2 extends CanonicalResource {
return this;
}
+ /**
+ * @return {@link #feature} (A statement that affirms support for a feature, in this context.)
+ */
+ public List getFeature() {
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ return this.feature;
+ }
+
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public SystemInteractionComponent setFeature(List theFeature) {
+ this.feature = theFeature;
+ return this;
+ }
+
+ public boolean hasFeature() {
+ if (this.feature == null)
+ return false;
+ for (CapabilityStatement2RestFeatureComponent item : this.feature)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ public CapabilityStatement2RestFeatureComponent addFeature() { //3
+ CapabilityStatement2RestFeatureComponent t = new CapabilityStatement2RestFeatureComponent();
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ this.feature.add(t);
+ return t;
+ }
+
+ public SystemInteractionComponent addFeature(CapabilityStatement2RestFeatureComponent t) { //3
+ if (t == null)
+ return this;
+ if (this.feature == null)
+ this.feature = new ArrayList();
+ this.feature.add(t);
+ return this;
+ }
+
+ /**
+ * @return The first repetition of repeating field {@link #feature}, creating it if it does not already exist {3}
+ */
+ public CapabilityStatement2RestFeatureComponent getFeatureFirstRep() {
+ if (getFeature().isEmpty()) {
+ addFeature();
+ }
+ return getFeature().get(0);
+ }
+
protected void listChildren(List children) {
super.listChildren(children);
children.add(new Property("code", "code", "A coded identifier of the operation, supported by the system.", 0, 1, code));
children.add(new Property("documentation", "markdown", "Guidance specific to the implementation of this operation, such as limitations on the kind of transactions allowed, or information about system wide search is implemented.", 0, 1, documentation));
+ children.add(new Property("feature", "@CapabilityStatement2.rest.feature", "A statement that affirms support for a feature, in this context.", 0, java.lang.Integer.MAX_VALUE, feature));
}
@Override
@@ -3436,6 +4721,7 @@ public class CapabilityStatement2 extends CanonicalResource {
switch (_hash) {
case 3059181: /*code*/ return new Property("code", "code", "A coded identifier of the operation, supported by the system.", 0, 1, code);
case 1587405498: /*documentation*/ return new Property("documentation", "markdown", "Guidance specific to the implementation of this operation, such as limitations on the kind of transactions allowed, or information about system wide search is implemented.", 0, 1, documentation);
+ case -979207434: /*feature*/ return new Property("feature", "@CapabilityStatement2.rest.feature", "A statement that affirms support for a feature, in this context.", 0, java.lang.Integer.MAX_VALUE, feature);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -3446,6 +4732,7 @@ public class CapabilityStatement2 extends CanonicalResource {
switch (hash) {
case 3059181: /*code*/ return this.code == null ? new Base[0] : new Base[] {this.code}; // Enumeration
case 1587405498: /*documentation*/ return this.documentation == null ? new Base[0] : new Base[] {this.documentation}; // MarkdownType
+ case -979207434: /*feature*/ return this.feature == null ? new Base[0] : this.feature.toArray(new Base[this.feature.size()]); // CapabilityStatement2RestFeatureComponent
default: return super.getProperty(hash, name, checkValid);
}
@@ -3461,6 +4748,9 @@ public class CapabilityStatement2 extends CanonicalResource {
case 1587405498: // documentation
this.documentation = TypeConvertor.castToMarkdown(value); // MarkdownType
return value;
+ case -979207434: // feature
+ this.getFeature().add((CapabilityStatement2RestFeatureComponent) value); // CapabilityStatement2RestFeatureComponent
+ return value;
default: return super.setProperty(hash, name, value);
}
@@ -3473,6 +4763,8 @@ public class CapabilityStatement2 extends CanonicalResource {
this.code = (Enumeration) value; // Enumeration
} else if (name.equals("documentation")) {
this.documentation = TypeConvertor.castToMarkdown(value); // MarkdownType
+ } else if (name.equals("feature")) {
+ this.getFeature().add((CapabilityStatement2RestFeatureComponent) value);
} else
return super.setProperty(name, value);
return value;
@@ -3483,6 +4775,7 @@ public class CapabilityStatement2 extends CanonicalResource {
switch (hash) {
case 3059181: return getCodeElement();
case 1587405498: return getDocumentationElement();
+ case -979207434: return addFeature();
default: return super.makeProperty(hash, name);
}
@@ -3493,6 +4786,7 @@ public class CapabilityStatement2 extends CanonicalResource {
switch (hash) {
case 3059181: /*code*/ return new String[] {"code"};
case 1587405498: /*documentation*/ return new String[] {"markdown"};
+ case -979207434: /*feature*/ return new String[] {"@CapabilityStatement2.rest.feature"};
default: return super.getTypesForProperty(hash, name);
}
@@ -3506,6 +4800,9 @@ public class CapabilityStatement2 extends CanonicalResource {
else if (name.equals("documentation")) {
throw new FHIRException("Cannot call addChild on a primitive type CapabilityStatement2.rest.interaction.documentation");
}
+ else if (name.equals("feature")) {
+ return addFeature();
+ }
else
return super.addChild(name);
}
@@ -3520,6 +4817,11 @@ public class CapabilityStatement2 extends CanonicalResource {
super.copyValues(dst);
dst.code = code == null ? null : code.copy();
dst.documentation = documentation == null ? null : documentation.copy();
+ if (feature != null) {
+ dst.feature = new ArrayList();
+ for (CapabilityStatement2RestFeatureComponent i : feature)
+ dst.feature.add(i.copy());
+ };
}
@Override
@@ -3529,7 +4831,8 @@ public class CapabilityStatement2 extends CanonicalResource {
if (!(other_ instanceof SystemInteractionComponent))
return false;
SystemInteractionComponent o = (SystemInteractionComponent) other_;
- return compareDeep(code, o.code, true) && compareDeep(documentation, o.documentation, true);
+ return compareDeep(code, o.code, true) && compareDeep(documentation, o.documentation, true) && compareDeep(feature, o.feature, true)
+ ;
}
@Override
@@ -3543,7 +4846,8 @@ public class CapabilityStatement2 extends CanonicalResource {
}
public boolean isEmpty() {
- return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(code, documentation);
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(code, documentation, feature
+ );
}
public String fhirType() {
@@ -5468,6 +6772,26 @@ public class CapabilityStatement2 extends CanonicalResource {
return ResourceType.CapabilityStatement2;
}
+ /**
+ * Search parameter: context
+ *
+ * Description: A use context assigned to the capability statement2
+ * Type: token
+ * Path: (CapabilityStatement2.useContext.value as CodeableConcept)
+ *
+ */
+ @SearchParamDefinition(name="context", path="(CapabilityStatement2.useContext.value as CodeableConcept)", description="A use context assigned to the capability statement2", type="token" )
+ public static final String SP_CONTEXT = "context";
+ /**
+ * Fluent Client search parameter constant for context
+ *
+ * Description: A use context assigned to the capability statement2
+ * Type: token
+ * Path: (CapabilityStatement2.useContext.value as CodeableConcept)
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT);
+
/**
* Search parameter: context-quantity
*
@@ -5488,46 +6812,6 @@ public class CapabilityStatement2 extends CanonicalResource {
*/
public static final ca.uhn.fhir.rest.gclient.QuantityClientParam CONTEXT_QUANTITY = new ca.uhn.fhir.rest.gclient.QuantityClientParam(SP_CONTEXT_QUANTITY);
- /**
- * Search parameter: context-type-quantity
- *
- * Description: A use context type and quantity- or range-based value assigned to the capability statement2
- * Type: composite
- * Path: CapabilityStatement2.useContext
- *
- */
- @SearchParamDefinition(name="context-type-quantity", path="CapabilityStatement2.useContext", description="A use context type and quantity- or range-based value assigned to the capability statement2", type="composite", compositeOf={"context-type", "context-quantity"} )
- public static final String SP_CONTEXT_TYPE_QUANTITY = "context-type-quantity";
- /**
- * Fluent Client search parameter constant for context-type-quantity
- *
- * Description: A use context type and quantity- or range-based value assigned to the capability statement2
- * Type: composite
- * Path: CapabilityStatement2.useContext
- *
- */
- public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_QUANTITY);
-
- /**
- * Search parameter: context-type-value
- *
- * Description: A use context type and value assigned to the capability statement2
- * Type: composite
- * Path: CapabilityStatement2.useContext
- *
- */
- @SearchParamDefinition(name="context-type-value", path="CapabilityStatement2.useContext", description="A use context type and value assigned to the capability statement2", type="composite", compositeOf={"context-type", "context"} )
- public static final String SP_CONTEXT_TYPE_VALUE = "context-type-value";
- /**
- * Fluent Client search parameter constant for context-type-value
- *
- * Description: A use context type and value assigned to the capability statement2
- * Type: composite
- * Path: CapabilityStatement2.useContext
- *
- */
- public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_VALUE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_VALUE);
-
/**
* Search parameter: context-type
*
@@ -5548,26 +6832,6 @@ public class CapabilityStatement2 extends CanonicalResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT_TYPE);
- /**
- * Search parameter: context
- *
- * Description: A use context assigned to the capability statement2
- * Type: token
- * Path: (CapabilityStatement2.useContext.value as CodeableConcept)
- *
- */
- @SearchParamDefinition(name="context", path="(CapabilityStatement2.useContext.value as CodeableConcept)", description="A use context assigned to the capability statement2", type="token" )
- public static final String SP_CONTEXT = "context";
- /**
- * Fluent Client search parameter constant for context
- *
- * Description: A use context assigned to the capability statement2
- * Type: token
- * Path: (CapabilityStatement2.useContext.value as CodeableConcept)
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT);
-
/**
* Search parameter: date
*
@@ -5754,6 +7018,26 @@ public class CapabilityStatement2 extends CanonicalResource {
*/
public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER);
+ /**
+ * Search parameter: resource
+ *
+ * Description: Name of a resource mentioned in a capability statement
+ * Type: token
+ * Path: CapabilityStatement2.rest.resource.type
+ *
+ */
+ @SearchParamDefinition(name="resource", path="CapabilityStatement2.rest.resource.type", description="Name of a resource mentioned in a capability statement", type="token" )
+ public static final String SP_RESOURCE = "resource";
+ /**
+ * Fluent Client search parameter constant for resource
+ *
+ * Description: Name of a resource mentioned in a capability statement
+ * Type: token
+ * Path: CapabilityStatement2.rest.resource.type
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam RESOURCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RESOURCE);
+
/**
* Search parameter: resource-profile
*
@@ -5780,26 +7064,6 @@ public class CapabilityStatement2 extends CanonicalResource {
*/
public static final ca.uhn.fhir.model.api.Include INCLUDE_RESOURCE_PROFILE = new ca.uhn.fhir.model.api.Include("CapabilityStatement2:resource-profile").toLocked();
- /**
- * Search parameter: resource
- *
- * Description: Name of a resource mentioned in a capability statement
- * Type: token
- * Path: CapabilityStatement2.rest.resource.type
- *
- */
- @SearchParamDefinition(name="resource", path="CapabilityStatement2.rest.resource.type", description="Name of a resource mentioned in a capability statement", type="token" )
- public static final String SP_RESOURCE = "resource";
- /**
- * Fluent Client search parameter constant for resource
- *
- * Description: Name of a resource mentioned in a capability statement
- * Type: token
- * Path: CapabilityStatement2.rest.resource.type
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam RESOURCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RESOURCE);
-
/**
* Search parameter: software
*
@@ -5926,6 +7190,46 @@ public class CapabilityStatement2 extends CanonicalResource {
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
+ /**
+ * Search parameter: context-type-quantity
+ *
+ * Description: A use context type and quantity- or range-based value assigned to the capability statement2
+ * Type: composite
+ * Path: CapabilityStatement2.useContext
+ *
+ */
+ @SearchParamDefinition(name="context-type-quantity", path="CapabilityStatement2.useContext", description="A use context type and quantity- or range-based value assigned to the capability statement2", type="composite", compositeOf={"context-type", "context-quantity"} )
+ public static final String SP_CONTEXT_TYPE_QUANTITY = "context-type-quantity";
+ /**
+ * Fluent Client search parameter constant for context-type-quantity
+ *
+ * Description: A use context type and quantity- or range-based value assigned to the capability statement2
+ * Type: composite
+ * Path: CapabilityStatement2.useContext
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_QUANTITY = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_QUANTITY);
+
+ /**
+ * Search parameter: context-type-value
+ *
+ * Description: A use context type and value assigned to the capability statement2
+ * Type: composite
+ * Path: CapabilityStatement2.useContext
+ *
+ */
+ @SearchParamDefinition(name="context-type-value", path="CapabilityStatement2.useContext", description="A use context type and value assigned to the capability statement2", type="composite", compositeOf={"context-type", "context"} )
+ public static final String SP_CONTEXT_TYPE_VALUE = "context-type-value";
+ /**
+ * Fluent Client search parameter constant for context-type-value
+ *
+ * Description: A use context type and value assigned to the capability statement2
+ * Type: composite
+ * Path: CapabilityStatement2.useContext
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.CompositeClientParam CONTEXT_TYPE_VALUE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_CONTEXT_TYPE_VALUE);
+
}
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CarePlan.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CarePlan.java
index 5991fb810..51389b275 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CarePlan.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CarePlan.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -124,7 +124,6 @@ public class CarePlan extends DomainResource {
case TASK: return "Task";
case SERVICEREQUEST: return "ServiceRequest";
case VISIONPRESCRIPTION: return "VisionPrescription";
- case NULL: return null;
default: return "?";
}
}
@@ -138,7 +137,6 @@ public class CarePlan extends DomainResource {
case TASK: return "http://hl7.org/fhir/resource-types";
case SERVICEREQUEST: return "http://hl7.org/fhir/resource-types";
case VISIONPRESCRIPTION: return "http://hl7.org/fhir/resource-types";
- case NULL: return null;
default: return "?";
}
}
@@ -152,7 +150,6 @@ public class CarePlan extends DomainResource {
case TASK: return "A task to be performed.";
case SERVICEREQUEST: return "A record of a request for service such as diagnostic investigations, treatments, or operations to be performed.";
case VISIONPRESCRIPTION: return "An authorization for the provision of glasses and/or contact lenses to a patient.";
- case NULL: return null;
default: return "?";
}
}
@@ -166,7 +163,6 @@ public class CarePlan extends DomainResource {
case TASK: return "Task";
case SERVICEREQUEST: return "ServiceRequest";
case VISIONPRESCRIPTION: return "VisionPrescription";
- case NULL: return null;
default: return "?";
}
}
@@ -323,7 +319,6 @@ public class CarePlan extends DomainResource {
case STOPPED: return "stopped";
case UNKNOWN: return "unknown";
case ENTEREDINERROR: return "entered-in-error";
- case NULL: return null;
default: return "?";
}
}
@@ -338,7 +333,6 @@ public class CarePlan extends DomainResource {
case STOPPED: return "http://hl7.org/fhir/care-plan-activity-status";
case UNKNOWN: return "http://hl7.org/fhir/care-plan-activity-status";
case ENTEREDINERROR: return "http://hl7.org/fhir/care-plan-activity-status";
- case NULL: return null;
default: return "?";
}
}
@@ -353,7 +347,6 @@ public class CarePlan extends DomainResource {
case STOPPED: return "The planned care plan activity has been ended prior to completion after the activity was started.";
case UNKNOWN: return "The current state of the care plan activity is not known. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, but the authoring/source system does not know which one.";
case ENTEREDINERROR: return "Care plan activity was entered in error and voided.";
- case NULL: return null;
default: return "?";
}
}
@@ -368,7 +361,6 @@ public class CarePlan extends DomainResource {
case STOPPED: return "Stopped";
case UNKNOWN: return "Unknown";
case ENTEREDINERROR: return "Entered in Error";
- case NULL: return null;
default: return "?";
}
}
@@ -503,7 +495,6 @@ public class CarePlan extends DomainResource {
case ORDER: return "order";
case OPTION: return "option";
case DIRECTIVE: return "directive";
- case NULL: return null;
default: return "?";
}
}
@@ -514,7 +505,6 @@ public class CarePlan extends DomainResource {
case ORDER: return "http://hl7.org/fhir/request-intent";
case OPTION: return "http://hl7.org/fhir/request-intent";
case DIRECTIVE: return "http://hl7.org/fhir/request-intent";
- case NULL: return null;
default: return "?";
}
}
@@ -525,7 +515,6 @@ public class CarePlan extends DomainResource {
case ORDER: return "The request represents a request/demand and authorization for action by a Practitioner.";
case OPTION: return "The request represents a component or option for a RequestGroup that establishes timing, conditionality and/or other constraints among a set of requests. Refer to [[[RequestGroup]]] for additional information on how this status is used.";
case DIRECTIVE: return "The request represents a legally binding instruction authored by a Patient or RelatedPerson.";
- case NULL: return null;
default: return "?";
}
}
@@ -536,7 +525,6 @@ public class CarePlan extends DomainResource {
case ORDER: return "Order";
case OPTION: return "Option";
case DIRECTIVE: return "Directive";
- case NULL: return null;
default: return "?";
}
}
@@ -600,12 +588,12 @@ public class CarePlan extends DomainResource {
@Block()
public static class CarePlanActivityComponent extends BackboneElement implements IBaseBackboneElement {
/**
- * Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not). The reference to an "event" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource).
+ * Identifies the activity that was performed. For example, an activity could be patient education, exercise, or a medication administration. The reference to an "event" resource, such as Procedure or Encounter or Observation, represents the activity that was performed. The requested activity can be conveyed using CarePlan.activity.plannedActivityDetail OR using the CarePlan.activity.plannedActivityReference (a reference to a “request” resource).
*/
- @Child(name = "outcome", type = {CodeableReference.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
- @Description(shortDefinition="Results of the activity (concept, or Appointment, Encounter, Procedure, etc)", formalDefinition="Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not). The reference to an \"event\" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource)." )
- @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/care-plan-activity-outcome")
- protected List outcome;
+ @Child(name = "performedActivity", type = {CodeableReference.class}, order=1, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false)
+ @Description(shortDefinition="Results of the activity (concept, or Appointment, Encounter, Procedure, etc)", formalDefinition="Identifies the activity that was performed. For example, an activity could be patient education, exercise, or a medication administration. The reference to an \"event\" resource, such as Procedure or Encounter or Observation, represents the activity that was performed. The requested activity can be conveyed using CarePlan.activity.plannedActivityDetail OR using the CarePlan.activity.plannedActivityReference (a reference to a “request” resource)." )
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/care-plan-activity-performed")
+ protected List performedActivity;
/**
* Notes about the adherence/status/progress of the activity.
@@ -617,18 +605,18 @@ public class CarePlan extends DomainResource {
/**
* The details of the proposed activity represented in a specific resource.
*/
- @Child(name = "reference", type = {Appointment.class, CommunicationRequest.class, DeviceRequest.class, MedicationRequest.class, NutritionOrder.class, Task.class, ServiceRequest.class, VisionPrescription.class, RequestGroup.class, ImmunizationRecommendation.class}, order=3, min=0, max=1, modifier=false, summary=false)
- @Description(shortDefinition="Activity details defined in specific resource", formalDefinition="The details of the proposed activity represented in a specific resource." )
- protected Reference reference;
+ @Child(name = "plannedActivityReference", type = {Appointment.class, CommunicationRequest.class, DeviceRequest.class, MedicationRequest.class, NutritionOrder.class, Task.class, ServiceRequest.class, VisionPrescription.class, RequestGroup.class, ImmunizationRecommendation.class}, order=3, min=0, max=1, modifier=false, summary=false)
+ @Description(shortDefinition="Activity that is intended to be part of the care plan", formalDefinition="The details of the proposed activity represented in a specific resource." )
+ protected Reference plannedActivityReference;
/**
* A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc.
*/
- @Child(name = "detail", type = {}, order=4, min=0, max=1, modifier=false, summary=false)
+ @Child(name = "plannedActivityDetail", type = {}, order=4, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="In-line definition of activity", formalDefinition="A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc." )
- protected CarePlanActivityDetailComponent detail;
+ protected CarePlanActivityPlannedActivityDetailComponent plannedActivityDetail;
- private static final long serialVersionUID = -673901898L;
+ private static final long serialVersionUID = 1513409624L;
/**
* Constructor
@@ -638,56 +626,56 @@ public class CarePlan extends DomainResource {
}
/**
- * @return {@link #outcome} (Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not). The reference to an "event" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource).)
+ * @return {@link #performedActivity} (Identifies the activity that was performed. For example, an activity could be patient education, exercise, or a medication administration. The reference to an "event" resource, such as Procedure or Encounter or Observation, represents the activity that was performed. The requested activity can be conveyed using CarePlan.activity.plannedActivityDetail OR using the CarePlan.activity.plannedActivityReference (a reference to a “request” resource).)
*/
- public List getOutcome() {
- if (this.outcome == null)
- this.outcome = new ArrayList();
- return this.outcome;
+ public List getPerformedActivity() {
+ if (this.performedActivity == null)
+ this.performedActivity = new ArrayList();
+ return this.performedActivity;
}
/**
* @return Returns a reference to this
for easy method chaining
*/
- public CarePlanActivityComponent setOutcome(List theOutcome) {
- this.outcome = theOutcome;
+ public CarePlanActivityComponent setPerformedActivity(List thePerformedActivity) {
+ this.performedActivity = thePerformedActivity;
return this;
}
- public boolean hasOutcome() {
- if (this.outcome == null)
+ public boolean hasPerformedActivity() {
+ if (this.performedActivity == null)
return false;
- for (CodeableReference item : this.outcome)
+ for (CodeableReference item : this.performedActivity)
if (!item.isEmpty())
return true;
return false;
}
- public CodeableReference addOutcome() { //3
+ public CodeableReference addPerformedActivity() { //3
CodeableReference t = new CodeableReference();
- if (this.outcome == null)
- this.outcome = new ArrayList();
- this.outcome.add(t);
+ if (this.performedActivity == null)
+ this.performedActivity = new ArrayList();
+ this.performedActivity.add(t);
return t;
}
- public CarePlanActivityComponent addOutcome(CodeableReference t) { //3
+ public CarePlanActivityComponent addPerformedActivity(CodeableReference t) { //3
if (t == null)
return this;
- if (this.outcome == null)
- this.outcome = new ArrayList();
- this.outcome.add(t);
+ if (this.performedActivity == null)
+ this.performedActivity = new ArrayList();
+ this.performedActivity.add(t);
return this;
}
/**
- * @return The first repetition of repeating field {@link #outcome}, creating it if it does not already exist {3}
+ * @return The first repetition of repeating field {@link #performedActivity}, creating it if it does not already exist {3}
*/
- public CodeableReference getOutcomeFirstRep() {
- if (getOutcome().isEmpty()) {
- addOutcome();
+ public CodeableReference getPerformedActivityFirstRep() {
+ if (getPerformedActivity().isEmpty()) {
+ addPerformedActivity();
}
- return getOutcome().get(0);
+ return getPerformedActivity().get(0);
}
/**
@@ -744,68 +732,68 @@ public class CarePlan extends DomainResource {
}
/**
- * @return {@link #reference} (The details of the proposed activity represented in a specific resource.)
+ * @return {@link #plannedActivityReference} (The details of the proposed activity represented in a specific resource.)
*/
- public Reference getReference() {
- if (this.reference == null)
+ public Reference getPlannedActivityReference() {
+ if (this.plannedActivityReference == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CarePlanActivityComponent.reference");
+ throw new Error("Attempt to auto-create CarePlanActivityComponent.plannedActivityReference");
else if (Configuration.doAutoCreate())
- this.reference = new Reference(); // cc
- return this.reference;
+ this.plannedActivityReference = new Reference(); // cc
+ return this.plannedActivityReference;
}
- public boolean hasReference() {
- return this.reference != null && !this.reference.isEmpty();
+ public boolean hasPlannedActivityReference() {
+ return this.plannedActivityReference != null && !this.plannedActivityReference.isEmpty();
}
/**
- * @param value {@link #reference} (The details of the proposed activity represented in a specific resource.)
+ * @param value {@link #plannedActivityReference} (The details of the proposed activity represented in a specific resource.)
*/
- public CarePlanActivityComponent setReference(Reference value) {
- this.reference = value;
+ public CarePlanActivityComponent setPlannedActivityReference(Reference value) {
+ this.plannedActivityReference = value;
return this;
}
/**
- * @return {@link #detail} (A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc.)
+ * @return {@link #plannedActivityDetail} (A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc.)
*/
- public CarePlanActivityDetailComponent getDetail() {
- if (this.detail == null)
+ public CarePlanActivityPlannedActivityDetailComponent getPlannedActivityDetail() {
+ if (this.plannedActivityDetail == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CarePlanActivityComponent.detail");
+ throw new Error("Attempt to auto-create CarePlanActivityComponent.plannedActivityDetail");
else if (Configuration.doAutoCreate())
- this.detail = new CarePlanActivityDetailComponent(); // cc
- return this.detail;
+ this.plannedActivityDetail = new CarePlanActivityPlannedActivityDetailComponent(); // cc
+ return this.plannedActivityDetail;
}
- public boolean hasDetail() {
- return this.detail != null && !this.detail.isEmpty();
+ public boolean hasPlannedActivityDetail() {
+ return this.plannedActivityDetail != null && !this.plannedActivityDetail.isEmpty();
}
/**
- * @param value {@link #detail} (A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc.)
+ * @param value {@link #plannedActivityDetail} (A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc.)
*/
- public CarePlanActivityComponent setDetail(CarePlanActivityDetailComponent value) {
- this.detail = value;
+ public CarePlanActivityComponent setPlannedActivityDetail(CarePlanActivityPlannedActivityDetailComponent value) {
+ this.plannedActivityDetail = value;
return this;
}
protected void listChildren(List children) {
super.listChildren(children);
- children.add(new Property("outcome", "CodeableReference(Any)", "Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not). The reference to an \"event\" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource).", 0, java.lang.Integer.MAX_VALUE, outcome));
+ children.add(new Property("performedActivity", "CodeableReference(Any)", "Identifies the activity that was performed. For example, an activity could be patient education, exercise, or a medication administration. The reference to an \"event\" resource, such as Procedure or Encounter or Observation, represents the activity that was performed. The requested activity can be conveyed using CarePlan.activity.plannedActivityDetail OR using the CarePlan.activity.plannedActivityReference (a reference to a “request” resource).", 0, java.lang.Integer.MAX_VALUE, performedActivity));
children.add(new Property("progress", "Annotation", "Notes about the adherence/status/progress of the activity.", 0, java.lang.Integer.MAX_VALUE, progress));
- children.add(new Property("reference", "Reference(Appointment|CommunicationRequest|DeviceRequest|MedicationRequest|NutritionOrder|Task|ServiceRequest|VisionPrescription|RequestGroup|ImmunizationRecommendation)", "The details of the proposed activity represented in a specific resource.", 0, 1, reference));
- children.add(new Property("detail", "", "A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc.", 0, 1, detail));
+ children.add(new Property("plannedActivityReference", "Reference(Appointment|CommunicationRequest|DeviceRequest|MedicationRequest|NutritionOrder|Task|ServiceRequest|VisionPrescription|RequestGroup|ImmunizationRecommendation)", "The details of the proposed activity represented in a specific resource.", 0, 1, plannedActivityReference));
+ children.add(new Property("plannedActivityDetail", "", "A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc.", 0, 1, plannedActivityDetail));
}
@Override
public Property getNamedProperty(int _hash, String _name, boolean _checkValid) throws FHIRException {
switch (_hash) {
- case -1106507950: /*outcome*/ return new Property("outcome", "CodeableReference(Any)", "Identifies the outcome at the point when the status of the activity is assessed. For example, the outcome of an education activity could be patient understands (or not). The reference to an \"event\" resource, such as Procedure or Encounter or Observation, is the result/outcome of the activity itself. The activity can be conveyed using CarePlan.activity.detail OR using the CarePlan.activity.reference (a reference to a “request” resource).", 0, java.lang.Integer.MAX_VALUE, outcome);
+ case 1964521199: /*performedActivity*/ return new Property("performedActivity", "CodeableReference(Any)", "Identifies the activity that was performed. For example, an activity could be patient education, exercise, or a medication administration. The reference to an \"event\" resource, such as Procedure or Encounter or Observation, represents the activity that was performed. The requested activity can be conveyed using CarePlan.activity.plannedActivityDetail OR using the CarePlan.activity.plannedActivityReference (a reference to a “request” resource).", 0, java.lang.Integer.MAX_VALUE, performedActivity);
case -1001078227: /*progress*/ return new Property("progress", "Annotation", "Notes about the adherence/status/progress of the activity.", 0, java.lang.Integer.MAX_VALUE, progress);
- case -925155509: /*reference*/ return new Property("reference", "Reference(Appointment|CommunicationRequest|DeviceRequest|MedicationRequest|NutritionOrder|Task|ServiceRequest|VisionPrescription|RequestGroup|ImmunizationRecommendation)", "The details of the proposed activity represented in a specific resource.", 0, 1, reference);
- case -1335224239: /*detail*/ return new Property("detail", "", "A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc.", 0, 1, detail);
+ case -1114371176: /*plannedActivityReference*/ return new Property("plannedActivityReference", "Reference(Appointment|CommunicationRequest|DeviceRequest|MedicationRequest|NutritionOrder|Task|ServiceRequest|VisionPrescription|RequestGroup|ImmunizationRecommendation)", "The details of the proposed activity represented in a specific resource.", 0, 1, plannedActivityReference);
+ case 2072803108: /*plannedActivityDetail*/ return new Property("plannedActivityDetail", "", "A simple summary of a planned activity suitable for a general care plan system (e.g. form driven) that doesn't know about specific resources such as procedure etc.", 0, 1, plannedActivityDetail);
default: return super.getNamedProperty(_hash, _name, _checkValid);
}
@@ -814,10 +802,10 @@ public class CarePlan extends DomainResource {
@Override
public Base[] getProperty(int hash, String name, boolean checkValid) throws FHIRException {
switch (hash) {
- case -1106507950: /*outcome*/ return this.outcome == null ? new Base[0] : this.outcome.toArray(new Base[this.outcome.size()]); // CodeableReference
+ case 1964521199: /*performedActivity*/ return this.performedActivity == null ? new Base[0] : this.performedActivity.toArray(new Base[this.performedActivity.size()]); // CodeableReference
case -1001078227: /*progress*/ return this.progress == null ? new Base[0] : this.progress.toArray(new Base[this.progress.size()]); // Annotation
- case -925155509: /*reference*/ return this.reference == null ? new Base[0] : new Base[] {this.reference}; // Reference
- case -1335224239: /*detail*/ return this.detail == null ? new Base[0] : new Base[] {this.detail}; // CarePlanActivityDetailComponent
+ case -1114371176: /*plannedActivityReference*/ return this.plannedActivityReference == null ? new Base[0] : new Base[] {this.plannedActivityReference}; // Reference
+ case 2072803108: /*plannedActivityDetail*/ return this.plannedActivityDetail == null ? new Base[0] : new Base[] {this.plannedActivityDetail}; // CarePlanActivityPlannedActivityDetailComponent
default: return super.getProperty(hash, name, checkValid);
}
@@ -826,17 +814,17 @@ public class CarePlan extends DomainResource {
@Override
public Base setProperty(int hash, String name, Base value) throws FHIRException {
switch (hash) {
- case -1106507950: // outcome
- this.getOutcome().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference
+ case 1964521199: // performedActivity
+ this.getPerformedActivity().add(TypeConvertor.castToCodeableReference(value)); // CodeableReference
return value;
case -1001078227: // progress
this.getProgress().add(TypeConvertor.castToAnnotation(value)); // Annotation
return value;
- case -925155509: // reference
- this.reference = TypeConvertor.castToReference(value); // Reference
+ case -1114371176: // plannedActivityReference
+ this.plannedActivityReference = TypeConvertor.castToReference(value); // Reference
return value;
- case -1335224239: // detail
- this.detail = (CarePlanActivityDetailComponent) value; // CarePlanActivityDetailComponent
+ case 2072803108: // plannedActivityDetail
+ this.plannedActivityDetail = (CarePlanActivityPlannedActivityDetailComponent) value; // CarePlanActivityPlannedActivityDetailComponent
return value;
default: return super.setProperty(hash, name, value);
}
@@ -845,14 +833,14 @@ public class CarePlan extends DomainResource {
@Override
public Base setProperty(String name, Base value) throws FHIRException {
- if (name.equals("outcome")) {
- this.getOutcome().add(TypeConvertor.castToCodeableReference(value));
+ if (name.equals("performedActivity")) {
+ this.getPerformedActivity().add(TypeConvertor.castToCodeableReference(value));
} else if (name.equals("progress")) {
this.getProgress().add(TypeConvertor.castToAnnotation(value));
- } else if (name.equals("reference")) {
- this.reference = TypeConvertor.castToReference(value); // Reference
- } else if (name.equals("detail")) {
- this.detail = (CarePlanActivityDetailComponent) value; // CarePlanActivityDetailComponent
+ } else if (name.equals("plannedActivityReference")) {
+ this.plannedActivityReference = TypeConvertor.castToReference(value); // Reference
+ } else if (name.equals("plannedActivityDetail")) {
+ this.plannedActivityDetail = (CarePlanActivityPlannedActivityDetailComponent) value; // CarePlanActivityPlannedActivityDetailComponent
} else
return super.setProperty(name, value);
return value;
@@ -861,10 +849,10 @@ public class CarePlan extends DomainResource {
@Override
public Base makeProperty(int hash, String name) throws FHIRException {
switch (hash) {
- case -1106507950: return addOutcome();
+ case 1964521199: return addPerformedActivity();
case -1001078227: return addProgress();
- case -925155509: return getReference();
- case -1335224239: return getDetail();
+ case -1114371176: return getPlannedActivityReference();
+ case 2072803108: return getPlannedActivityDetail();
default: return super.makeProperty(hash, name);
}
@@ -873,10 +861,10 @@ public class CarePlan extends DomainResource {
@Override
public String[] getTypesForProperty(int hash, String name) throws FHIRException {
switch (hash) {
- case -1106507950: /*outcome*/ return new String[] {"CodeableReference"};
+ case 1964521199: /*performedActivity*/ return new String[] {"CodeableReference"};
case -1001078227: /*progress*/ return new String[] {"Annotation"};
- case -925155509: /*reference*/ return new String[] {"Reference"};
- case -1335224239: /*detail*/ return new String[] {};
+ case -1114371176: /*plannedActivityReference*/ return new String[] {"Reference"};
+ case 2072803108: /*plannedActivityDetail*/ return new String[] {};
default: return super.getTypesForProperty(hash, name);
}
@@ -884,19 +872,19 @@ public class CarePlan extends DomainResource {
@Override
public Base addChild(String name) throws FHIRException {
- if (name.equals("outcome")) {
- return addOutcome();
+ if (name.equals("performedActivity")) {
+ return addPerformedActivity();
}
else if (name.equals("progress")) {
return addProgress();
}
- else if (name.equals("reference")) {
- this.reference = new Reference();
- return this.reference;
+ else if (name.equals("plannedActivityReference")) {
+ this.plannedActivityReference = new Reference();
+ return this.plannedActivityReference;
}
- else if (name.equals("detail")) {
- this.detail = new CarePlanActivityDetailComponent();
- return this.detail;
+ else if (name.equals("plannedActivityDetail")) {
+ this.plannedActivityDetail = new CarePlanActivityPlannedActivityDetailComponent();
+ return this.plannedActivityDetail;
}
else
return super.addChild(name);
@@ -910,18 +898,18 @@ public class CarePlan extends DomainResource {
public void copyValues(CarePlanActivityComponent dst) {
super.copyValues(dst);
- if (outcome != null) {
- dst.outcome = new ArrayList();
- for (CodeableReference i : outcome)
- dst.outcome.add(i.copy());
+ if (performedActivity != null) {
+ dst.performedActivity = new ArrayList();
+ for (CodeableReference i : performedActivity)
+ dst.performedActivity.add(i.copy());
};
if (progress != null) {
dst.progress = new ArrayList();
for (Annotation i : progress)
dst.progress.add(i.copy());
};
- dst.reference = reference == null ? null : reference.copy();
- dst.detail = detail == null ? null : detail.copy();
+ dst.plannedActivityReference = plannedActivityReference == null ? null : plannedActivityReference.copy();
+ dst.plannedActivityDetail = plannedActivityDetail == null ? null : plannedActivityDetail.copy();
}
@Override
@@ -931,8 +919,9 @@ public class CarePlan extends DomainResource {
if (!(other_ instanceof CarePlanActivityComponent))
return false;
CarePlanActivityComponent o = (CarePlanActivityComponent) other_;
- return compareDeep(outcome, o.outcome, true) && compareDeep(progress, o.progress, true) && compareDeep(reference, o.reference, true)
- && compareDeep(detail, o.detail, true);
+ return compareDeep(performedActivity, o.performedActivity, true) && compareDeep(progress, o.progress, true)
+ && compareDeep(plannedActivityReference, o.plannedActivityReference, true) && compareDeep(plannedActivityDetail, o.plannedActivityDetail, true)
+ ;
}
@Override
@@ -946,8 +935,8 @@ public class CarePlan extends DomainResource {
}
public boolean isEmpty() {
- return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(outcome, progress, reference
- , detail);
+ return super.isEmpty() && ca.uhn.fhir.util.ElementUtil.isEmpty(performedActivity, progress
+ , plannedActivityReference, plannedActivityDetail);
}
public String fhirType() {
@@ -958,7 +947,7 @@ public class CarePlan extends DomainResource {
}
@Block()
- public static class CarePlanActivityDetailComponent extends BackboneElement implements IBaseBackboneElement {
+ public static class CarePlanActivityPlannedActivityDetailComponent extends BackboneElement implements IBaseBackboneElement {
/**
* A description of the kind of resource the in-line definition of a care plan activity is representing. The CarePlan.activity.detail is an in-line definition when a resource is not referenced using CarePlan.activity.reference. For example, a MedicationRequest, a ServiceRequest, or a CommunicationRequest.
*/
@@ -1090,14 +1079,14 @@ public class CarePlan extends DomainResource {
/**
* Constructor
*/
- public CarePlanActivityDetailComponent() {
+ public CarePlanActivityPlannedActivityDetailComponent() {
super();
}
/**
* Constructor
*/
- public CarePlanActivityDetailComponent(CarePlanActivityStatus status) {
+ public CarePlanActivityPlannedActivityDetailComponent(CarePlanActivityStatus status) {
super();
this.setStatus(status);
}
@@ -1108,7 +1097,7 @@ public class CarePlan extends DomainResource {
public Enumeration getKindElement() {
if (this.kind == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.kind");
+ throw new Error("Attempt to auto-create CarePlanActivityPlannedActivityDetailComponent.kind");
else if (Configuration.doAutoCreate())
this.kind = new Enumeration(new CarePlanActivityKindEnumFactory()); // bb
return this.kind;
@@ -1125,7 +1114,7 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #kind} (A description of the kind of resource the in-line definition of a care plan activity is representing. The CarePlan.activity.detail is an in-line definition when a resource is not referenced using CarePlan.activity.reference. For example, a MedicationRequest, a ServiceRequest, or a CommunicationRequest.). This is the underlying object with id, value and extensions. The accessor "getKind" gives direct access to the value
*/
- public CarePlanActivityDetailComponent setKindElement(Enumeration value) {
+ public CarePlanActivityPlannedActivityDetailComponent setKindElement(Enumeration value) {
this.kind = value;
return this;
}
@@ -1140,7 +1129,7 @@ public class CarePlan extends DomainResource {
/**
* @param value A description of the kind of resource the in-line definition of a care plan activity is representing. The CarePlan.activity.detail is an in-line definition when a resource is not referenced using CarePlan.activity.reference. For example, a MedicationRequest, a ServiceRequest, or a CommunicationRequest.
*/
- public CarePlanActivityDetailComponent setKind(CarePlanActivityKind value) {
+ public CarePlanActivityPlannedActivityDetailComponent setKind(CarePlanActivityKind value) {
if (value == null)
this.kind = null;
else {
@@ -1163,7 +1152,7 @@ public class CarePlan extends DomainResource {
/**
* @return Returns a reference to this
for easy method chaining
*/
- public CarePlanActivityDetailComponent setInstantiatesCanonical(List theInstantiatesCanonical) {
+ public CarePlanActivityPlannedActivityDetailComponent setInstantiatesCanonical(List theInstantiatesCanonical) {
this.instantiatesCanonical = theInstantiatesCanonical;
return this;
}
@@ -1191,7 +1180,7 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #instantiatesCanonical} (The URL pointing to a FHIR-defined protocol, guideline, questionnaire or other definition that is adhered to in whole or in part by this CarePlan activity.)
*/
- public CarePlanActivityDetailComponent addInstantiatesCanonical(String value) { //1
+ public CarePlanActivityPlannedActivityDetailComponent addInstantiatesCanonical(String value) { //1
CanonicalType t = new CanonicalType();
t.setValue(value);
if (this.instantiatesCanonical == null)
@@ -1224,7 +1213,7 @@ public class CarePlan extends DomainResource {
/**
* @return Returns a reference to this
for easy method chaining
*/
- public CarePlanActivityDetailComponent setInstantiatesUri(List theInstantiatesUri) {
+ public CarePlanActivityPlannedActivityDetailComponent setInstantiatesUri(List theInstantiatesUri) {
this.instantiatesUri = theInstantiatesUri;
return this;
}
@@ -1252,7 +1241,7 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #instantiatesUri} (The URL pointing to an externally maintained protocol, guideline, questionnaire or other definition that is adhered to in whole or in part by this CarePlan activity.)
*/
- public CarePlanActivityDetailComponent addInstantiatesUri(String value) { //1
+ public CarePlanActivityPlannedActivityDetailComponent addInstantiatesUri(String value) { //1
UriType t = new UriType();
t.setValue(value);
if (this.instantiatesUri == null)
@@ -1279,7 +1268,7 @@ public class CarePlan extends DomainResource {
public CodeableConcept getCode() {
if (this.code == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.code");
+ throw new Error("Attempt to auto-create CarePlanActivityPlannedActivityDetailComponent.code");
else if (Configuration.doAutoCreate())
this.code = new CodeableConcept(); // cc
return this.code;
@@ -1292,7 +1281,7 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #code} (Detailed description of the type of planned activity; e.g. what lab test, what procedure, what kind of encounter.)
*/
- public CarePlanActivityDetailComponent setCode(CodeableConcept value) {
+ public CarePlanActivityPlannedActivityDetailComponent setCode(CodeableConcept value) {
this.code = value;
return this;
}
@@ -1309,7 +1298,7 @@ public class CarePlan extends DomainResource {
/**
* @return Returns a reference to this
for easy method chaining
*/
- public CarePlanActivityDetailComponent setReason(List theReason) {
+ public CarePlanActivityPlannedActivityDetailComponent setReason(List theReason) {
this.reason = theReason;
return this;
}
@@ -1331,7 +1320,7 @@ public class CarePlan extends DomainResource {
return t;
}
- public CarePlanActivityDetailComponent addReason(CodeableReference t) { //3
+ public CarePlanActivityPlannedActivityDetailComponent addReason(CodeableReference t) { //3
if (t == null)
return this;
if (this.reason == null)
@@ -1362,7 +1351,7 @@ public class CarePlan extends DomainResource {
/**
* @return Returns a reference to this
for easy method chaining
*/
- public CarePlanActivityDetailComponent setGoal(List theGoal) {
+ public CarePlanActivityPlannedActivityDetailComponent setGoal(List theGoal) {
this.goal = theGoal;
return this;
}
@@ -1384,7 +1373,7 @@ public class CarePlan extends DomainResource {
return t;
}
- public CarePlanActivityDetailComponent addGoal(Reference t) { //3
+ public CarePlanActivityPlannedActivityDetailComponent addGoal(Reference t) { //3
if (t == null)
return this;
if (this.goal == null)
@@ -1409,7 +1398,7 @@ public class CarePlan extends DomainResource {
public Enumeration getStatusElement() {
if (this.status == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.status");
+ throw new Error("Attempt to auto-create CarePlanActivityPlannedActivityDetailComponent.status");
else if (Configuration.doAutoCreate())
this.status = new Enumeration(new CarePlanActivityStatusEnumFactory()); // bb
return this.status;
@@ -1426,7 +1415,7 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #status} (Identifies what progress is being made for the specific activity.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
*/
- public CarePlanActivityDetailComponent setStatusElement(Enumeration value) {
+ public CarePlanActivityPlannedActivityDetailComponent setStatusElement(Enumeration value) {
this.status = value;
return this;
}
@@ -1441,7 +1430,7 @@ public class CarePlan extends DomainResource {
/**
* @param value Identifies what progress is being made for the specific activity.
*/
- public CarePlanActivityDetailComponent setStatus(CarePlanActivityStatus value) {
+ public CarePlanActivityPlannedActivityDetailComponent setStatus(CarePlanActivityStatus value) {
if (this.status == null)
this.status = new Enumeration(new CarePlanActivityStatusEnumFactory());
this.status.setValue(value);
@@ -1454,7 +1443,7 @@ public class CarePlan extends DomainResource {
public CodeableConcept getStatusReason() {
if (this.statusReason == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.statusReason");
+ throw new Error("Attempt to auto-create CarePlanActivityPlannedActivityDetailComponent.statusReason");
else if (Configuration.doAutoCreate())
this.statusReason = new CodeableConcept(); // cc
return this.statusReason;
@@ -1467,7 +1456,7 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #statusReason} (Provides reason why the activity isn't yet started, is on hold, was cancelled, etc.)
*/
- public CarePlanActivityDetailComponent setStatusReason(CodeableConcept value) {
+ public CarePlanActivityPlannedActivityDetailComponent setStatusReason(CodeableConcept value) {
this.statusReason = value;
return this;
}
@@ -1478,7 +1467,7 @@ public class CarePlan extends DomainResource {
public BooleanType getDoNotPerformElement() {
if (this.doNotPerform == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.doNotPerform");
+ throw new Error("Attempt to auto-create CarePlanActivityPlannedActivityDetailComponent.doNotPerform");
else if (Configuration.doAutoCreate())
this.doNotPerform = new BooleanType(); // bb
return this.doNotPerform;
@@ -1495,7 +1484,7 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #doNotPerform} (If true, indicates that the described activity is one that must NOT be engaged in when following the plan. If false, or missing, indicates that the described activity is one that should be engaged in when following the plan.). This is the underlying object with id, value and extensions. The accessor "getDoNotPerform" gives direct access to the value
*/
- public CarePlanActivityDetailComponent setDoNotPerformElement(BooleanType value) {
+ public CarePlanActivityPlannedActivityDetailComponent setDoNotPerformElement(BooleanType value) {
this.doNotPerform = value;
return this;
}
@@ -1510,7 +1499,7 @@ public class CarePlan extends DomainResource {
/**
* @param value If true, indicates that the described activity is one that must NOT be engaged in when following the plan. If false, or missing, indicates that the described activity is one that should be engaged in when following the plan.
*/
- public CarePlanActivityDetailComponent setDoNotPerform(boolean value) {
+ public CarePlanActivityPlannedActivityDetailComponent setDoNotPerform(boolean value) {
if (this.doNotPerform == null)
this.doNotPerform = new BooleanType();
this.doNotPerform.setValue(value);
@@ -1576,9 +1565,9 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #scheduled} (The period, timing or frequency upon which the described activity is to occur.)
*/
- public CarePlanActivityDetailComponent setScheduled(DataType value) {
+ public CarePlanActivityPlannedActivityDetailComponent setScheduled(DataType value) {
if (value != null && !(value instanceof Timing || value instanceof Period || value instanceof StringType))
- throw new Error("Not the right type for CarePlan.activity.detail.scheduled[x]: "+value.fhirType());
+ throw new Error("Not the right type for CarePlan.activity.plannedActivityDetail.scheduled[x]: "+value.fhirType());
this.scheduled = value;
return this;
}
@@ -1589,7 +1578,7 @@ public class CarePlan extends DomainResource {
public CodeableReference getLocation() {
if (this.location == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.location");
+ throw new Error("Attempt to auto-create CarePlanActivityPlannedActivityDetailComponent.location");
else if (Configuration.doAutoCreate())
this.location = new CodeableReference(); // cc
return this.location;
@@ -1602,7 +1591,7 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #location} (Identifies the facility where the activity will occur; e.g. home, hospital, specific clinic, etc.)
*/
- public CarePlanActivityDetailComponent setLocation(CodeableReference value) {
+ public CarePlanActivityPlannedActivityDetailComponent setLocation(CodeableReference value) {
this.location = value;
return this;
}
@@ -1651,9 +1640,9 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #reported} (Indicates if this record was captured as a secondary 'reported' record rather than as an original primary source-of-truth record. It may also indicate the source of the report.)
*/
- public CarePlanActivityDetailComponent setReported(DataType value) {
+ public CarePlanActivityPlannedActivityDetailComponent setReported(DataType value) {
if (value != null && !(value instanceof BooleanType || value instanceof Reference))
- throw new Error("Not the right type for CarePlan.activity.detail.reported[x]: "+value.fhirType());
+ throw new Error("Not the right type for CarePlan.activity.plannedActivityDetail.reported[x]: "+value.fhirType());
this.reported = value;
return this;
}
@@ -1670,7 +1659,7 @@ public class CarePlan extends DomainResource {
/**
* @return Returns a reference to this
for easy method chaining
*/
- public CarePlanActivityDetailComponent setPerformer(List thePerformer) {
+ public CarePlanActivityPlannedActivityDetailComponent setPerformer(List thePerformer) {
this.performer = thePerformer;
return this;
}
@@ -1692,7 +1681,7 @@ public class CarePlan extends DomainResource {
return t;
}
- public CarePlanActivityDetailComponent addPerformer(Reference t) { //3
+ public CarePlanActivityPlannedActivityDetailComponent addPerformer(Reference t) { //3
if (t == null)
return this;
if (this.performer == null)
@@ -1755,9 +1744,9 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #product} (Identifies the food, drug or other product to be consumed or supplied in the activity.)
*/
- public CarePlanActivityDetailComponent setProduct(DataType value) {
+ public CarePlanActivityPlannedActivityDetailComponent setProduct(DataType value) {
if (value != null && !(value instanceof CodeableConcept || value instanceof Reference))
- throw new Error("Not the right type for CarePlan.activity.detail.product[x]: "+value.fhirType());
+ throw new Error("Not the right type for CarePlan.activity.plannedActivityDetail.product[x]: "+value.fhirType());
this.product = value;
return this;
}
@@ -1768,7 +1757,7 @@ public class CarePlan extends DomainResource {
public Quantity getDailyAmount() {
if (this.dailyAmount == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.dailyAmount");
+ throw new Error("Attempt to auto-create CarePlanActivityPlannedActivityDetailComponent.dailyAmount");
else if (Configuration.doAutoCreate())
this.dailyAmount = new Quantity(); // cc
return this.dailyAmount;
@@ -1781,7 +1770,7 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #dailyAmount} (Identifies the quantity expected to be consumed in a given day.)
*/
- public CarePlanActivityDetailComponent setDailyAmount(Quantity value) {
+ public CarePlanActivityPlannedActivityDetailComponent setDailyAmount(Quantity value) {
this.dailyAmount = value;
return this;
}
@@ -1792,7 +1781,7 @@ public class CarePlan extends DomainResource {
public Quantity getQuantity() {
if (this.quantity == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.quantity");
+ throw new Error("Attempt to auto-create CarePlanActivityPlannedActivityDetailComponent.quantity");
else if (Configuration.doAutoCreate())
this.quantity = new Quantity(); // cc
return this.quantity;
@@ -1805,7 +1794,7 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #quantity} (Identifies the quantity expected to be supplied, administered or consumed by the subject.)
*/
- public CarePlanActivityDetailComponent setQuantity(Quantity value) {
+ public CarePlanActivityPlannedActivityDetailComponent setQuantity(Quantity value) {
this.quantity = value;
return this;
}
@@ -1816,7 +1805,7 @@ public class CarePlan extends DomainResource {
public StringType getDescriptionElement() {
if (this.description == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create CarePlanActivityDetailComponent.description");
+ throw new Error("Attempt to auto-create CarePlanActivityPlannedActivityDetailComponent.description");
else if (Configuration.doAutoCreate())
this.description = new StringType(); // bb
return this.description;
@@ -1833,7 +1822,7 @@ public class CarePlan extends DomainResource {
/**
* @param value {@link #description} (This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
*/
- public CarePlanActivityDetailComponent setDescriptionElement(StringType value) {
+ public CarePlanActivityPlannedActivityDetailComponent setDescriptionElement(StringType value) {
this.description = value;
return this;
}
@@ -1848,7 +1837,7 @@ public class CarePlan extends DomainResource {
/**
* @param value This provides a textual description of constraints on the intended activity occurrence, including relation to other activities. It may also include objectives, pre-conditions and end-conditions. Finally, it may convey specifics about the activity such as body site, method, route, etc.
*/
- public CarePlanActivityDetailComponent setDescription(String value) {
+ public CarePlanActivityPlannedActivityDetailComponent setDescription(String value) {
if (Utilities.noString(value))
this.description = null;
else {
@@ -2100,13 +2089,13 @@ public class CarePlan extends DomainResource {
@Override
public Base addChild(String name) throws FHIRException {
if (name.equals("kind")) {
- throw new FHIRException("Cannot call addChild on a primitive type CarePlan.activity.detail.kind");
+ throw new FHIRException("Cannot call addChild on a primitive type CarePlan.activity.plannedActivityDetail.kind");
}
else if (name.equals("instantiatesCanonical")) {
- throw new FHIRException("Cannot call addChild on a primitive type CarePlan.activity.detail.instantiatesCanonical");
+ throw new FHIRException("Cannot call addChild on a primitive type CarePlan.activity.plannedActivityDetail.instantiatesCanonical");
}
else if (name.equals("instantiatesUri")) {
- throw new FHIRException("Cannot call addChild on a primitive type CarePlan.activity.detail.instantiatesUri");
+ throw new FHIRException("Cannot call addChild on a primitive type CarePlan.activity.plannedActivityDetail.instantiatesUri");
}
else if (name.equals("code")) {
this.code = new CodeableConcept();
@@ -2119,14 +2108,14 @@ public class CarePlan extends DomainResource {
return addGoal();
}
else if (name.equals("status")) {
- throw new FHIRException("Cannot call addChild on a primitive type CarePlan.activity.detail.status");
+ throw new FHIRException("Cannot call addChild on a primitive type CarePlan.activity.plannedActivityDetail.status");
}
else if (name.equals("statusReason")) {
this.statusReason = new CodeableConcept();
return this.statusReason;
}
else if (name.equals("doNotPerform")) {
- throw new FHIRException("Cannot call addChild on a primitive type CarePlan.activity.detail.doNotPerform");
+ throw new FHIRException("Cannot call addChild on a primitive type CarePlan.activity.plannedActivityDetail.doNotPerform");
}
else if (name.equals("scheduledTiming")) {
this.scheduled = new Timing();
@@ -2172,19 +2161,19 @@ public class CarePlan extends DomainResource {
return this.quantity;
}
else if (name.equals("description")) {
- throw new FHIRException("Cannot call addChild on a primitive type CarePlan.activity.detail.description");
+ throw new FHIRException("Cannot call addChild on a primitive type CarePlan.activity.plannedActivityDetail.description");
}
else
return super.addChild(name);
}
- public CarePlanActivityDetailComponent copy() {
- CarePlanActivityDetailComponent dst = new CarePlanActivityDetailComponent();
+ public CarePlanActivityPlannedActivityDetailComponent copy() {
+ CarePlanActivityPlannedActivityDetailComponent dst = new CarePlanActivityPlannedActivityDetailComponent();
copyValues(dst);
return dst;
}
- public void copyValues(CarePlanActivityDetailComponent dst) {
+ public void copyValues(CarePlanActivityPlannedActivityDetailComponent dst) {
super.copyValues(dst);
dst.kind = kind == null ? null : kind.copy();
if (instantiatesCanonical != null) {
@@ -2229,9 +2218,9 @@ public class CarePlan extends DomainResource {
public boolean equalsDeep(Base other_) {
if (!super.equalsDeep(other_))
return false;
- if (!(other_ instanceof CarePlanActivityDetailComponent))
+ if (!(other_ instanceof CarePlanActivityPlannedActivityDetailComponent))
return false;
- CarePlanActivityDetailComponent o = (CarePlanActivityDetailComponent) other_;
+ CarePlanActivityPlannedActivityDetailComponent o = (CarePlanActivityPlannedActivityDetailComponent) other_;
return compareDeep(kind, o.kind, true) && compareDeep(instantiatesCanonical, o.instantiatesCanonical, true)
&& compareDeep(instantiatesUri, o.instantiatesUri, true) && compareDeep(code, o.code, true) && compareDeep(reason, o.reason, true)
&& compareDeep(goal, o.goal, true) && compareDeep(status, o.status, true) && compareDeep(statusReason, o.statusReason, true)
@@ -2245,9 +2234,9 @@ public class CarePlan extends DomainResource {
public boolean equalsShallow(Base other_) {
if (!super.equalsShallow(other_))
return false;
- if (!(other_ instanceof CarePlanActivityDetailComponent))
+ if (!(other_ instanceof CarePlanActivityPlannedActivityDetailComponent))
return false;
- CarePlanActivityDetailComponent o = (CarePlanActivityDetailComponent) other_;
+ CarePlanActivityPlannedActivityDetailComponent o = (CarePlanActivityPlannedActivityDetailComponent) other_;
return compareValues(kind, o.kind, true) && compareValues(instantiatesCanonical, o.instantiatesCanonical, true)
&& compareValues(instantiatesUri, o.instantiatesUri, true) && compareValues(status, o.status, true)
&& compareValues(doNotPerform, o.doNotPerform, true) && compareValues(description, o.description, true)
@@ -2261,7 +2250,7 @@ public class CarePlan extends DomainResource {
}
public String fhirType() {
- return "CarePlan.activity.detail";
+ return "CarePlan.activity.plannedActivityDetail";
}
@@ -4046,22 +4035,258 @@ public class CarePlan extends DomainResource {
return ResourceType.CarePlan;
}
+ /**
+ * Search parameter: date
+ *
+ * Description: Multiple Resources:
+
+* [AllergyIntolerance](allergyintolerance.html): Date first version of the resource instance was recorded
+* [CarePlan](careplan.html): Time period plan covers
+* [CareTeam](careteam.html): A date within the coverage time period.
+* [ClinicalImpression](clinicalimpression.html): When the assessment was documented
+* [Composition](composition.html): Composition editing time
+* [Consent](consent.html): When consent was agreed to
+* [DiagnosticReport](diagnosticreport.html): The clinically relevant time of the report
+* [Encounter](encounter.html): A date within the period the Encounter lasted
+* [EpisodeOfCare](episodeofcare.html): The provided date search value falls within the episode of care's period
+* [FamilyMemberHistory](familymemberhistory.html): When history was recorded or last updated
+* [Flag](flag.html): Time period when flag is active
+* [Immunization](immunization.html): Vaccination (non)-Administration Date
+* [List](list.html): When the list was prepared
+* [Observation](observation.html): Obtained date/time. If the obtained element is a period, a date that falls in the period
+* [Procedure](procedure.html): When the procedure occurred or is occurring
+* [RiskAssessment](riskassessment.html): When was assessment made?
+* [SupplyRequest](supplyrequest.html): When the request was made
+
+ * Type: date
+ * Path: AllergyIntolerance.recordedDate | CarePlan.period | ClinicalImpression.date | Composition.date | Consent.dateTime | DiagnosticReport.effective | Encounter.period | EpisodeOfCare.period | FamilyMemberHistory.date | Flag.period | (Immunization.occurrence as dateTime) | List.date | Observation.effective | Procedure.occurrence | (RiskAssessment.occurrence as dateTime) | SupplyRequest.authoredOn
+ *
+ */
+ @SearchParamDefinition(name="date", path="AllergyIntolerance.recordedDate | CarePlan.period | ClinicalImpression.date | Composition.date | Consent.dateTime | DiagnosticReport.effective | Encounter.period | EpisodeOfCare.period | FamilyMemberHistory.date | Flag.period | (Immunization.occurrence as dateTime) | List.date | Observation.effective | Procedure.occurrence | (RiskAssessment.occurrence as dateTime) | SupplyRequest.authoredOn", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): Date first version of the resource instance was recorded\r\n* [CarePlan](careplan.html): Time period plan covers\r\n* [CareTeam](careteam.html): A date within the coverage time period.\r\n* [ClinicalImpression](clinicalimpression.html): When the assessment was documented\r\n* [Composition](composition.html): Composition editing time\r\n* [Consent](consent.html): When consent was agreed to\r\n* [DiagnosticReport](diagnosticreport.html): The clinically relevant time of the report\r\n* [Encounter](encounter.html): A date within the period the Encounter lasted\r\n* [EpisodeOfCare](episodeofcare.html): The provided date search value falls within the episode of care's period\r\n* [FamilyMemberHistory](familymemberhistory.html): When history was recorded or last updated\r\n* [Flag](flag.html): Time period when flag is active\r\n* [Immunization](immunization.html): Vaccination (non)-Administration Date\r\n* [List](list.html): When the list was prepared\r\n* [Observation](observation.html): Obtained date/time. If the obtained element is a period, a date that falls in the period\r\n* [Procedure](procedure.html): When the procedure occurred or is occurring\r\n* [RiskAssessment](riskassessment.html): When was assessment made?\r\n* [SupplyRequest](supplyrequest.html): When the request was made\r\n", type="date" )
+ public static final String SP_DATE = "date";
+ /**
+ * Fluent Client search parameter constant for date
+ *
+ * Description: Multiple Resources:
+
+* [AllergyIntolerance](allergyintolerance.html): Date first version of the resource instance was recorded
+* [CarePlan](careplan.html): Time period plan covers
+* [CareTeam](careteam.html): A date within the coverage time period.
+* [ClinicalImpression](clinicalimpression.html): When the assessment was documented
+* [Composition](composition.html): Composition editing time
+* [Consent](consent.html): When consent was agreed to
+* [DiagnosticReport](diagnosticreport.html): The clinically relevant time of the report
+* [Encounter](encounter.html): A date within the period the Encounter lasted
+* [EpisodeOfCare](episodeofcare.html): The provided date search value falls within the episode of care's period
+* [FamilyMemberHistory](familymemberhistory.html): When history was recorded or last updated
+* [Flag](flag.html): Time period when flag is active
+* [Immunization](immunization.html): Vaccination (non)-Administration Date
+* [List](list.html): When the list was prepared
+* [Observation](observation.html): Obtained date/time. If the obtained element is a period, a date that falls in the period
+* [Procedure](procedure.html): When the procedure occurred or is occurring
+* [RiskAssessment](riskassessment.html): When was assessment made?
+* [SupplyRequest](supplyrequest.html): When the request was made
+
+ * Type: date
+ * Path: AllergyIntolerance.recordedDate | CarePlan.period | ClinicalImpression.date | Composition.date | Consent.dateTime | DiagnosticReport.effective | Encounter.period | EpisodeOfCare.period | FamilyMemberHistory.date | Flag.period | (Immunization.occurrence as dateTime) | List.date | Observation.effective | Procedure.occurrence | (RiskAssessment.occurrence as dateTime) | SupplyRequest.authoredOn
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+
+ /**
+ * Search parameter: identifier
+ *
+ * Description: Multiple Resources:
+
+* [AllergyIntolerance](allergyintolerance.html): External ids for this item
+* [CarePlan](careplan.html): External Ids for this plan
+* [CareTeam](careteam.html): External Ids for this team
+* [Composition](composition.html): Version-independent identifier for the Composition
+* [Condition](condition.html): A unique identifier of the condition record
+* [Consent](consent.html): Identifier for this record (external references)
+* [DetectedIssue](detectedissue.html): Unique id for the detected issue
+* [DeviceRequest](devicerequest.html): Business identifier for request/order
+* [DiagnosticReport](diagnosticreport.html): An identifier for the report
+* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
+* [Encounter](encounter.html): Identifier(s) by which this encounter is known
+* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
+* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
+* [Goal](goal.html): External Ids for this goal
+* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID
+* [Immunization](immunization.html): Business identifier
+* [List](list.html): Business identifier
+* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier
+* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier
+* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier
+* [MedicationUsage](medicationusage.html): Return statements with this external identifier
+* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier
+* [Observation](observation.html): The unique id for a particular observation
+* [Procedure](procedure.html): A unique identifier for a procedure
+* [RiskAssessment](riskassessment.html): Unique identifier for the assessment
+* [ServiceRequest](servicerequest.html): Identifiers assigned to this order
+* [SupplyDelivery](supplydelivery.html): External identifier
+* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest
+* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
+
+ * Type: token
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ *
+ */
+ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
+ public static final String SP_IDENTIFIER = "identifier";
+ /**
+ * Fluent Client search parameter constant for identifier
+ *
+ * Description: Multiple Resources:
+
+* [AllergyIntolerance](allergyintolerance.html): External ids for this item
+* [CarePlan](careplan.html): External Ids for this plan
+* [CareTeam](careteam.html): External Ids for this team
+* [Composition](composition.html): Version-independent identifier for the Composition
+* [Condition](condition.html): A unique identifier of the condition record
+* [Consent](consent.html): Identifier for this record (external references)
+* [DetectedIssue](detectedissue.html): Unique id for the detected issue
+* [DeviceRequest](devicerequest.html): Business identifier for request/order
+* [DiagnosticReport](diagnosticreport.html): An identifier for the report
+* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
+* [DocumentReference](documentreference.html): Identifier of the attachment binary
+* [Encounter](encounter.html): Identifier(s) by which this encounter is known
+* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
+* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
+* [Goal](goal.html): External Ids for this goal
+* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID
+* [Immunization](immunization.html): Business identifier
+* [List](list.html): Business identifier
+* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier
+* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier
+* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier
+* [MedicationUsage](medicationusage.html): Return statements with this external identifier
+* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier
+* [Observation](observation.html): The unique id for a particular observation
+* [Procedure](procedure.html): A unique identifier for a procedure
+* [RiskAssessment](riskassessment.html): Unique identifier for the assessment
+* [ServiceRequest](servicerequest.html): Identifiers assigned to this order
+* [SupplyDelivery](supplydelivery.html): External identifier
+* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest
+* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
+
+ * Type: token
+ * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+ * Search parameter: patient
+ *
+ * Description: Multiple Resources:
+
+* [AllergyIntolerance](allergyintolerance.html): Who the sensitivity is for
+* [CarePlan](careplan.html): Who the care plan is for
+* [CareTeam](careteam.html): Who care team is for
+* [ClinicalImpression](clinicalimpression.html): Patient or group assessed
+* [Composition](composition.html): Who and/or what the composition is about
+* [Condition](condition.html): Who has the condition?
+* [Consent](consent.html): Who the consent applies to
+* [DetectedIssue](detectedissue.html): Associated patient
+* [DeviceRequest](devicerequest.html): Individual the service is ordered for
+* [DeviceUsage](deviceusage.html): Search by subject - a patient
+* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient
+* [DocumentManifest](documentmanifest.html): The subject of the set of documents
+* [DocumentReference](documentreference.html): Who/what is the subject of the document
+* [Encounter](encounter.html): The patient or group present at the encounter
+* [EpisodeOfCare](episodeofcare.html): The patient who is the focus of this episode of care
+* [FamilyMemberHistory](familymemberhistory.html): The identity of a subject to list family member history items for
+* [Flag](flag.html): The identity of a subject to list flags for
+* [Goal](goal.html): Who this goal is intended for
+* [ImagingStudy](imagingstudy.html): Who the study is about
+* [Immunization](immunization.html): The patient for the vaccination record
+* [List](list.html): If all resources have the same subject
+* [MedicationAdministration](medicationadministration.html): The identity of a patient to list administrations for
+* [MedicationDispense](medicationdispense.html): The identity of a patient to list dispenses for
+* [MedicationRequest](medicationrequest.html): Returns prescriptions for a specific patient
+* [MedicationUsage](medicationusage.html): Returns statements for a specific patient.
+* [NutritionOrder](nutritionorder.html): The identity of the person who requires the diet, formula or nutritional supplement
+* [Observation](observation.html): The subject that the observation is about (if patient)
+* [Procedure](procedure.html): Search by subject - a patient
+* [RiskAssessment](riskassessment.html): Who/what does assessment apply to?
+* [ServiceRequest](servicerequest.html): Search by subject - a patient
+* [SupplyDelivery](supplydelivery.html): Patient for whom the item is supplied
+* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for
+
+ * Type: reference
+ * Path: AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUsage.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient
+ *
+ */
+ @SearchParamDefinition(name="patient", path="AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUsage.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): Who the sensitivity is for\r\n* [CarePlan](careplan.html): Who the care plan is for\r\n* [CareTeam](careteam.html): Who care team is for\r\n* [ClinicalImpression](clinicalimpression.html): Patient or group assessed\r\n* [Composition](composition.html): Who and/or what the composition is about\r\n* [Condition](condition.html): Who has the condition?\r\n* [Consent](consent.html): Who the consent applies to\r\n* [DetectedIssue](detectedissue.html): Associated patient\r\n* [DeviceRequest](devicerequest.html): Individual the service is ordered for\r\n* [DeviceUsage](deviceusage.html): Search by subject - a patient\r\n* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient\r\n* [DocumentManifest](documentmanifest.html): The subject of the set of documents\r\n* [DocumentReference](documentreference.html): Who/what is the subject of the document\r\n* [Encounter](encounter.html): The patient or group present at the encounter\r\n* [EpisodeOfCare](episodeofcare.html): The patient who is the focus of this episode of care\r\n* [FamilyMemberHistory](familymemberhistory.html): The identity of a subject to list family member history items for\r\n* [Flag](flag.html): The identity of a subject to list flags for\r\n* [Goal](goal.html): Who this goal is intended for\r\n* [ImagingStudy](imagingstudy.html): Who the study is about\r\n* [Immunization](immunization.html): The patient for the vaccination record\r\n* [List](list.html): If all resources have the same subject\r\n* [MedicationAdministration](medicationadministration.html): The identity of a patient to list administrations for\r\n* [MedicationDispense](medicationdispense.html): The identity of a patient to list dispenses for\r\n* [MedicationRequest](medicationrequest.html): Returns prescriptions for a specific patient\r\n* [MedicationUsage](medicationusage.html): Returns statements for a specific patient.\r\n* [NutritionOrder](nutritionorder.html): The identity of the person who requires the diet, formula or nutritional supplement\r\n* [Observation](observation.html): The subject that the observation is about (if patient)\r\n* [Procedure](procedure.html): Search by subject - a patient\r\n* [RiskAssessment](riskassessment.html): Who/what does assessment apply to?\r\n* [ServiceRequest](servicerequest.html): Search by subject - a patient\r\n* [SupplyDelivery](supplydelivery.html): Patient for whom the item is supplied\r\n* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for\r\n", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUsage.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, InventoryReport.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
+ public static final String SP_PATIENT = "patient";
+ /**
+ * Fluent Client search parameter constant for patient
+ *
+ * Description: Multiple Resources:
+
+* [AllergyIntolerance](allergyintolerance.html): Who the sensitivity is for
+* [CarePlan](careplan.html): Who the care plan is for
+* [CareTeam](careteam.html): Who care team is for
+* [ClinicalImpression](clinicalimpression.html): Patient or group assessed
+* [Composition](composition.html): Who and/or what the composition is about
+* [Condition](condition.html): Who has the condition?
+* [Consent](consent.html): Who the consent applies to
+* [DetectedIssue](detectedissue.html): Associated patient
+* [DeviceRequest](devicerequest.html): Individual the service is ordered for
+* [DeviceUsage](deviceusage.html): Search by subject - a patient
+* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient
+* [DocumentManifest](documentmanifest.html): The subject of the set of documents
+* [DocumentReference](documentreference.html): Who/what is the subject of the document
+* [Encounter](encounter.html): The patient or group present at the encounter
+* [EpisodeOfCare](episodeofcare.html): The patient who is the focus of this episode of care
+* [FamilyMemberHistory](familymemberhistory.html): The identity of a subject to list family member history items for
+* [Flag](flag.html): The identity of a subject to list flags for
+* [Goal](goal.html): Who this goal is intended for
+* [ImagingStudy](imagingstudy.html): Who the study is about
+* [Immunization](immunization.html): The patient for the vaccination record
+* [List](list.html): If all resources have the same subject
+* [MedicationAdministration](medicationadministration.html): The identity of a patient to list administrations for
+* [MedicationDispense](medicationdispense.html): The identity of a patient to list dispenses for
+* [MedicationRequest](medicationrequest.html): Returns prescriptions for a specific patient
+* [MedicationUsage](medicationusage.html): Returns statements for a specific patient.
+* [NutritionOrder](nutritionorder.html): The identity of the person who requires the diet, formula or nutritional supplement
+* [Observation](observation.html): The subject that the observation is about (if patient)
+* [Procedure](procedure.html): Search by subject - a patient
+* [RiskAssessment](riskassessment.html): Who/what does assessment apply to?
+* [ServiceRequest](servicerequest.html): Search by subject - a patient
+* [SupplyDelivery](supplydelivery.html): Patient for whom the item is supplied
+* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for
+
+ * Type: reference
+ * Path: AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUsage.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "CarePlan:patient".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("CarePlan:patient").toLocked();
+
/**
* Search parameter: activity-code
*
* Description: Detail type of activity
* Type: token
- * Path: CarePlan.activity.detail.code
+ * Path: CarePlan.activity.plannedActivityDetail.code
*
*/
- @SearchParamDefinition(name="activity-code", path="CarePlan.activity.detail.code", description="Detail type of activity", type="token" )
+ @SearchParamDefinition(name="activity-code", path="CarePlan.activity.plannedActivityDetail.code", description="Detail type of activity", type="token" )
public static final String SP_ACTIVITY_CODE = "activity-code";
/**
* Fluent Client search parameter constant for activity-code
*
* Description: Detail type of activity
* Type: token
- * Path: CarePlan.activity.detail.code
+ * Path: CarePlan.activity.plannedActivityDetail.code
*
*/
public static final ca.uhn.fhir.rest.gclient.TokenClientParam ACTIVITY_CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ACTIVITY_CODE);
@@ -4069,19 +4294,19 @@ public class CarePlan extends DomainResource {
/**
* Search parameter: activity-reference
*
- * Description: Activity details defined in specific resource
+ * Description: Activity that is intended to be part of the care plan
* Type: reference
- * Path: CarePlan.activity.reference
+ * Path: CarePlan.activity.plannedActivityReference
*
*/
- @SearchParamDefinition(name="activity-reference", path="CarePlan.activity.reference", description="Activity details defined in specific resource", type="reference", target={Appointment.class, CommunicationRequest.class, DeviceRequest.class, ImmunizationRecommendation.class, MedicationRequest.class, NutritionOrder.class, RequestGroup.class, ServiceRequest.class, Task.class, VisionPrescription.class } )
+ @SearchParamDefinition(name="activity-reference", path="CarePlan.activity.plannedActivityReference", description="Activity that is intended to be part of the care plan", type="reference", target={Appointment.class, CommunicationRequest.class, DeviceRequest.class, ImmunizationRecommendation.class, MedicationRequest.class, NutritionOrder.class, RequestGroup.class, ServiceRequest.class, Task.class, VisionPrescription.class } )
public static final String SP_ACTIVITY_REFERENCE = "activity-reference";
/**
* Fluent Client search parameter constant for activity-reference
*
- * Description: Activity details defined in specific resource
+ * Description: Activity that is intended to be part of the care plan
* Type: reference
- * Path: CarePlan.activity.reference
+ * Path: CarePlan.activity.plannedActivityReference
*
*/
public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTIVITY_REFERENCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTIVITY_REFERENCE);
@@ -4095,19 +4320,19 @@ public class CarePlan extends DomainResource {
/**
* Search parameter: activity-scheduled-date
*
- * Description: Specified date occurs within period specified by CarePlan.activity.detail.scheduled[x]
+ * Description: Specified date occurs within period specified by CarePlan.activity.plannedActivityDetail.scheduled[x]
* Type: date
- * Path: CarePlan.activity.detail.scheduled.as(Timing) | CarePlan.activity.detail.scheduled.as(Period)
+ * Path: CarePlan.activity.plannedActivityDetail.scheduled.as(Timing) | CarePlan.activity.plannedActivityDetail.scheduled.as(Period)
*
*/
- @SearchParamDefinition(name="activity-scheduled-date", path="CarePlan.activity.detail.scheduled.as(Timing) | CarePlan.activity.detail.scheduled.as(Period)", description="Specified date occurs within period specified by CarePlan.activity.detail.scheduled[x]", type="date" )
+ @SearchParamDefinition(name="activity-scheduled-date", path="CarePlan.activity.plannedActivityDetail.scheduled.as(Timing) | CarePlan.activity.plannedActivityDetail.scheduled.as(Period)", description="Specified date occurs within period specified by CarePlan.activity.plannedActivityDetail.scheduled[x]", type="date" )
public static final String SP_ACTIVITY_SCHEDULED_DATE = "activity-scheduled-date";
/**
* Fluent Client search parameter constant for activity-scheduled-date
*
- * Description: Specified date occurs within period specified by CarePlan.activity.detail.scheduled[x]
+ * Description: Specified date occurs within period specified by CarePlan.activity.plannedActivityDetail.scheduled[x]
* Type: date
- * Path: CarePlan.activity.detail.scheduled.as(Timing) | CarePlan.activity.detail.scheduled.as(Period)
+ * Path: CarePlan.activity.plannedActivityDetail.scheduled.as(Timing) | CarePlan.activity.plannedActivityDetail.scheduled.as(Period)
*
*/
public static final ca.uhn.fhir.rest.gclient.DateClientParam ACTIVITY_SCHEDULED_DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_ACTIVITY_SCHEDULED_DATE);
@@ -4117,17 +4342,17 @@ public class CarePlan extends DomainResource {
*
* Description: When activity is to occur
* Type: string
- * Path: CarePlan.activity.detail.scheduled.as(string)
+ * Path: CarePlan.activity.plannedActivityDetail.scheduled.as(string)
*
*/
- @SearchParamDefinition(name="activity-scheduled-string", path="CarePlan.activity.detail.scheduled.as(string)", description="When activity is to occur", type="string" )
+ @SearchParamDefinition(name="activity-scheduled-string", path="CarePlan.activity.plannedActivityDetail.scheduled.as(string)", description="When activity is to occur", type="string" )
public static final String SP_ACTIVITY_SCHEDULED_STRING = "activity-scheduled-string";
/**
* Fluent Client search parameter constant for activity-scheduled-string
*
* Description: When activity is to occur
* Type: string
- * Path: CarePlan.activity.detail.scheduled.as(string)
+ * Path: CarePlan.activity.plannedActivityDetail.scheduled.as(string)
*
*/
public static final ca.uhn.fhir.rest.gclient.StringClientParam ACTIVITY_SCHEDULED_STRING = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ACTIVITY_SCHEDULED_STRING);
@@ -4379,17 +4604,17 @@ public class CarePlan extends DomainResource {
*
* Description: Matches if the practitioner is listed as a performer in any of the "simple" activities. (For performers of the detailed activities, chain through the activitydetail search parameter.)
* Type: reference
- * Path: CarePlan.activity.detail.performer
+ * Path: CarePlan.activity.plannedActivityDetail.performer
*
*/
- @SearchParamDefinition(name="performer", path="CarePlan.activity.detail.performer", description="Matches if the practitioner is listed as a performer in any of the \"simple\" activities. (For performers of the detailed activities, chain through the activitydetail search parameter.)", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Practitioner"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for RelatedPerson") }, target={CareTeam.class, Device.class, HealthcareService.class, Organization.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
+ @SearchParamDefinition(name="performer", path="CarePlan.activity.plannedActivityDetail.performer", description="Matches if the practitioner is listed as a performer in any of the \"simple\" activities. (For performers of the detailed activities, chain through the activitydetail search parameter.)", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Practitioner"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for RelatedPerson") }, target={CareTeam.class, Device.class, HealthcareService.class, Organization.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
public static final String SP_PERFORMER = "performer";
/**
* Fluent Client search parameter constant for performer
*
* Description: Matches if the practitioner is listed as a performer in any of the "simple" activities. (For performers of the detailed activities, chain through the activitydetail search parameter.)
* Type: reference
- * Path: CarePlan.activity.detail.performer
+ * Path: CarePlan.activity.plannedActivityDetail.performer
*
*/
public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PERFORMER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PERFORMER);
@@ -4472,242 +4697,6 @@ public class CarePlan extends DomainResource {
*/
public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("CarePlan:subject").toLocked();
- /**
- * Search parameter: date
- *
- * Description: Multiple Resources:
-
-* [AllergyIntolerance](allergyintolerance.html): Date first version of the resource instance was recorded
-* [CarePlan](careplan.html): Time period plan covers
-* [CareTeam](careteam.html): A date within the coverage time period.
-* [ClinicalImpression](clinicalimpression.html): When the assessment was documented
-* [Composition](composition.html): Composition editing time
-* [Consent](consent.html): When consent was agreed to
-* [DiagnosticReport](diagnosticreport.html): The clinically relevant time of the report
-* [Encounter](encounter.html): A date within the period the Encounter lasted
-* [EpisodeOfCare](episodeofcare.html): The provided date search value falls within the episode of care's period
-* [FamilyMemberHistory](familymemberhistory.html): When history was recorded or last updated
-* [Flag](flag.html): Time period when flag is active
-* [Immunization](immunization.html): Vaccination (non)-Administration Date
-* [List](list.html): When the list was prepared
-* [Observation](observation.html): Obtained date/time. If the obtained element is a period, a date that falls in the period
-* [Procedure](procedure.html): When the procedure occurred or is occurring
-* [RiskAssessment](riskassessment.html): When was assessment made?
-* [SupplyRequest](supplyrequest.html): When the request was made
-
- * Type: date
- * Path: AllergyIntolerance.recordedDate | CarePlan.period | ClinicalImpression.date | Composition.date | Consent.dateTime | DiagnosticReport.effective | Encounter.period | EpisodeOfCare.period | FamilyMemberHistory.date | Flag.period | (Immunization.occurrence as dateTime) | List.date | Observation.effective | Procedure.occurrence | (RiskAssessment.occurrence as dateTime) | SupplyRequest.authoredOn
- *
- */
- @SearchParamDefinition(name="date", path="AllergyIntolerance.recordedDate | CarePlan.period | ClinicalImpression.date | Composition.date | Consent.dateTime | DiagnosticReport.effective | Encounter.period | EpisodeOfCare.period | FamilyMemberHistory.date | Flag.period | (Immunization.occurrence as dateTime) | List.date | Observation.effective | Procedure.occurrence | (RiskAssessment.occurrence as dateTime) | SupplyRequest.authoredOn", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): Date first version of the resource instance was recorded\r\n* [CarePlan](careplan.html): Time period plan covers\r\n* [CareTeam](careteam.html): A date within the coverage time period.\r\n* [ClinicalImpression](clinicalimpression.html): When the assessment was documented\r\n* [Composition](composition.html): Composition editing time\r\n* [Consent](consent.html): When consent was agreed to\r\n* [DiagnosticReport](diagnosticreport.html): The clinically relevant time of the report\r\n* [Encounter](encounter.html): A date within the period the Encounter lasted\r\n* [EpisodeOfCare](episodeofcare.html): The provided date search value falls within the episode of care's period\r\n* [FamilyMemberHistory](familymemberhistory.html): When history was recorded or last updated\r\n* [Flag](flag.html): Time period when flag is active\r\n* [Immunization](immunization.html): Vaccination (non)-Administration Date\r\n* [List](list.html): When the list was prepared\r\n* [Observation](observation.html): Obtained date/time. If the obtained element is a period, a date that falls in the period\r\n* [Procedure](procedure.html): When the procedure occurred or is occurring\r\n* [RiskAssessment](riskassessment.html): When was assessment made?\r\n* [SupplyRequest](supplyrequest.html): When the request was made\r\n", type="date" )
- public static final String SP_DATE = "date";
- /**
- * Fluent Client search parameter constant for date
- *
- * Description: Multiple Resources:
-
-* [AllergyIntolerance](allergyintolerance.html): Date first version of the resource instance was recorded
-* [CarePlan](careplan.html): Time period plan covers
-* [CareTeam](careteam.html): A date within the coverage time period.
-* [ClinicalImpression](clinicalimpression.html): When the assessment was documented
-* [Composition](composition.html): Composition editing time
-* [Consent](consent.html): When consent was agreed to
-* [DiagnosticReport](diagnosticreport.html): The clinically relevant time of the report
-* [Encounter](encounter.html): A date within the period the Encounter lasted
-* [EpisodeOfCare](episodeofcare.html): The provided date search value falls within the episode of care's period
-* [FamilyMemberHistory](familymemberhistory.html): When history was recorded or last updated
-* [Flag](flag.html): Time period when flag is active
-* [Immunization](immunization.html): Vaccination (non)-Administration Date
-* [List](list.html): When the list was prepared
-* [Observation](observation.html): Obtained date/time. If the obtained element is a period, a date that falls in the period
-* [Procedure](procedure.html): When the procedure occurred or is occurring
-* [RiskAssessment](riskassessment.html): When was assessment made?
-* [SupplyRequest](supplyrequest.html): When the request was made
-
- * Type: date
- * Path: AllergyIntolerance.recordedDate | CarePlan.period | ClinicalImpression.date | Composition.date | Consent.dateTime | DiagnosticReport.effective | Encounter.period | EpisodeOfCare.period | FamilyMemberHistory.date | Flag.period | (Immunization.occurrence as dateTime) | List.date | Observation.effective | Procedure.occurrence | (RiskAssessment.occurrence as dateTime) | SupplyRequest.authoredOn
- *
- */
- public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
-
- /**
- * Search parameter: identifier
- *
- * Description: Multiple Resources:
-
-* [AllergyIntolerance](allergyintolerance.html): External ids for this item
-* [CarePlan](careplan.html): External Ids for this plan
-* [CareTeam](careteam.html): External Ids for this team
-* [Composition](composition.html): Version-independent identifier for the Composition
-* [Condition](condition.html): A unique identifier of the condition record
-* [Consent](consent.html): Identifier for this record (external references)
-* [DetectedIssue](detectedissue.html): Unique id for the detected issue
-* [DeviceRequest](devicerequest.html): Business identifier for request/order
-* [DiagnosticReport](diagnosticreport.html): An identifier for the report
-* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Identifier of the attachment binary
-* [Encounter](encounter.html): Identifier(s) by which this encounter is known
-* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
-* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
-* [Goal](goal.html): External Ids for this goal
-* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number
-* [Immunization](immunization.html): Business identifier
-* [List](list.html): Business identifier
-* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier
-* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier
-* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier
-* [MedicationUsage](medicationusage.html): Return statements with this external identifier
-* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier
-* [Observation](observation.html): The unique id for a particular observation
-* [Procedure](procedure.html): A unique identifier for a procedure
-* [RiskAssessment](riskassessment.html): Unique identifier for the assessment
-* [ServiceRequest](servicerequest.html): Identifiers assigned to this order
-* [SupplyDelivery](supplydelivery.html): External identifier
-* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest
-* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
-
- * Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
- *
- */
- @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
- public static final String SP_IDENTIFIER = "identifier";
- /**
- * Fluent Client search parameter constant for identifier
- *
- * Description: Multiple Resources:
-
-* [AllergyIntolerance](allergyintolerance.html): External ids for this item
-* [CarePlan](careplan.html): External Ids for this plan
-* [CareTeam](careteam.html): External Ids for this team
-* [Composition](composition.html): Version-independent identifier for the Composition
-* [Condition](condition.html): A unique identifier of the condition record
-* [Consent](consent.html): Identifier for this record (external references)
-* [DetectedIssue](detectedissue.html): Unique id for the detected issue
-* [DeviceRequest](devicerequest.html): Business identifier for request/order
-* [DiagnosticReport](diagnosticreport.html): An identifier for the report
-* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents
-* [DocumentReference](documentreference.html): Identifier of the attachment binary
-* [Encounter](encounter.html): Identifier(s) by which this encounter is known
-* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
-* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
-* [Goal](goal.html): External Ids for this goal
-* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number
-* [Immunization](immunization.html): Business identifier
-* [List](list.html): Business identifier
-* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier
-* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier
-* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier
-* [MedicationUsage](medicationusage.html): Return statements with this external identifier
-* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier
-* [Observation](observation.html): The unique id for a particular observation
-* [Procedure](procedure.html): A unique identifier for a procedure
-* [RiskAssessment](riskassessment.html): Unique identifier for the assessment
-* [ServiceRequest](servicerequest.html): Identifiers assigned to this order
-* [SupplyDelivery](supplydelivery.html): External identifier
-* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest
-* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier
-
- * Type: token
- * Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
-
- /**
- * Search parameter: patient
- *
- * Description: Multiple Resources:
-
-* [AllergyIntolerance](allergyintolerance.html): Who the sensitivity is for
-* [CarePlan](careplan.html): Who the care plan is for
-* [CareTeam](careteam.html): Who care team is for
-* [ClinicalImpression](clinicalimpression.html): Patient or group assessed
-* [Composition](composition.html): Who and/or what the composition is about
-* [Condition](condition.html): Who has the condition?
-* [Consent](consent.html): Who the consent applies to
-* [DetectedIssue](detectedissue.html): Associated patient
-* [DeviceRequest](devicerequest.html): Individual the service is ordered for
-* [DeviceUseStatement](deviceusestatement.html): Search by subject - a patient
-* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient
-* [DocumentManifest](documentmanifest.html): The subject of the set of documents
-* [DocumentReference](documentreference.html): Who/what is the subject of the document
-* [Encounter](encounter.html): The patient or group present at the encounter
-* [EpisodeOfCare](episodeofcare.html): The patient who is the focus of this episode of care
-* [FamilyMemberHistory](familymemberhistory.html): The identity of a subject to list family member history items for
-* [Flag](flag.html): The identity of a subject to list flags for
-* [Goal](goal.html): Who this goal is intended for
-* [ImagingStudy](imagingstudy.html): Who the study is about
-* [Immunization](immunization.html): The patient for the vaccination record
-* [List](list.html): If all resources have the same subject
-* [MedicationAdministration](medicationadministration.html): The identity of a patient to list administrations for
-* [MedicationDispense](medicationdispense.html): The identity of a patient to list dispenses for
-* [MedicationRequest](medicationrequest.html): Returns prescriptions for a specific patient
-* [MedicationUsage](medicationusage.html): Returns statements for a specific patient.
-* [NutritionOrder](nutritionorder.html): The identity of the person who requires the diet, formula or nutritional supplement
-* [Observation](observation.html): The subject that the observation is about (if patient)
-* [Procedure](procedure.html): Search by subject - a patient
-* [RiskAssessment](riskassessment.html): Who/what does assessment apply to?
-* [ServiceRequest](servicerequest.html): Search by subject - a patient
-* [SupplyDelivery](supplydelivery.html): Patient for whom the item is supplied
-* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for
-
- * Type: reference
- * Path: AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUseStatement.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient
- *
- */
- @SearchParamDefinition(name="patient", path="AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUseStatement.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): Who the sensitivity is for\r\n* [CarePlan](careplan.html): Who the care plan is for\r\n* [CareTeam](careteam.html): Who care team is for\r\n* [ClinicalImpression](clinicalimpression.html): Patient or group assessed\r\n* [Composition](composition.html): Who and/or what the composition is about\r\n* [Condition](condition.html): Who has the condition?\r\n* [Consent](consent.html): Who the consent applies to\r\n* [DetectedIssue](detectedissue.html): Associated patient\r\n* [DeviceRequest](devicerequest.html): Individual the service is ordered for\r\n* [DeviceUseStatement](deviceusestatement.html): Search by subject - a patient\r\n* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient\r\n* [DocumentManifest](documentmanifest.html): The subject of the set of documents\r\n* [DocumentReference](documentreference.html): Who/what is the subject of the document\r\n* [Encounter](encounter.html): The patient or group present at the encounter\r\n* [EpisodeOfCare](episodeofcare.html): The patient who is the focus of this episode of care\r\n* [FamilyMemberHistory](familymemberhistory.html): The identity of a subject to list family member history items for\r\n* [Flag](flag.html): The identity of a subject to list flags for\r\n* [Goal](goal.html): Who this goal is intended for\r\n* [ImagingStudy](imagingstudy.html): Who the study is about\r\n* [Immunization](immunization.html): The patient for the vaccination record\r\n* [List](list.html): If all resources have the same subject\r\n* [MedicationAdministration](medicationadministration.html): The identity of a patient to list administrations for\r\n* [MedicationDispense](medicationdispense.html): The identity of a patient to list dispenses for\r\n* [MedicationRequest](medicationrequest.html): Returns prescriptions for a specific patient\r\n* [MedicationUsage](medicationusage.html): Returns statements for a specific patient.\r\n* [NutritionOrder](nutritionorder.html): The identity of the person who requires the diet, formula or nutritional supplement\r\n* [Observation](observation.html): The subject that the observation is about (if patient)\r\n* [Procedure](procedure.html): Search by subject - a patient\r\n* [RiskAssessment](riskassessment.html): Who/what does assessment apply to?\r\n* [ServiceRequest](servicerequest.html): Search by subject - a patient\r\n* [SupplyDelivery](supplydelivery.html): Patient for whom the item is supplied\r\n* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for\r\n", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, target={Group.class, Patient.class } )
- public static final String SP_PATIENT = "patient";
- /**
- * Fluent Client search parameter constant for patient
- *
- * Description: Multiple Resources:
-
-* [AllergyIntolerance](allergyintolerance.html): Who the sensitivity is for
-* [CarePlan](careplan.html): Who the care plan is for
-* [CareTeam](careteam.html): Who care team is for
-* [ClinicalImpression](clinicalimpression.html): Patient or group assessed
-* [Composition](composition.html): Who and/or what the composition is about
-* [Condition](condition.html): Who has the condition?
-* [Consent](consent.html): Who the consent applies to
-* [DetectedIssue](detectedissue.html): Associated patient
-* [DeviceRequest](devicerequest.html): Individual the service is ordered for
-* [DeviceUseStatement](deviceusestatement.html): Search by subject - a patient
-* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient
-* [DocumentManifest](documentmanifest.html): The subject of the set of documents
-* [DocumentReference](documentreference.html): Who/what is the subject of the document
-* [Encounter](encounter.html): The patient or group present at the encounter
-* [EpisodeOfCare](episodeofcare.html): The patient who is the focus of this episode of care
-* [FamilyMemberHistory](familymemberhistory.html): The identity of a subject to list family member history items for
-* [Flag](flag.html): The identity of a subject to list flags for
-* [Goal](goal.html): Who this goal is intended for
-* [ImagingStudy](imagingstudy.html): Who the study is about
-* [Immunization](immunization.html): The patient for the vaccination record
-* [List](list.html): If all resources have the same subject
-* [MedicationAdministration](medicationadministration.html): The identity of a patient to list administrations for
-* [MedicationDispense](medicationdispense.html): The identity of a patient to list dispenses for
-* [MedicationRequest](medicationrequest.html): Returns prescriptions for a specific patient
-* [MedicationUsage](medicationusage.html): Returns statements for a specific patient.
-* [NutritionOrder](nutritionorder.html): The identity of the person who requires the diet, formula or nutritional supplement
-* [Observation](observation.html): The subject that the observation is about (if patient)
-* [Procedure](procedure.html): Search by subject - a patient
-* [RiskAssessment](riskassessment.html): Who/what does assessment apply to?
-* [ServiceRequest](servicerequest.html): Search by subject - a patient
-* [SupplyDelivery](supplydelivery.html): Patient for whom the item is supplied
-* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for
-
- * Type: reference
- * Path: AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUseStatement.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient
- *
- */
- public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
-
-/**
- * Constant for fluent queries to be used to add include statements. Specifies
- * the path value of "CarePlan:patient".
- */
- public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("CarePlan:patient").toLocked();
-
}
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CareTeam.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CareTeam.java
index 81445b618..c933abd2d 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CareTeam.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CareTeam.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -103,7 +103,6 @@ public class CareTeam extends DomainResource {
case SUSPENDED: return "suspended";
case INACTIVE: return "inactive";
case ENTEREDINERROR: return "entered-in-error";
- case NULL: return null;
default: return "?";
}
}
@@ -114,7 +113,6 @@ public class CareTeam extends DomainResource {
case SUSPENDED: return "http://hl7.org/fhir/care-team-status";
case INACTIVE: return "http://hl7.org/fhir/care-team-status";
case ENTEREDINERROR: return "http://hl7.org/fhir/care-team-status";
- case NULL: return null;
default: return "?";
}
}
@@ -125,7 +123,6 @@ public class CareTeam extends DomainResource {
case SUSPENDED: return "The care team is temporarily on hold or suspended and not participating in the coordination and delivery of care.";
case INACTIVE: return "The care team was, but is no longer, participating in the coordination and delivery of care.";
case ENTEREDINERROR: return "The care team should have never existed.";
- case NULL: return null;
default: return "?";
}
}
@@ -136,7 +133,6 @@ public class CareTeam extends DomainResource {
case SUSPENDED: return "Suspended";
case INACTIVE: return "Inactive";
case ENTEREDINERROR: return "Entered in Error";
- case NULL: return null;
default: return "?";
}
}
@@ -1430,118 +1426,6 @@ public class CareTeam extends DomainResource {
return ResourceType.CareTeam;
}
- /**
- * Search parameter: category
- *
- * Description: Type of team
- * Type: token
- * Path: CareTeam.category
- *
- */
- @SearchParamDefinition(name="category", path="CareTeam.category", description="Type of team", type="token" )
- public static final String SP_CATEGORY = "category";
- /**
- * Fluent Client search parameter constant for category
- *
- * Description: Type of team
- * Type: token
- * Path: CareTeam.category
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY);
-
- /**
- * Search parameter: name
- *
- * Description: Name of the team, such as crisis assessment team
- * Type: string
- * Path: CareTeam.name
- *
- */
- @SearchParamDefinition(name="name", path="CareTeam.name", description="Name of the team, such as crisis assessment team", type="string" )
- public static final String SP_NAME = "name";
- /**
- * Fluent Client search parameter constant for name
- *
- * Description: Name of the team, such as crisis assessment team
- * Type: string
- * Path: CareTeam.name
- *
- */
- public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME);
-
- /**
- * Search parameter: participant
- *
- * Description: Who is involved
- * Type: reference
- * Path: CareTeam.participant.member
- *
- */
- @SearchParamDefinition(name="participant", path="CareTeam.participant.member", description="Who is involved", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Practitioner"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for RelatedPerson") }, target={CareTeam.class, Organization.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
- public static final String SP_PARTICIPANT = "participant";
- /**
- * Fluent Client search parameter constant for participant
- *
- * Description: Who is involved
- * Type: reference
- * Path: CareTeam.participant.member
- *
- */
- public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARTICIPANT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARTICIPANT);
-
-/**
- * Constant for fluent queries to be used to add include statements. Specifies
- * the path value of "CareTeam:participant".
- */
- public static final ca.uhn.fhir.model.api.Include INCLUDE_PARTICIPANT = new ca.uhn.fhir.model.api.Include("CareTeam:participant").toLocked();
-
- /**
- * Search parameter: status
- *
- * Description: proposed | active | suspended | inactive | entered-in-error
- * Type: token
- * Path: CareTeam.status
- *
- */
- @SearchParamDefinition(name="status", path="CareTeam.status", description="proposed | active | suspended | inactive | entered-in-error", type="token" )
- public static final String SP_STATUS = "status";
- /**
- * Fluent Client search parameter constant for status
- *
- * Description: proposed | active | suspended | inactive | entered-in-error
- * Type: token
- * Path: CareTeam.status
- *
- */
- public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
-
- /**
- * Search parameter: subject
- *
- * Description: Who care team is for
- * Type: reference
- * Path: CareTeam.subject
- *
- */
- @SearchParamDefinition(name="subject", path="CareTeam.subject", description="Who care team is for", type="reference", target={Group.class, Patient.class } )
- public static final String SP_SUBJECT = "subject";
- /**
- * Fluent Client search parameter constant for subject
- *
- * Description: Who care team is for
- * Type: reference
- * Path: CareTeam.subject
- *
- */
- public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
-
-/**
- * Constant for fluent queries to be used to add include statements. Specifies
- * the path value of "CareTeam:subject".
- */
- public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("CareTeam:subject").toLocked();
-
/**
* Search parameter: date
*
@@ -1620,7 +1504,7 @@ public class CareTeam extends DomainResource {
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
* [Goal](goal.html): External Ids for this goal
-* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number
+* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID
* [Immunization](immunization.html): Business identifier
* [List](list.html): Business identifier
* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier
@@ -1640,7 +1524,7 @@ public class CareTeam extends DomainResource {
* Path: AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier
*
*/
- @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
+ @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier | CarePlan.identifier | CareTeam.identifier | Composition.identifier | Condition.identifier | Consent.identifier | DetectedIssue.identifier | DeviceRequest.identifier | DiagnosticReport.identifier | DocumentManifest.masterIdentifier | DocumentManifest.identifier | DocumentReference.content.identifier | DocumentReference.identifier | Encounter.identifier | EpisodeOfCare.identifier | FamilyMemberHistory.identifier | Goal.identifier | ImagingStudy.identifier | Immunization.identifier | List.identifier | MedicationAdministration.identifier | MedicationDispense.identifier | MedicationRequest.identifier | MedicationUsage.identifier | NutritionOrder.identifier | Observation.identifier | Procedure.identifier | RiskAssessment.identifier | ServiceRequest.identifier | SupplyDelivery.identifier | SupplyRequest.identifier | VisionPrescription.identifier", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): External ids for this item\r\n* [CarePlan](careplan.html): External Ids for this plan\r\n* [CareTeam](careteam.html): External Ids for this team\r\n* [Composition](composition.html): Version-independent identifier for the Composition\r\n* [Condition](condition.html): A unique identifier of the condition record\r\n* [Consent](consent.html): Identifier for this record (external references)\r\n* [DetectedIssue](detectedissue.html): Unique id for the detected issue\r\n* [DeviceRequest](devicerequest.html): Business identifier for request/order\r\n* [DiagnosticReport](diagnosticreport.html): An identifier for the report\r\n* [DocumentManifest](documentmanifest.html): Unique Identifier for the set of documents\r\n* [DocumentReference](documentreference.html): Identifier of the attachment binary\r\n* [Encounter](encounter.html): Identifier(s) by which this encounter is known\r\n* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare\r\n* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier\r\n* [Goal](goal.html): External Ids for this goal\r\n* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID\r\n* [Immunization](immunization.html): Business identifier\r\n* [List](list.html): Business identifier\r\n* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier\r\n* [MedicationDispense](medicationdispense.html): Returns dispenses with this external identifier\r\n* [MedicationRequest](medicationrequest.html): Return prescriptions with this external identifier\r\n* [MedicationUsage](medicationusage.html): Return statements with this external identifier\r\n* [NutritionOrder](nutritionorder.html): Return nutrition orders with this external identifier\r\n* [Observation](observation.html): The unique id for a particular observation\r\n* [Procedure](procedure.html): A unique identifier for a procedure\r\n* [RiskAssessment](riskassessment.html): Unique identifier for the assessment\r\n* [ServiceRequest](servicerequest.html): Identifiers assigned to this order\r\n* [SupplyDelivery](supplydelivery.html): External identifier\r\n* [SupplyRequest](supplyrequest.html): Business Identifier for SupplyRequest\r\n* [VisionPrescription](visionprescription.html): Return prescriptions with this external identifier\r\n", type="token" )
public static final String SP_IDENTIFIER = "identifier";
/**
* Fluent Client search parameter constant for identifier
@@ -1662,7 +1546,7 @@ public class CareTeam extends DomainResource {
* [EpisodeOfCare](episodeofcare.html): Business Identifier(s) relevant for this EpisodeOfCare
* [FamilyMemberHistory](familymemberhistory.html): A search by a record identifier
* [Goal](goal.html): External Ids for this goal
-* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID and Accession number
+* [ImagingStudy](imagingstudy.html): Identifiers for the Study, such as DICOM Study Instance UID
* [Immunization](immunization.html): Business identifier
* [List](list.html): Business identifier
* [MedicationAdministration](medicationadministration.html): Return administrations with this external identifier
@@ -1698,7 +1582,7 @@ public class CareTeam extends DomainResource {
* [Consent](consent.html): Who the consent applies to
* [DetectedIssue](detectedissue.html): Associated patient
* [DeviceRequest](devicerequest.html): Individual the service is ordered for
-* [DeviceUseStatement](deviceusestatement.html): Search by subject - a patient
+* [DeviceUsage](deviceusage.html): Search by subject - a patient
* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient
* [DocumentManifest](documentmanifest.html): The subject of the set of documents
* [DocumentReference](documentreference.html): Who/what is the subject of the document
@@ -1723,10 +1607,10 @@ public class CareTeam extends DomainResource {
* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for
* Type: reference
- * Path: AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUseStatement.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient
+ * Path: AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUsage.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient
*
*/
- @SearchParamDefinition(name="patient", path="AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUseStatement.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): Who the sensitivity is for\r\n* [CarePlan](careplan.html): Who the care plan is for\r\n* [CareTeam](careteam.html): Who care team is for\r\n* [ClinicalImpression](clinicalimpression.html): Patient or group assessed\r\n* [Composition](composition.html): Who and/or what the composition is about\r\n* [Condition](condition.html): Who has the condition?\r\n* [Consent](consent.html): Who the consent applies to\r\n* [DetectedIssue](detectedissue.html): Associated patient\r\n* [DeviceRequest](devicerequest.html): Individual the service is ordered for\r\n* [DeviceUseStatement](deviceusestatement.html): Search by subject - a patient\r\n* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient\r\n* [DocumentManifest](documentmanifest.html): The subject of the set of documents\r\n* [DocumentReference](documentreference.html): Who/what is the subject of the document\r\n* [Encounter](encounter.html): The patient or group present at the encounter\r\n* [EpisodeOfCare](episodeofcare.html): The patient who is the focus of this episode of care\r\n* [FamilyMemberHistory](familymemberhistory.html): The identity of a subject to list family member history items for\r\n* [Flag](flag.html): The identity of a subject to list flags for\r\n* [Goal](goal.html): Who this goal is intended for\r\n* [ImagingStudy](imagingstudy.html): Who the study is about\r\n* [Immunization](immunization.html): The patient for the vaccination record\r\n* [List](list.html): If all resources have the same subject\r\n* [MedicationAdministration](medicationadministration.html): The identity of a patient to list administrations for\r\n* [MedicationDispense](medicationdispense.html): The identity of a patient to list dispenses for\r\n* [MedicationRequest](medicationrequest.html): Returns prescriptions for a specific patient\r\n* [MedicationUsage](medicationusage.html): Returns statements for a specific patient.\r\n* [NutritionOrder](nutritionorder.html): The identity of the person who requires the diet, formula or nutritional supplement\r\n* [Observation](observation.html): The subject that the observation is about (if patient)\r\n* [Procedure](procedure.html): Search by subject - a patient\r\n* [RiskAssessment](riskassessment.html): Who/what does assessment apply to?\r\n* [ServiceRequest](servicerequest.html): Search by subject - a patient\r\n* [SupplyDelivery](supplydelivery.html): Patient for whom the item is supplied\r\n* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for\r\n", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, target={Group.class, Patient.class } )
+ @SearchParamDefinition(name="patient", path="AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUsage.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient", description="Multiple Resources: \r\n\r\n* [AllergyIntolerance](allergyintolerance.html): Who the sensitivity is for\r\n* [CarePlan](careplan.html): Who the care plan is for\r\n* [CareTeam](careteam.html): Who care team is for\r\n* [ClinicalImpression](clinicalimpression.html): Patient or group assessed\r\n* [Composition](composition.html): Who and/or what the composition is about\r\n* [Condition](condition.html): Who has the condition?\r\n* [Consent](consent.html): Who the consent applies to\r\n* [DetectedIssue](detectedissue.html): Associated patient\r\n* [DeviceRequest](devicerequest.html): Individual the service is ordered for\r\n* [DeviceUsage](deviceusage.html): Search by subject - a patient\r\n* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient\r\n* [DocumentManifest](documentmanifest.html): The subject of the set of documents\r\n* [DocumentReference](documentreference.html): Who/what is the subject of the document\r\n* [Encounter](encounter.html): The patient or group present at the encounter\r\n* [EpisodeOfCare](episodeofcare.html): The patient who is the focus of this episode of care\r\n* [FamilyMemberHistory](familymemberhistory.html): The identity of a subject to list family member history items for\r\n* [Flag](flag.html): The identity of a subject to list flags for\r\n* [Goal](goal.html): Who this goal is intended for\r\n* [ImagingStudy](imagingstudy.html): Who the study is about\r\n* [Immunization](immunization.html): The patient for the vaccination record\r\n* [List](list.html): If all resources have the same subject\r\n* [MedicationAdministration](medicationadministration.html): The identity of a patient to list administrations for\r\n* [MedicationDispense](medicationdispense.html): The identity of a patient to list dispenses for\r\n* [MedicationRequest](medicationrequest.html): Returns prescriptions for a specific patient\r\n* [MedicationUsage](medicationusage.html): Returns statements for a specific patient.\r\n* [NutritionOrder](nutritionorder.html): The identity of the person who requires the diet, formula or nutritional supplement\r\n* [Observation](observation.html): The subject that the observation is about (if patient)\r\n* [Procedure](procedure.html): Search by subject - a patient\r\n* [RiskAssessment](riskassessment.html): Who/what does assessment apply to?\r\n* [ServiceRequest](servicerequest.html): Search by subject - a patient\r\n* [SupplyDelivery](supplydelivery.html): Patient for whom the item is supplied\r\n* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for\r\n", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient") }, target={Account.class, ActivityDefinition.class, AdministrableProductDefinition.class, AdverseEvent.class, AllergyIntolerance.class, Appointment.class, AppointmentResponse.class, AuditEvent.class, Basic.class, Binary.class, BiologicallyDerivedProduct.class, BodyStructure.class, Bundle.class, CapabilityStatement.class, CapabilityStatement2.class, CarePlan.class, CareTeam.class, CatalogEntry.class, ChargeItem.class, ChargeItemDefinition.class, Citation.class, Claim.class, ClaimResponse.class, ClinicalImpression.class, ClinicalUseIssue.class, CodeSystem.class, Communication.class, CommunicationRequest.class, CompartmentDefinition.class, Composition.class, ConceptMap.class, Condition.class, ConditionDefinition.class, Consent.class, Contract.class, Coverage.class, CoverageEligibilityRequest.class, CoverageEligibilityResponse.class, DetectedIssue.class, Device.class, DeviceDefinition.class, DeviceMetric.class, DeviceRequest.class, DeviceUsage.class, DiagnosticReport.class, DocumentManifest.class, DocumentReference.class, Encounter.class, Endpoint.class, EnrollmentRequest.class, EnrollmentResponse.class, EpisodeOfCare.class, EventDefinition.class, Evidence.class, EvidenceReport.class, EvidenceVariable.class, ExampleScenario.class, ExplanationOfBenefit.class, FamilyMemberHistory.class, Flag.class, Goal.class, GraphDefinition.class, Group.class, GuidanceResponse.class, HealthcareService.class, ImagingStudy.class, Immunization.class, ImmunizationEvaluation.class, ImmunizationRecommendation.class, ImplementationGuide.class, Ingredient.class, InsurancePlan.class, InventoryReport.class, Invoice.class, Library.class, Linkage.class, ListResource.class, Location.class, ManufacturedItemDefinition.class, Measure.class, MeasureReport.class, Medication.class, MedicationAdministration.class, MedicationDispense.class, MedicationKnowledge.class, MedicationRequest.class, MedicationUsage.class, MedicinalProductDefinition.class, MessageDefinition.class, MessageHeader.class, MolecularSequence.class, NamingSystem.class, NutritionIntake.class, NutritionOrder.class, NutritionProduct.class, Observation.class, ObservationDefinition.class, OperationDefinition.class, OperationOutcome.class, Organization.class, OrganizationAffiliation.class, PackagedProductDefinition.class, Patient.class, PaymentNotice.class, PaymentReconciliation.class, Permission.class, Person.class, PlanDefinition.class, Practitioner.class, PractitionerRole.class, Procedure.class, Provenance.class, Questionnaire.class, QuestionnaireResponse.class, RegulatedAuthorization.class, RelatedPerson.class, RequestGroup.class, ResearchStudy.class, ResearchSubject.class, RiskAssessment.class, Schedule.class, SearchParameter.class, ServiceRequest.class, Slot.class, Specimen.class, SpecimenDefinition.class, StructureDefinition.class, StructureMap.class, Subscription.class, SubscriptionStatus.class, SubscriptionTopic.class, Substance.class, SubstanceDefinition.class, SubstanceNucleicAcid.class, SubstancePolymer.class, SubstanceProtein.class, SubstanceReferenceInformation.class, SubstanceSourceMaterial.class, SupplyDelivery.class, SupplyRequest.class, Task.class, TerminologyCapabilities.class, TestReport.class, TestScript.class, ValueSet.class, VerificationResult.class, VisionPrescription.class } )
public static final String SP_PATIENT = "patient";
/**
* Fluent Client search parameter constant for patient
@@ -1742,7 +1626,7 @@ public class CareTeam extends DomainResource {
* [Consent](consent.html): Who the consent applies to
* [DetectedIssue](detectedissue.html): Associated patient
* [DeviceRequest](devicerequest.html): Individual the service is ordered for
-* [DeviceUseStatement](deviceusestatement.html): Search by subject - a patient
+* [DeviceUsage](deviceusage.html): Search by subject - a patient
* [DiagnosticReport](diagnosticreport.html): The subject of the report if a patient
* [DocumentManifest](documentmanifest.html): The subject of the set of documents
* [DocumentReference](documentreference.html): Who/what is the subject of the document
@@ -1767,7 +1651,7 @@ public class CareTeam extends DomainResource {
* [VisionPrescription](visionprescription.html): The identity of a patient to list dispenses for
* Type: reference
- * Path: AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUseStatement.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient
+ * Path: AllergyIntolerance.patient | CarePlan.subject.where(resolve() is Patient) | CareTeam.subject.where(resolve() is Patient) | ClinicalImpression.subject.where(resolve() is Patient) | Composition.subject.where(resolve() is Patient) | Condition.subject.where(resolve() is Patient) | Consent.subject.where(resolve() is Patient) | DetectedIssue.patient | DeviceRequest.subject.where(resolve() is Patient) | DeviceUsage.subject | DiagnosticReport.subject.where(resolve() is Patient) | DocumentManifest.subject.where(resolve() is Patient) | DocumentReference.subject.where(resolve() is Patient) | Encounter.subject.where(resolve() is Patient) | EpisodeOfCare.patient | FamilyMemberHistory.patient | Flag.subject.where(resolve() is Patient) | Goal.subject.where(resolve() is Patient) | ImagingStudy.subject.where(resolve() is Patient) | Immunization.patient | List.subject.where(resolve() is Patient) | MedicationAdministration.subject.where(resolve() is Patient) | MedicationDispense.subject.where(resolve() is Patient) | MedicationRequest.subject.where(resolve() is Patient) | MedicationUsage.subject.where(resolve() is Patient) | NutritionOrder.patient | Observation.subject.where(resolve() is Patient) | Procedure.subject.where(resolve() is Patient) | RiskAssessment.subject.where(resolve() is Patient) | ServiceRequest.subject.where(resolve() is Patient) | SupplyDelivery.patient | VisionPrescription.patient
*
*/
public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
@@ -1778,6 +1662,118 @@ public class CareTeam extends DomainResource {
*/
public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("CareTeam:patient").toLocked();
+ /**
+ * Search parameter: category
+ *
+ * Description: Type of team
+ * Type: token
+ * Path: CareTeam.category
+ *
+ */
+ @SearchParamDefinition(name="category", path="CareTeam.category", description="Type of team", type="token" )
+ public static final String SP_CATEGORY = "category";
+ /**
+ * Fluent Client search parameter constant for category
+ *
+ * Description: Type of team
+ * Type: token
+ * Path: CareTeam.category
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY);
+
+ /**
+ * Search parameter: name
+ *
+ * Description: Name of the team, such as crisis assessment team
+ * Type: string
+ * Path: CareTeam.name | CareTeam.extension('http://hl7.org/fhir/StructureDefinition/careteam-alias')
+ *
+ */
+ @SearchParamDefinition(name="name", path="CareTeam.name | CareTeam.extension('http://hl7.org/fhir/StructureDefinition/careteam-alias')", description="Name of the team, such as crisis assessment team", type="string" )
+ public static final String SP_NAME = "name";
+ /**
+ * Fluent Client search parameter constant for name
+ *
+ * Description: Name of the team, such as crisis assessment team
+ * Type: string
+ * Path: CareTeam.name | CareTeam.extension('http://hl7.org/fhir/StructureDefinition/careteam-alias')
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME);
+
+ /**
+ * Search parameter: participant
+ *
+ * Description: Who is involved
+ * Type: reference
+ * Path: CareTeam.participant.member
+ *
+ */
+ @SearchParamDefinition(name="participant", path="CareTeam.participant.member", description="Who is involved", type="reference", providesMembershipIn={ @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Patient"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for Practitioner"), @ca.uhn.fhir.model.api.annotation.Compartment(name="Base FHIR compartment definition for RelatedPerson") }, target={CareTeam.class, Organization.class, Patient.class, Practitioner.class, PractitionerRole.class, RelatedPerson.class } )
+ public static final String SP_PARTICIPANT = "participant";
+ /**
+ * Fluent Client search parameter constant for participant
+ *
+ * Description: Who is involved
+ * Type: reference
+ * Path: CareTeam.participant.member
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARTICIPANT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARTICIPANT);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "CareTeam:participant".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_PARTICIPANT = new ca.uhn.fhir.model.api.Include("CareTeam:participant").toLocked();
+
+ /**
+ * Search parameter: status
+ *
+ * Description: proposed | active | suspended | inactive | entered-in-error
+ * Type: token
+ * Path: CareTeam.status
+ *
+ */
+ @SearchParamDefinition(name="status", path="CareTeam.status", description="proposed | active | suspended | inactive | entered-in-error", type="token" )
+ public static final String SP_STATUS = "status";
+ /**
+ * Fluent Client search parameter constant for status
+ *
+ * Description: proposed | active | suspended | inactive | entered-in-error
+ * Type: token
+ * Path: CareTeam.status
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
+ /**
+ * Search parameter: subject
+ *
+ * Description: Who care team is for
+ * Type: reference
+ * Path: CareTeam.subject
+ *
+ */
+ @SearchParamDefinition(name="subject", path="CareTeam.subject", description="Who care team is for", type="reference", target={Group.class, Patient.class } )
+ public static final String SP_SUBJECT = "subject";
+ /**
+ * Fluent Client search parameter constant for subject
+ *
+ * Description: Who care team is for
+ * Type: reference
+ * Path: CareTeam.subject
+ *
+ */
+ public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
+/**
+ * Constant for fluent queries to be used to add include statements. Specifies
+ * the path value of "CareTeam:subject".
+ */
+ public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("CareTeam:subject").toLocked();
+
}
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CatalogEntry.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CatalogEntry.java
index ef0f991e2..3edb3054d 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CatalogEntry.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CatalogEntry.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -96,7 +96,6 @@ public class CatalogEntry extends DomainResource {
case ISREPLACEDBY: return "is-replaced-by";
case EXCLUDES: return "excludes";
case INCLUDES: return "includes";
- case NULL: return null;
default: return "?";
}
}
@@ -106,7 +105,6 @@ public class CatalogEntry extends DomainResource {
case ISREPLACEDBY: return "http://hl7.org/fhir/catalogentry-relation-type";
case EXCLUDES: return "http://hl7.org/fhir/catalogentry-relation-type";
case INCLUDES: return "http://hl7.org/fhir/catalogentry-relation-type";
- case NULL: return null;
default: return "?";
}
}
@@ -116,7 +114,6 @@ public class CatalogEntry extends DomainResource {
case ISREPLACEDBY: return "the related catalog entry supersedes this one when it is not active.";
case EXCLUDES: return "The related catalog entry is excluded by this one.";
case INCLUDES: return "The item of the related catalog entry will be part of the orders containing the current item.";
- case NULL: return null;
default: return "?";
}
}
@@ -126,7 +123,6 @@ public class CatalogEntry extends DomainResource {
case ISREPLACEDBY: return "Is replaced by";
case EXCLUDES: return "Excludes";
case INCLUDES: return "Includes";
- case NULL: return null;
default: return "?";
}
}
@@ -217,7 +213,6 @@ public class CatalogEntry extends DomainResource {
case DRAFT: return "draft";
case ACTIVE: return "active";
case RETIRED: return "retired";
- case NULL: return null;
default: return "?";
}
}
@@ -226,7 +221,6 @@ public class CatalogEntry extends DomainResource {
case DRAFT: return "http://hl7.org/fhir/catalogentry-status";
case ACTIVE: return "http://hl7.org/fhir/catalogentry-status";
case RETIRED: return "http://hl7.org/fhir/catalogentry-status";
- case NULL: return null;
default: return "?";
}
}
@@ -235,7 +229,6 @@ public class CatalogEntry extends DomainResource {
case DRAFT: return "";
case ACTIVE: return "";
case RETIRED: return "";
- case NULL: return null;
default: return "?";
}
}
@@ -244,7 +237,6 @@ public class CatalogEntry extends DomainResource {
case DRAFT: return "Draft";
case ACTIVE: return "Active";
case RETIRED: return "Retired";
- case NULL: return null;
default: return "?";
}
}
@@ -399,7 +391,6 @@ public class CatalogEntry extends DomainResource {
case MEDICATION: return "Medication";
case SUBSTANCE: return "Substance";
case LOCATION: return "Location";
- case NULL: return null;
default: return "?";
}
}
@@ -418,7 +409,6 @@ public class CatalogEntry extends DomainResource {
case MEDICATION: return "http://hl7.org/fhir/catalogentry-type";
case SUBSTANCE: return "http://hl7.org/fhir/catalogentry-type";
case LOCATION: return "http://hl7.org/fhir/catalogentry-type";
- case NULL: return null;
default: return "?";
}
}
@@ -437,7 +427,6 @@ public class CatalogEntry extends DomainResource {
case MEDICATION: return "";
case SUBSTANCE: return "";
case LOCATION: return "";
- case NULL: return null;
default: return "?";
}
}
@@ -456,7 +445,6 @@ public class CatalogEntry extends DomainResource {
case MEDICATION: return "Medication";
case SUBSTANCE: return "Substance";
case LOCATION: return "Location";
- case NULL: return null;
default: return "?";
}
}
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItem.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItem.java
index 6987cc233..9fecb4c91 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItem.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItem.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -118,7 +118,6 @@ public class ChargeItem extends DomainResource {
case BILLED: return "billed";
case ENTEREDINERROR: return "entered-in-error";
case UNKNOWN: return "unknown";
- case NULL: return null;
default: return "?";
}
}
@@ -131,7 +130,6 @@ public class ChargeItem extends DomainResource {
case BILLED: return "http://hl7.org/fhir/chargeitem-status";
case ENTEREDINERROR: return "http://hl7.org/fhir/chargeitem-status";
case UNKNOWN: return "http://hl7.org/fhir/chargeitem-status";
- case NULL: return null;
default: return "?";
}
}
@@ -144,7 +142,6 @@ public class ChargeItem extends DomainResource {
case BILLED: return "The charge item has been billed (e.g. a billing engine has generated financial transactions by applying the associated ruled for the charge item to the context of the Encounter, and placed them into Claims/Invoices.";
case ENTEREDINERROR: return "The charge item has been entered in error and should not be processed for billing.";
case UNKNOWN: return "The authoring system does not know which of the status values currently applies for this charge item Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, it's just not known which one.";
- case NULL: return null;
default: return "?";
}
}
@@ -157,7 +154,6 @@ public class ChargeItem extends DomainResource {
case BILLED: return "Billed";
case ENTEREDINERROR: return "Entered in Error";
case UNKNOWN: return "Unknown";
- case NULL: return null;
default: return "?";
}
}
@@ -603,7 +599,7 @@ public class ChargeItem extends DomainResource {
*/
@Child(name = "product", type = {Device.class, Medication.class, Substance.class, CodeableConcept.class}, order=22, min=0, max=1, modifier=false, summary=false)
@Description(shortDefinition="Product charged", formalDefinition="Identifies the device, food, drug or other product being charged either by type code or reference to an instance." )
- @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/device-kind")
+ @ca.uhn.fhir.model.api.annotation.Binding(valueSet="http://hl7.org/fhir/ValueSet/device-type")
protected DataType product;
/**
@@ -2537,7 +2533,7 @@ public class ChargeItem extends DomainResource {
* Path: ChargeItem.subject.where(resolve() is Patient)
*
*/
- @SearchParamDefinition(name="patient", path="ChargeItem.subject.where(resolve() is Patient)", description="Individual service was done for/to", type="reference", target={Patient.class } )
+ @SearchParamDefinition(name="patient", path="ChargeItem.subject.where(resolve() is Patient)", description="Individual service was done for/to", type="reference", target={Group.class, Patient.class } )
public static final String SP_PATIENT = "patient";
/**
* Fluent Client search parameter constant for patient
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItemDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItemDefinition.java
index de2917ce9..a7cf47f2a 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItemDefinition.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItemDefinition.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model;
POSSIBILITY OF SUCH DAMAGE.
*/
-// Generated on Thu, Aug 20, 2020 19:42+1000 for FHIR vcurrent
+// Generated on Tue, May 4, 2021 07:17+1000 for FHIR v4.6.0
import java.util.ArrayList;
import java.util.Date;
@@ -2393,6 +2393,216 @@ public class ChargeItemDefinition extends MetadataResource {
*/
public ChargeItemDefinition setPurpose(String value) {
throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"purpose\"");
+ }
+ /**
+ * not supported on this implementation
+ */
+ @Override
+ public int getTopicMax() {
+ return 0;
+ }
+ /**
+ * @return {@link #topic} (Descriptive topics related to the content of the library. Topics provide a high-level categorization of the library that can be useful for filtering and searching.)
+ */
+ public List getTopic() {
+ return new ArrayList<>();
+ }
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public ChargeItemDefinition setTopic(List theTopic) {
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"topic\"");
+ }
+ public boolean hasTopic() {
+ return false;
+ }
+
+ public CodeableConcept addTopic() { //3
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"topic\"");
+ }
+ public ChargeItemDefinition addTopic(CodeableConcept t) { //3
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"topic\"");
+ }
+ /**
+ * @return The first repetition of repeating field {@link #topic}, creating it if it does not already exist {2}
+ */
+ public CodeableConcept getTopicFirstRep() {
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"topic\"");
+ }
+ /**
+ * not supported on this implementation
+ */
+ @Override
+ public int getAuthorMax() {
+ return 0;
+ }
+ /**
+ * @return {@link #author} (An individiual or organization primarily involved in the creation and maintenance of the charge item definition.)
+ */
+ public List getAuthor() {
+ return new ArrayList<>();
+ }
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public ChargeItemDefinition setAuthor(List theAuthor) {
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"author\"");
+ }
+ public boolean hasAuthor() {
+ return false;
+ }
+
+ public ContactDetail addAuthor() { //3
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"author\"");
+ }
+ public ChargeItemDefinition addAuthor(ContactDetail t) { //3
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"author\"");
+ }
+ /**
+ * @return The first repetition of repeating field {@link #author}, creating it if it does not already exist {2}
+ */
+ public ContactDetail getAuthorFirstRep() {
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"author\"");
+ }
+ /**
+ * not supported on this implementation
+ */
+ @Override
+ public int getEditorMax() {
+ return 0;
+ }
+ /**
+ * @return {@link #editor} (An individual or organization primarily responsible for internal coherence of the charge item definition.)
+ */
+ public List getEditor() {
+ return new ArrayList<>();
+ }
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public ChargeItemDefinition setEditor(List theEditor) {
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"editor\"");
+ }
+ public boolean hasEditor() {
+ return false;
+ }
+
+ public ContactDetail addEditor() { //3
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"editor\"");
+ }
+ public ChargeItemDefinition addEditor(ContactDetail t) { //3
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"editor\"");
+ }
+ /**
+ * @return The first repetition of repeating field {@link #editor}, creating it if it does not already exist {2}
+ */
+ public ContactDetail getEditorFirstRep() {
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"editor\"");
+ }
+ /**
+ * not supported on this implementation
+ */
+ @Override
+ public int getReviewerMax() {
+ return 0;
+ }
+ /**
+ * @return {@link #reviewer} (An individual or organization primarily responsible for review of some aspect of the charge item definition.)
+ */
+ public List getReviewer() {
+ return new ArrayList<>();
+ }
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public ChargeItemDefinition setReviewer(List theReviewer) {
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"reviewer\"");
+ }
+ public boolean hasReviewer() {
+ return false;
+ }
+
+ public ContactDetail addReviewer() { //3
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"reviewer\"");
+ }
+ public ChargeItemDefinition addReviewer(ContactDetail t) { //3
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"reviewer\"");
+ }
+ /**
+ * @return The first repetition of repeating field {@link #reviewer}, creating it if it does not already exist {2}
+ */
+ public ContactDetail getReviewerFirstRep() {
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"reviewer\"");
+ }
+ /**
+ * not supported on this implementation
+ */
+ @Override
+ public int getEndorserMax() {
+ return 0;
+ }
+ /**
+ * @return {@link #endorser} (An individual or organization responsible for officially endorsing the charge item definition for use in some setting.)
+ */
+ public List getEndorser() {
+ return new ArrayList<>();
+ }
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public ChargeItemDefinition setEndorser(List theEndorser) {
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"endorser\"");
+ }
+ public boolean hasEndorser() {
+ return false;
+ }
+
+ public ContactDetail addEndorser() { //3
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"endorser\"");
+ }
+ public ChargeItemDefinition addEndorser(ContactDetail t) { //3
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"endorser\"");
+ }
+ /**
+ * @return The first repetition of repeating field {@link #endorser}, creating it if it does not already exist {2}
+ */
+ public ContactDetail getEndorserFirstRep() {
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"endorser\"");
+ }
+ /**
+ * not supported on this implementation
+ */
+ @Override
+ public int getRelatedArtifactMax() {
+ return 0;
+ }
+ /**
+ * @return {@link #relatedArtifact} (Related artifacts such as additional documentation, justification, dependencies, bibliographic references, and predecessor and successor artifacts.)
+ */
+ public List getRelatedArtifact() {
+ return new ArrayList<>();
+ }
+ /**
+ * @return Returns a reference to this
for easy method chaining
+ */
+ public ChargeItemDefinition setRelatedArtifact(List theRelatedArtifact) {
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"relatedArtifact\"");
+ }
+ public boolean hasRelatedArtifact() {
+ return false;
+ }
+
+ public RelatedArtifact addRelatedArtifact() { //3
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"relatedArtifact\"");
+ }
+ public ChargeItemDefinition addRelatedArtifact(RelatedArtifact t) { //3
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"relatedArtifact\"");
+ }
+ /**
+ * @return The first repetition of repeating field {@link #relatedArtifact}, creating it if it does not already exist {2}
+ */
+ public RelatedArtifact getRelatedArtifactFirstRep() {
+ throw new Error("The resource type \"ChargeItemDefinition\" does not implement the property \"relatedArtifact\"");
}
protected void listChildren(List