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 NPE.

This commit is contained in:
Rob Hausam 2019-09-18 07:39:59 -04:00
parent a9f4ec8253
commit fca62746dc
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3932,7 +3932,7 @@ public class VersionConvertor_10_50 {
copyElement(src, tgt);
tgt.setCodeSystem(g.getSource());
tgt.setCode(src.getCode());
if (src.getNoMap() == true) {
if (src.hasNoMap() && src.getNoMap() == true) {
tgt.addTarget(new org.hl7.fhir.dstu2.model.ConceptMap.TargetElementComponent().setEquivalence(org.hl7.fhir.dstu2.model.Enumerations.ConceptMapEquivalence.UNMATCHED));
}
else {

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

@ -3271,7 +3271,7 @@ public class VersionConvertor_14_50 {
tgt.setSystem(g.getSource());
if (src.hasCode())
tgt.setCode(src.getCode());
if (src.getNoMap() == true) {
if (src.hasNoMap() && src.getNoMap() == true) {
tgt.addTarget(new org.hl7.fhir.dstu2016may.model.ConceptMap.TargetElementComponent().setEquivalence(org.hl7.fhir.dstu2016may.model.Enumerations.ConceptMapEquivalence.UNMATCHED));
}
else {

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

@ -8014,7 +8014,7 @@ public class VersionConvertor_30_50 {
tgt.setCode(src.getCode());
if (src.hasDisplay())
tgt.setDisplay(src.getDisplay());
if (src.getNoMap() == true) {
if (src.hasNoMap() && src.getNoMap() == true) {
tgt.addTarget(new org.hl7.fhir.dstu3.model.ConceptMap.TargetElementComponent().setEquivalence(org.hl7.fhir.dstu3.model.Enumerations.ConceptMapEquivalence.UNMATCHED));
}
else {

2
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/ConceptMap.java
View File

@ -215,7 +215,7 @@ public class ConceptMap extends VersionConvertor_40_50 {
tgt.setCodeElement(convertCode(src.getCodeElement()));
if (src.hasDisplay())
tgt.setDisplayElement(convertString(src.getDisplayElement()));
if (src.getNoMap() == true) {
if (src.hasNoMap() && src.getNoMap() == true) {
tgt.addTarget(new org.hl7.fhir.r4.model.ConceptMap.TargetElementComponent().setEquivalence(org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence.UNMATCHED));
}
else {