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

Merge in fix for ISSUE-2995

This commit is contained in:
juan.marchionatto 2021-09-16 13:20:00 -04:00
parent 0dfc716a82
commit c9162cba6d
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TermLoaderSvcImpl.java
View File

@ -722,7 +722,7 @@ public class TermLoaderSvcImpl implements ITermLoaderSvc {
retVal.setPublisher("Regenstrief Institute, Inc.");
retVal.setDescription("A value set that includes all LOINC codes");
retVal.setCopyright("This content from LOINC® is copyright © 1995 Regenstrief Institute, Inc. and the LOINC Committee, and available at no cost under the license at https://loinc.org/license/");
retVal.getCompose().addInclude().setSystem(ITermLoaderSvc.LOINC_URI);
retVal.getCompose().addInclude().setSystem(ITermLoaderSvc.LOINC_URI).setVersion(codeSystemVersionId);
return retVal;
}

4
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/BaseLoincHandler.java
View File

@ -22,6 +22,7 @@ package ca.uhn.fhir.jpa.term.loinc;
import ca.uhn.fhir.jpa.entity.TermConcept;
import ca.uhn.fhir.jpa.term.IZipContentsHandlerCsv;
import org.apache.commons.lang3.StringUtils;
import org.hl7.fhir.r4.model.ConceptMap;
import org.hl7.fhir.r4.model.ContactPoint;
import org.hl7.fhir.r4.model.Enumerations;
@ -74,6 +75,9 @@ public abstract class BaseLoincHandler implements IZipContentsHandlerCsv {
if (include == null) {
include = theVs.getCompose().addInclude();
include.setSystem(theCodeSystemUrl);
if (StringUtils.isNotBlank(theVs.getVersion())) {
include.setVersion(theVs.getVersion());
}
}
boolean found = false;

1
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincAnswerListHandler.java
View File

@ -104,6 +104,7 @@ public class LoincAnswerListHandler extends BaseLoincHandler {
.getCompose()
.getIncludeFirstRep()
.setSystem(ITermLoaderSvc.LOINC_URI)
.setVersion(codeSystemVersionId)
.addConcept()
.setCode(answerString)
.setDisplay(displayText);

1
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincRsnaPlaybookHandler.java
View File

@ -120,6 +120,7 @@ public class LoincRsnaPlaybookHandler extends BaseLoincHandler implements IZipCo
.getCompose()
.getIncludeFirstRep()
.setSystem(ITermLoaderSvc.LOINC_URI)
.setVersion(codeSystemVersionId)
.addConcept()
.setCode(loincNumber)
.setDisplay(longCommonName);