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

fix convertors for ConceptMap and remove debugging statement

This commit is contained in:
Grahame Grieve 2020-02-19 09:11:56 +11:00
parent 2a51df3ddf
commit cb028e70d3
5 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/ConceptMap10_50.java
View File

@ -134,14 +134,19 @@ public class ConceptMap10_50 {
switch(src.getValue()) { switch(src.getValue()) {
case EQUIVALENT: case EQUIVALENT:
tgt.setValue(org.hl7.fhir.dstu2.model.Enumerations.ConceptMapEquivalence.EQUIVALENT); tgt.setValue(org.hl7.fhir.dstu2.model.Enumerations.ConceptMapEquivalence.EQUIVALENT);
break;
case BROADER: case BROADER:
tgt.setValue(org.hl7.fhir.dstu2.model.Enumerations.ConceptMapEquivalence.WIDER); tgt.setValue(org.hl7.fhir.dstu2.model.Enumerations.ConceptMapEquivalence.WIDER);
break;
case NARROWER: case NARROWER:
tgt.setValue(org.hl7.fhir.dstu2.model.Enumerations.ConceptMapEquivalence.NARROWER); tgt.setValue(org.hl7.fhir.dstu2.model.Enumerations.ConceptMapEquivalence.NARROWER);
break;
case NOTRELATEDTO: case NOTRELATEDTO:
tgt.setValue(org.hl7.fhir.dstu2.model.Enumerations.ConceptMapEquivalence.DISJOINT); tgt.setValue(org.hl7.fhir.dstu2.model.Enumerations.ConceptMapEquivalence.DISJOINT);
break;
default: default:
tgt.setValue(org.hl7.fhir.dstu2.model.Enumerations.ConceptMapEquivalence.NULL); tgt.setValue(org.hl7.fhir.dstu2.model.Enumerations.ConceptMapEquivalence.NULL);
break;
} }
} }
return tgt; return tgt;
@ -157,24 +162,34 @@ public class ConceptMap10_50 {
switch(src.getValue()) { switch(src.getValue()) {
case EQUIVALENT: case EQUIVALENT:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT);
break;
case EQUAL: case EQUAL:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT);
break;
case WIDER: case WIDER:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER);
break;
case SUBSUMES: case SUBSUMES:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER);
break;
case NARROWER: case NARROWER:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER);
break;
case SPECIALIZES: case SPECIALIZES:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER);
break;
case INEXACT: case INEXACT:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.RELATEDTO); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.RELATEDTO);
break;
case UNMATCHED: case UNMATCHED:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL);
break;
case DISJOINT: case DISJOINT:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NOTRELATEDTO); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NOTRELATEDTO);
break;
default: default:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL);
break;
} }
return tgt; return tgt;
} }

15
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/ConceptMap14_50.java
View File

@ -142,14 +142,19 @@ public class ConceptMap14_50 {
switch(src.getValue()) { switch(src.getValue()) {
case EQUIVALENT: case EQUIVALENT:
tgt.setValue(org.hl7.fhir.dstu2016may.model.Enumerations.ConceptMapEquivalence.EQUIVALENT); tgt.setValue(org.hl7.fhir.dstu2016may.model.Enumerations.ConceptMapEquivalence.EQUIVALENT);
break;
case BROADER: case BROADER:
tgt.setValue(org.hl7.fhir.dstu2016may.model.Enumerations.ConceptMapEquivalence.WIDER); tgt.setValue(org.hl7.fhir.dstu2016may.model.Enumerations.ConceptMapEquivalence.WIDER);
break;
case NARROWER: case NARROWER:
tgt.setValue(org.hl7.fhir.dstu2016may.model.Enumerations.ConceptMapEquivalence.NARROWER); tgt.setValue(org.hl7.fhir.dstu2016may.model.Enumerations.ConceptMapEquivalence.NARROWER);
break;
case NOTRELATEDTO: case NOTRELATEDTO:
tgt.setValue(org.hl7.fhir.dstu2016may.model.Enumerations.ConceptMapEquivalence.DISJOINT); tgt.setValue(org.hl7.fhir.dstu2016may.model.Enumerations.ConceptMapEquivalence.DISJOINT);
break;
default: default:
tgt.setValue(org.hl7.fhir.dstu2016may.model.Enumerations.ConceptMapEquivalence.NULL); tgt.setValue(org.hl7.fhir.dstu2016may.model.Enumerations.ConceptMapEquivalence.NULL);
break;
} }
} }
return tgt; return tgt;
@ -165,24 +170,34 @@ public class ConceptMap14_50 {
switch(src.getValue()) { switch(src.getValue()) {
case EQUIVALENT: case EQUIVALENT:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT);
break;
case EQUAL: case EQUAL:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT);
break;
case WIDER: case WIDER:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER);
break;
case SUBSUMES: case SUBSUMES:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER);
break;
case NARROWER: case NARROWER:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER);
break;
case SPECIALIZES: case SPECIALIZES:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER);
break;
case INEXACT: case INEXACT:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.RELATEDTO); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.RELATEDTO);
break;
case UNMATCHED: case UNMATCHED:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL);
break;
case DISJOINT: case DISJOINT:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NOTRELATEDTO); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NOTRELATEDTO);
break;
default: default:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL);
break;
} }
return tgt; return tgt;
} }

