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

Fix crash in mapping

This commit is contained in:
James Agnew 2018-08-23 16:51:35 -04:00
parent 731658eef8
commit b2741dab0d
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoConceptMapDstu3.java
View File

@ -87,7 +87,9 @@ public class FhirResourceDaoConceptMapDstu3 extends FhirResourceDaoDstu3<Concept
if (targetsToReturn.add(target)) { if (targetsToReturn.add(target)) {
translationMatch = new TranslationMatch(); translationMatch = new TranslationMatch();
translationMatch.setEquivalence(new CodeType(target.getEquivalence().toCode())); if (target.getEquivalence() != null) {
translationMatch.setEquivalence(new CodeType(target.getEquivalence().toCode()));
}
translationMatch.setConcept( translationMatch.setConcept(
new Coding() new Coding()

4
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoConceptMapR4.java
View File

@ -83,7 +83,9 @@ public class FhirResourceDaoConceptMapR4 extends FhirResourceDaoR4<ConceptMap> i
if (targetsToReturn.add(target)) { if (targetsToReturn.add(target)) {
translationMatch = new TranslationMatch(); translationMatch = new TranslationMatch();
translationMatch.setEquivalence(new CodeType(target.getEquivalence().toCode())); if (target.getEquivalence() != null) {
translationMatch.setEquivalence(new CodeType(target.getEquivalence().toCode()));
}
translationMatch.setConcept( translationMatch.setConcept(
new Coding() new Coding()

4
src/changes/changes.xml
View File

@ -289,6 +289,10 @@
was never depended on by anyone. Please post on the HAPI FHIR mailing list if this was never depended on by anyone. Please post on the HAPI FHIR mailing list if this
change affects you. change affects you.
</action> </action>
<action type="fix">
A crash was fixed when using the ConceptMap/$translate operation to translate a mapping
where the equivalence was not specified.
</action>
</release> </release>
<release version="3.4.0" date="2018-05-28"> <release version="3.4.0" date="2018-05-28">
<action type="add"> <action type="add">