honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug

This commit is contained in:
Lloyd McKenzie 2019-12-27 00:29:12 -06:00
parent fff0d5a36d
commit 00e2822292
6 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_40.java
View File

@ -4746,8 +4746,9 @@ public class VersionConvertor_10_40 {
if (t.getFocusElement().hasValue())
e.addExtension(new org.hl7.fhir.r4.model.Extension("focus", new org.hl7.fhir.r4.model.StringType(t.getFocus())));
else {
org.hl7.fhir.r4.model.Extension focusE = new org.hl7.fhir.r4.model.Extension("focus");
copyElement(t.getFocusElement(), focusE);
org.hl7.fhir.r4.model.CodeType focus = new org.hl7.fhir.r4.model.CodeType();
org.hl7.fhir.r4.model.Extension focusE = new org.hl7.fhir.r4.model.Extension("focus", focus);
copyElement(t.getFocusElement(), focus);
e.addExtension(focusE);
}
e.addExtension(new org.hl7.fhir.r4.model.Extension("request", convertReference(t.getRequest())));
@ -4776,11 +4777,11 @@ public class VersionConvertor_10_40 {
event.setCategory(org.hl7.fhir.dstu2.model.Conformance.MessageSignificanceCategory.fromCode(e.getExtensionByUrl("category").getValue().toString()));
event.setMode(org.hl7.fhir.dstu2.model.Conformance.ConformanceEventMode.fromCode(e.getExtensionByUrl("mode").getValue().toString()));
org.hl7.fhir.r4.model.Extension focusE = e.getExtensionByUrl("focus");
if (focusE.hasValue())
if (focusE.getValue().hasPrimitiveValue())
event.setFocus(focusE.getValue().toString());
else {
event.setFocusElement(new org.hl7.fhir.dstu2.model.CodeType());
copyElement(focusE, event.getFocusElement());
copyElement(focusE.getValue(), event.getFocusElement());
}
event.setRequest(convertReference((org.hl7.fhir.r4.model.Reference)e.getExtensionByUrl("request").getValue()));
event.setResponse(convertReference((org.hl7.fhir.r4.model.Reference)e.getExtensionByUrl("response").getValue()));

9
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java
View File

@ -4753,8 +4753,9 @@ public class VersionConvertor_10_50 {
if (t.getFocusElement().hasValue())
e.addExtension(new org.hl7.fhir.r5.model.Extension("focus", new org.hl7.fhir.r5.model.StringType(t.getFocus())));
else {
org.hl7.fhir.r5.model.Extension focusE = new org.hl7.fhir.r5.model.Extension("focus");
copyElement(t.getFocusElement(), focusE);
org.hl7.fhir.r5.model.CodeType focus = new org.hl7.fhir.r5.model.CodeType();
org.hl7.fhir.r5.model.Extension focusE = new org.hl7.fhir.r5.model.Extension("focus", focus);
copyElement(t.getFocusElement(), focus);
e.addExtension(focusE);
}
e.addExtension(new org.hl7.fhir.r5.model.Extension("request", convertReference(t.getRequest())));
@ -4784,11 +4785,11 @@ public class VersionConvertor_10_50 {
event.setMode(org.hl7.fhir.dstu2.model.Conformance.ConformanceEventMode.fromCode(e.getExtensionByUrl("mode").getValue().toString()));
event.setCode(convertCoding((org.hl7.fhir.r5.model.Coding)e.getExtensionByUrl("code").getValue()));
org.hl7.fhir.r5.model.Extension focusE = e.getExtensionByUrl("focus");
if (focusE.hasValue())
if (focusE.getValue().hasPrimitiveValue())
event.setFocus(focusE.getValue().toString());
else {
event.setFocusElement(new org.hl7.fhir.dstu2.model.CodeType());
copyElement(focusE, event.getFocusElement());
copyElement(focusE.getValue(), event.getFocusElement());
}
event.setRequest(convertReference((org.hl7.fhir.r5.model.Reference)e.getExtensionByUrl("request").getValue()));
event.setResponse(convertReference((org.hl7.fhir.r5.model.Reference)e.getExtensionByUrl("response").getValue()));

9
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_40.java
View File

@ -4007,8 +4007,9 @@ public class VersionConvertor_14_40 {
if (t.getFocusElement().hasValue())
e.addExtension(new org.hl7.fhir.r4.model.Extension("focus", new org.hl7.fhir.r4.model.StringType(t.getFocus())));
else {
org.hl7.fhir.r4.model.Extension focusE = new org.hl7.fhir.r4.model.Extension("focus");
copyElement(t.getFocusElement(), focusE);
org.hl7.fhir.r4.model.CodeType focus = new org.hl7.fhir.r4.model.CodeType();
org.hl7.fhir.r4.model.Extension focusE = new org.hl7.fhir.r4.model.Extension("focus", focus);
copyElement(t.getFocusElement(), focus);
e.addExtension(focusE);
}
e.addExtension(new org.hl7.fhir.r4.model.Extension("request", convertReference(t.getRequest())));
@ -4043,11 +4044,11 @@ public class VersionConvertor_14_40 {
event.setCategory(org.hl7.fhir.dstu2016may.model.Conformance.MessageSignificanceCategory.fromCode(e.getExtensionByUrl("category").getValue().toString()));
event.setMode(org.hl7.fhir.dstu2016may.model.Conformance.ConformanceEventMode.fromCode(e.getExtensionByUrl("mode").getValue().toString()));
org.hl7.fhir.r4.model.Extension focusE = e.getExtensionByUrl("focus");
if (focusE.hasValue())
if (focusE.getValue().hasPrimitiveValue())
event.setFocus(focusE.getValue().toString());
else {
event.setFocusElement(new org.hl7.fhir.dstu2016may.model.CodeType());
copyElement(focusE, event.getFocusElement());
copyElement(focusE.getValue(), event.getFocusElement());
}
event.setRequest(convertReference((org.hl7.fhir.r4.model.Reference)e.getExtensionByUrl("request").getValue()));
event.setResponse(convertReference((org.hl7.fhir.r4.model.Reference)e.getExtensionByUrl("response").getValue()));

9
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_50.java
View File

@ -4019,8 +4019,9 @@ public class VersionConvertor_14_50 {
if (t.getFocusElement().hasValue())
e.addExtension(new org.hl7.fhir.r5.model.Extension("focus", new org.hl7.fhir.r5.model.StringType(t.getFocus())));
else {
org.hl7.fhir.r5.model.Extension focusE = new org.hl7.fhir.r5.model.Extension("focus");
copyElement(t.getFocusElement(), focusE);
org.hl7.fhir.r5.model.CodeType focus = new org.hl7.fhir.r5.model.CodeType();
org.hl7.fhir.r5.model.Extension focusE = new org.hl7.fhir.r5.model.Extension("focus", focus);
copyElement(t.getFocusElement(), focus);
e.addExtension(focusE);
}
e.addExtension(new org.hl7.fhir.r5.model.Extension("request", convertReference(t.getRequest())));
@ -4051,11 +4052,11 @@ public class VersionConvertor_14_50 {
event.setCategory(org.hl7.fhir.dstu2016may.model.Conformance.MessageSignificanceCategory.fromCode(e.getExtensionByUrl("category").getValue().toString()));
event.setMode(org.hl7.fhir.dstu2016may.model.Conformance.ConformanceEventMode.fromCode(e.getExtensionByUrl("mode").getValue().toString()));
org.hl7.fhir.r5.model.Extension focusE = e.getExtensionByUrl("focus");
if (focusE.hasValue())
if (focusE.getValue().hasPrimitiveValue())
event.setFocus(focusE.getValue().toString());
else {
event.setFocusElement(new org.hl7.fhir.dstu2016may.model.CodeType());
copyElement(focusE, event.getFocusElement());
copyElement(focusE.getValue(), event.getFocusElement());
}
event.setRequest(convertReference((org.hl7.fhir.r5.model.Reference)e.getExtensionByUrl("request").getValue()));
event.setResponse(convertReference((org.hl7.fhir.r5.model.Reference)e.getExtensionByUrl("response").getValue()));

13
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_40.java
View File

@ -5391,8 +5391,9 @@ public class VersionConvertor_30_40 {
if (t.getFocusElement().hasValue())
e.addExtension(new org.hl7.fhir.r4.model.Extension("focus", new org.hl7.fhir.r4.model.StringType(t.getFocus())));
else {
org.hl7.fhir.r4.model.Extension focusE = new org.hl7.fhir.r4.model.Extension("focus");
copyElement(t.getFocusElement(), focusE);
org.hl7.fhir.r4.model.CodeType focus = new org.hl7.fhir.r4.model.CodeType();
org.hl7.fhir.r4.model.Extension focusE = new org.hl7.fhir.r4.model.Extension("focus", focus);
copyElement(t.getFocusElement(), focus);
e.addExtension(focusE);
}
e.addExtension(new org.hl7.fhir.r4.model.Extension("request", convertReference(t.getRequest())));
@ -5426,14 +5427,14 @@ public class VersionConvertor_30_40 {
event.setMode(org.hl7.fhir.dstu3.model.CapabilityStatement.EventCapabilityMode.fromCode(e.getExtensionByUrl("mode").getValue().toString()));
event.setCode(convertCoding((org.hl7.fhir.r4.model.Coding)e.getExtensionByUrl("code").getValue()));
if (e.hasExtension("category"))
event.setCategory(org.hl7.fhir.dstu3.model.Conformance.MessageSignificanceCategory.fromCode(e.getExtensionByUrl("category").getValue().toString()));
event.setMode(org.hl7.fhir.dstu3.model.Conformance.ConformanceEventMode.fromCode(e.getExtensionByUrl("mode").getValue().toString()));
event.setCategory(org.hl7.fhir.dstu3.model.CapabilityStatement.MessageSignificanceCategory.fromCode(e.getExtensionByUrl("category").getValue().toString()));
event.setMode(org.hl7.fhir.dstu3.model.CapabilityStatement.EventCapabilityMode.fromCode(e.getExtensionByUrl("mode").getValue().toString()));
org.hl7.fhir.r4.model.Extension focusE = e.getExtensionByUrl("focus");
if (focusE.hasValue())
if (focusE.getValue().hasPrimitiveValue())
event.setFocus(focusE.getValue().toString());
else {
event.setFocusElement(new org.hl7.fhir.dstu3.model.CodeType());
copyElement(focusE, event.getFocusElement());
copyElement(focusE.getValue(), event.getFocusElement());
}
event.setRequest(convertReference((org.hl7.fhir.r4.model.Reference)e.getExtensionByUrl("request").getValue()));
event.setResponse(convertReference((org.hl7.fhir.r4.model.Reference)e.getExtensionByUrl("response").getValue()));

9
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java
View File

@ -5378,8 +5378,9 @@ public class VersionConvertor_30_50 {
if (t.getFocusElement().hasValue())
e.addExtension(new org.hl7.fhir.r5.model.Extension("focus", new org.hl7.fhir.r5.model.StringType(t.getFocus())));
else {
org.hl7.fhir.r5.model.Extension focusE = new org.hl7.fhir.r5.model.Extension("focus");
copyElement(t.getFocusElement(), focusE);
org.hl7.fhir.r5.model.CodeType focus = new org.hl7.fhir.r5.model.CodeType();
org.hl7.fhir.r5.model.Extension focusE = new org.hl7.fhir.r5.model.Extension("focus", focus);
copyElement(t.getFocusElement(), focus);
e.addExtension(focusE);
}
e.addExtension(new org.hl7.fhir.r5.model.Extension("request", convertReference(t.getRequest())));
@ -5412,11 +5413,11 @@ public class VersionConvertor_30_50 {
event.setCategory(org.hl7.fhir.dstu3.model.CapabilityStatement.MessageSignificanceCategory.fromCode(e.getExtensionByUrl("category").getValue().toString()));
event.setMode(org.hl7.fhir.dstu3.model.CapabilityStatement.EventCapabilityMode.fromCode(e.getExtensionByUrl("mode").getValue().toString()));
org.hl7.fhir.r5.model.Extension focusE = e.getExtensionByUrl("focus");
if (focusE.hasValue())
if (focusE.getValue().hasPrimitiveValue())
event.setFocus(focusE.getValue().toString());
else {
event.setFocusElement(new org.hl7.fhir.dstu3.model.CodeType());
copyElement(focusE, event.getFocusElement());
copyElement(focusE.getValue(), event.getFocusElement());
}
event.setRequest(convertReference((org.hl7.fhir.r5.model.Reference)e.getExtensionByUrl("request").getValue()));
event.setResponse(convertReference((org.hl7.fhir.r5.model.Reference)e.getExtensionByUrl("response").getValue()));