15
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/ConceptMap30_50.java
View File

@ -206,14 +206,19 @@ public class ConceptMap30_50 {
switch(src.getValue()) { switch(src.getValue()) {
case EQUIVALENT: case EQUIVALENT:
tgt.setValue(org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence.EQUIVALENT); tgt.setValue(org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence.EQUIVALENT);
break;
case BROADER: case BROADER:
tgt.setValue(org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence.WIDER); tgt.setValue(org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence.WIDER);
break;
case NARROWER: case NARROWER:
tgt.setValue(org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence.NARROWER); tgt.setValue(org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence.NARROWER);
break;
case NOTRELATEDTO: case NOTRELATEDTO:
tgt.setValue(org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence.DISJOINT); tgt.setValue(org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence.DISJOINT);
break;
default: default:
tgt.setValue(org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence.NULL); tgt.setValue(org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence.NULL);
break;
} }
} }
return tgt; return tgt;
@ -229,24 +234,34 @@ public class ConceptMap30_50 {
switch(src.getValue()) { switch(src.getValue()) {
case EQUIVALENT: case EQUIVALENT:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT);
break;
case EQUAL: case EQUAL:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT);
break;
case WIDER: case WIDER:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER);
break;
case SUBSUMES: case SUBSUMES:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER);
break;
case NARROWER: case NARROWER:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER);
break;
case SPECIALIZES: case SPECIALIZES:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER);
break;
case INEXACT: case INEXACT:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.RELATEDTO); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.RELATEDTO);
break;
case UNMATCHED: case UNMATCHED:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL);
break;
case DISJOINT: case DISJOINT:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NOTRELATEDTO); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NOTRELATEDTO);
break;
default: default:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL);
break;
} }
return tgt; return tgt;
} }

15
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ConceptMap40_50.java
View File

@ -258,14 +258,19 @@ public class ConceptMap40_50 extends VersionConvertor_40_50 {
switch(src.getValue()) { switch(src.getValue()) {
case EQUIVALENT: case EQUIVALENT:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence.EQUIVALENT); tgt.setValue(org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence.EQUIVALENT);
break;
case BROADER: case BROADER:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence.WIDER); tgt.setValue(org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence.WIDER);
break;
case NARROWER: case NARROWER:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence.NARROWER); tgt.setValue(org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence.NARROWER);
break;
case NOTRELATEDTO: case NOTRELATEDTO:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence.DISJOINT); tgt.setValue(org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence.DISJOINT);
break;
default: default:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence.NULL); tgt.setValue(org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence.NULL);
break;
} }
} }
return tgt; return tgt;
@ -281,24 +286,34 @@ public class ConceptMap40_50 extends VersionConvertor_40_50 {
switch(src.getValue()) { switch(src.getValue()) {
case EQUIVALENT: case EQUIVALENT:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT);
break;
case EQUAL: case EQUAL:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.EQUIVALENT);
break;
case WIDER: case WIDER:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER);
break;
case SUBSUMES: case SUBSUMES:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.BROADER);
break;
case NARROWER: case NARROWER:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER);
break;
case SPECIALIZES: case SPECIALIZES:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NARROWER);
break;
case INEXACT: case INEXACT:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.RELATEDTO); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.RELATEDTO);
break;
case UNMATCHED: case UNMATCHED:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL);
break;
case DISJOINT: case DISJOINT:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NOTRELATEDTO); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NOTRELATEDTO);
break;
default: default:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.ConceptMapRelationship.NULL);
break;
} }
return tgt; return tgt;
} }

1
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NarrativeGenerator.java
View File

@ -4831,7 +4831,6 @@ public class NarrativeGenerator implements INarrativeGenerator {
} }
public XhtmlNode renderBundle(Bundle b) throws FHIRException { public XhtmlNode renderBundle(Bundle b) throws FHIRException {
System.out.println("render "+b.getId());
if (b.getType() == BundleType.DOCUMENT) { if (b.getType() == BundleType.DOCUMENT) {
if (!b.hasEntry() || !(b.getEntryFirstRep().hasResource() && b.getEntryFirstRep().getResource() instanceof Composition)) if (!b.hasEntry() || !(b.getEntryFirstRep().hasResource() && b.getEntryFirstRep().getResource() instanceof Composition))
throw new FHIRException("Invalid document - first entry is not a Composition"); throw new FHIRException("Invalid document - first entry is not a Composition");