Allw successful deletion of concept maps

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

@@ -160,14 +160,17 @@ public class FhirResourceDaoConceptMapDstu3 extends FhirResourceDaoDstu3<Concept
 													 boolean theUpdateVersion, Date theUpdateTime, boolean theForceUpdate, boolean theCreateNewHistoryEntry) {
 		ResourceTable retVal = super.updateEntity(theRequestDetails, theResource, theEntity, theDeletedTimestampOrNull, thePerformIndexing, theUpdateVersion, theUpdateTime, theForceUpdate, theCreateNewHistoryEntry);
 
-		ConceptMap conceptMap = (ConceptMap) theResource;
+		if (retVal.getDeleted() == null) {
-
-		// Convert from DSTU3 to R4
 			try {
-			myHapiTerminologySvc.storeTermConceptMapAndChildren(retVal, VersionConvertor_30_40.convertConceptMap(conceptMap));
+				ConceptMap conceptMap = (ConceptMap) theResource;
+				org.hl7.fhir.r4.model.ConceptMap converted = VersionConvertor_30_40.convertConceptMap(conceptMap);
+				myHapiTerminologySvc.storeTermConceptMapAndChildren(retVal, converted);
 			} catch (FHIRException fe) {
 				throw new InternalErrorException(fe);
 			}
+		} else {
+			myHapiTerminologySvc.deleteConceptMapAndChildren(retVal);
+		}
 
 		return retVal;
 	}

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

@@ -156,9 +156,12 @@ public class FhirResourceDaoConceptMapR4 extends FhirResourceDaoR4<ConceptMap> i
 													 boolean theUpdateVersion, Date theUpdateTime, boolean theForceUpdate, boolean theCreateNewHistoryEntry) {
 		ResourceTable retVal = super.updateEntity(theRequestDetails, theResource, theEntity, theDeletedTimestampOrNull, thePerformIndexing, theUpdateVersion, theUpdateTime, theForceUpdate, theCreateNewHistoryEntry);
 
+		if (retVal.getDeleted() == null) {
 			ConceptMap conceptMap = (ConceptMap) theResource;
-
 			myHapiTerminologySvc.storeTermConceptMapAndChildren(retVal, conceptMap);
+		} else {
+			myHapiTerminologySvc.deleteConceptMapAndChildren(retVal);
+		}
 
 		return retVal;
 	}

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvcImpl.java

@@ -162,14 +162,6 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
 		}
 	}
 
-	private void removeCodeFromExpansion(String theCodeSystem, String theCode, ValueSet.ValueSetExpansionComponent theExpansionComponent) {
-		theExpansionComponent
-			.getContains()
-			.removeIf(t ->
-				theCodeSystem.equals(t.getSystem()) &&
-					theCode.equals(t.getCode()));
-	}
-
 	private void addConceptsToList(ValueSet.ValueSetExpansionComponent theExpansionComponent, Set<String> theAddedCodes, String theSystem, List<CodeSystem.ConceptDefinitionComponent> theConcept, boolean theAdd) {
 		for (CodeSystem.ConceptDefinitionComponent next : theConcept) {
 			if (theAdd && theAddedCodes.add(next.getCode())) {
@@ -281,6 +273,130 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
 		myEntityManager.flush();
 	}
 
+	public void deleteCodeSystemVersion(Long theCodeSystemVersionPid) {
+		ourLog.info(" * Deleting code system version {}", theCodeSystemVersionPid);
+
+		PageRequest page = PageRequest.of(0, 1000);
+		int count;
+
+		// Parent/Child links
+		ourLog.info(" * Deleting parent/child links");
+		count = 0;
+		while (true) {
+			Slice<TermConceptParentChildLink> link = myConceptParentChildLinkDao.findByCodeSystemVersion(page, theCodeSystemVersionPid);
+			if (link.hasContent() == false) {
+				break;
+			}
+
+			myConceptParentChildLinkDao.deleteInBatch(link);
+
+			count += link.getNumberOfElements();
+			ourLog.info(" * {} parent/child links deleted", count);
+		}
+		myConceptParentChildLinkDao.flush();
+
+		// Properties
+		ourLog.info(" * Deleting properties");
+		count = 0;
+		while (true) {
+			Slice<TermConceptProperty> link = myConceptPropertyDao.findByCodeSystemVersion(page, theCodeSystemVersionPid);
+			if (link.hasContent() == false) {
+				break;
+			}
+
+			myConceptPropertyDao.deleteInBatch(link);
+
+			count += link.getNumberOfElements();
+			ourLog.info(" * {} concept properties deleted", count);
+		}
+		myConceptPropertyDao.flush();
+
+		// Properties
+		ourLog.info(" * Deleting designations");
+		count = 0;
+		while (true) {
+			Slice<TermConceptDesignation> link = myConceptDesignationDao.findByCodeSystemVersion(page, theCodeSystemVersionPid);
+			if (link.hasContent() == false) {
+				break;
+			}
+
+			myConceptDesignationDao.deleteInBatch(link);
+
+			count += link.getNumberOfElements();
+			ourLog.info(" * {} concept designations deleted", count);
+		}
+		myConceptDesignationDao.flush();
+
+		// Concepts
+		ourLog.info(" * Deleting concepts");
+		count = 0;
+		while (true) {
+			Slice<TermConcept> link = myConceptDao.findByCodeSystemVersion(page, theCodeSystemVersionPid);
+			if (link.hasContent() == false) {
+				break;
+			}
+
+			myConceptDao.deleteInBatch(link);
+			myConceptDao.flush();
+
+			count += link.getNumberOfElements();
+			ourLog.info(" * {} concepts deleted", count);
+		}
+
+		Optional<TermCodeSystem> codeSystemOpt = myCodeSystemDao.findWithCodeSystemVersionAsCurrentVersion(theCodeSystemVersionPid);
+		if (codeSystemOpt.isPresent()) {
+			TermCodeSystem codeSystem = codeSystemOpt.get();
+			ourLog.info(" * Removing code system version {} as current version of code system {}", theCodeSystemVersionPid, codeSystem.getPid());
+			codeSystem.setCurrentVersion(null);
+			myCodeSystemDao.save(codeSystem);
+		}
+
+		ourLog.info(" * Deleting code system version");
+		myCodeSystemVersionDao.deleteById(theCodeSystemVersionPid);
+
+	}
+
+	public void deleteConceptMap(ResourceTable theResourceTable) {
+		// Get existing entity so it can be deleted.
+		Optional<TermConceptMap> optionalExistingTermConceptMapById = myConceptMapDao.findTermConceptMapByResourcePid(theResourceTable.getId());
+
+		if (optionalExistingTermConceptMapById.isPresent()) {
+			TermConceptMap existingTermConceptMap = optionalExistingTermConceptMapById.get();
+
+			ourLog.info("Deleting existing TermConceptMap {} and its children...", existingTermConceptMap.getId());
+			for (TermConceptMapGroup group : existingTermConceptMap.getConceptMapGroups()) {
+
+				for (TermConceptMapGroupElement element : group.getConceptMapGroupElements()) {
+
+					for (TermConceptMapGroupElementTarget target : element.getConceptMapGroupElementTargets()) {
+
+						myConceptMapGroupElementTargetDao.deleteTermConceptMapGroupElementTargetById(target.getId());
+					}
+
+					myConceptMapGroupElementDao.deleteTermConceptMapGroupElementById(element.getId());
+				}
+
+				myConceptMapGroupDao.deleteTermConceptMapGroupById(group.getId());
+			}
+
+			myConceptMapDao.deleteTermConceptMapById(existingTermConceptMap.getId());
+			ourLog.info("Done deleting existing TermConceptMap {} and its children.", existingTermConceptMap.getId());
+
+			ourLog.info("Flushing...");
+			myConceptMapGroupElementTargetDao.flush();
+			myConceptMapGroupElementDao.flush();
+			myConceptMapGroupDao.flush();
+			myConceptMapDao.flush();
+			ourLog.info("Done flushing.");
+		}
+	}
+
+	@Override
+	@Transactional
+	public void deleteConceptMapAndChildren(ResourceTable theResourceTable) {
+		deleteConceptMap(theResourceTable);
+	}
+
 	private int ensureParentsSaved(Collection<TermConceptParentChildLink> theParents) {
 		ourLog.trace("Checking {} parents", theParents.size());
 		int retVal = 0;
@@ -323,6 +439,19 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
 		return valueSet;
 	}
 
+	protected List<VersionIndependentConcept> expandValueSetAndReturnVersionIndependentConcepts(org.hl7.fhir.r4.model.ValueSet theValueSetToExpandR4) {
+		org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionComponent expandedR4 = expandValueSet(theValueSetToExpandR4).getExpansion();
+
+		ArrayList<VersionIndependentConcept> retVal = new ArrayList<>();
+		for (org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionContainsComponent nextContains : expandedR4.getContains()) {
+			retVal.add(
+				new VersionIndependentConcept()
+					.setSystem(nextContains.getSystem())
+					.setCode(nextContains.getCode()));
+		}
+		return retVal;
+	}
+
 	public void expandValueSetHandleIncludeOrExclude(ValueSet.ValueSetExpansionComponent theExpansionComponent, Set<String> theAddedCodes, ValueSet.ConceptSetComponent include, boolean theAdd) {
 		String system = include.getSystem();
 		if (isNotBlank(system)) {
@@ -479,19 +608,6 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
 		}
 	}
 
-	protected List<VersionIndependentConcept> expandValueSetAndReturnVersionIndependentConcepts(org.hl7.fhir.r4.model.ValueSet theValueSetToExpandR4) {
-		org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionComponent expandedR4 = expandValueSet(theValueSetToExpandR4).getExpansion();
-
-		ArrayList<VersionIndependentConcept> retVal = new ArrayList<>();
-		for (org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionContainsComponent nextContains : expandedR4.getContains()) {
-			retVal.add(
-				new VersionIndependentConcept()
-					.setSystem(nextContains.getSystem())
-					.setCode(nextContains.getCode()));
-		}
-		return retVal;
-	}
-
 	private void fetchChildren(TermConcept theConcept, Set<TermConcept> theSetToPopulate) {
 		for (TermConceptParentChildLink nextChildLink : theConcept.getChildren()) {
 			TermConcept nextChild = nextChildLink.getChild();
@@ -794,6 +910,14 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
 
 	}
 
+	private void removeCodeFromExpansion(String theCodeSystem, String theCode, ValueSet.ValueSetExpansionComponent theExpansionComponent) {
+		theExpansionComponent
+			.getContains()
+			.removeIf(t ->
+				theCodeSystem.equals(t.getSystem()) &&
+					theCode.equals(t.getCode()));
+	}
+
 	private int saveConcept(TermConcept theConcept) {
 		int retVal = 0;
 
@@ -841,7 +965,7 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
 
 		TransactionTemplate tt = new TransactionTemplate(myTransactionMgr);
 		tt.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRES_NEW);
-		if(!myDeferredConcepts.isEmpty() || !myConceptLinksToSaveLater.isEmpty()) {
+		if (!myDeferredConcepts.isEmpty() || !myConceptLinksToSaveLater.isEmpty()) {
 			tt.execute(t -> {
 				processDeferredConcepts();
 				return null;
@@ -972,89 +1096,6 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
 		}
 	}
 
-	public void deleteCodeSystemVersion(Long theCodeSystemVersionPid) {
-		ourLog.info(" * Deleting code system version {}", theCodeSystemVersionPid);
-
-		PageRequest page = PageRequest.of(0, 1000);
-		int count;
-
-		// Parent/Child links
-		ourLog.info(" * Deleting parent/child links");
-		count = 0;
-		while (true) {
-			Slice<TermConceptParentChildLink> link = myConceptParentChildLinkDao.findByCodeSystemVersion(page, theCodeSystemVersionPid);
-			if (link.hasContent() == false) {
-				break;
-			}
-
-			myConceptParentChildLinkDao.deleteInBatch(link);
-
-			count += link.getNumberOfElements();
-			ourLog.info(" * {} parent/child links deleted", count);
-		}
-		myConceptParentChildLinkDao.flush();
-
-		// Properties
-		ourLog.info(" * Deleting properties");
-		count = 0;
-		while (true) {
-			Slice<TermConceptProperty> link = myConceptPropertyDao.findByCodeSystemVersion(page, theCodeSystemVersionPid);
-			if (link.hasContent() == false) {
-				break;
-			}
-
-			myConceptPropertyDao.deleteInBatch(link);
-
-			count += link.getNumberOfElements();
-			ourLog.info(" * {} concept properties deleted", count);
-		}
-		myConceptPropertyDao.flush();
-
-		// Properties
-		ourLog.info(" * Deleting designations");
-		count = 0;
-		while (true) {
-			Slice<TermConceptDesignation> link = myConceptDesignationDao.findByCodeSystemVersion(page, theCodeSystemVersionPid);
-			if (link.hasContent() == false) {
-				break;
-			}
-
-			myConceptDesignationDao.deleteInBatch(link);
-
-			count += link.getNumberOfElements();
-			ourLog.info(" * {} concept designations deleted", count);
-		}
-		myConceptDesignationDao.flush();
-
-		// Concepts
-		ourLog.info(" * Deleting concepts");
-		count = 0;
-		while (true) {
-			Slice<TermConcept> link = myConceptDao.findByCodeSystemVersion(page, theCodeSystemVersionPid);
-			if (link.hasContent() == false) {
-				break;
-			}
-
-			myConceptDao.deleteInBatch(link);
-			myConceptDao.flush();
-
-			count += link.getNumberOfElements();
-			ourLog.info(" * {} concepts deleted", count);
-		}
-
-		Optional<TermCodeSystem> codeSystemOpt = myCodeSystemDao.findWithCodeSystemVersionAsCurrentVersion(theCodeSystemVersionPid);
-		if (codeSystemOpt.isPresent()) {
-			TermCodeSystem codeSystem = codeSystemOpt.get();
-			ourLog.info(" * Removing code system version {} as current version of code system {}", theCodeSystemVersionPid, codeSystem.getPid());
-			codeSystem.setCurrentVersion(null);
-			myCodeSystemDao.save(codeSystem);
-		}
-
-		ourLog.info(" * Deleting code system version");
-		myCodeSystemVersionDao.deleteById(theCodeSystemVersionPid);
-
-	}
-
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED)
 	public IIdType storeNewCodeSystemVersion(CodeSystem theCodeSystemResource, TermCodeSystemVersion theCodeSystemVersion, RequestDetails theRequestDetails, List<ValueSet> theValueSets, List<ConceptMap> theConceptMaps) {
@@ -1088,42 +1129,10 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
 		termConceptMap.setResource(theResourceTable);
 		termConceptMap.setUrl(theConceptMap.getUrl());
 
-		// Get existing entity so it can be deleted.
-		Optional<TermConceptMap> optionalExistingTermConceptMapById = myConceptMapDao.findTermConceptMapByResourcePid(theResourceTable.getId());
-
 		/*
 		 * For now we always delete old versions. At some point, it would be nice to allow configuration to keep old versions.
 		 */
-
+		deleteConceptMap(theResourceTable);
-		if (optionalExistingTermConceptMapById.isPresent()) {
-			TermConceptMap existingTermConceptMap = optionalExistingTermConceptMapById.get();
-
-			ourLog.info("Deleting existing TermConceptMap {} and its children...", existingTermConceptMap.getId());
-			for (TermConceptMapGroup group : existingTermConceptMap.getConceptMapGroups()) {
-
-				for (TermConceptMapGroupElement element : group.getConceptMapGroupElements()) {
-
-					for (TermConceptMapGroupElementTarget target : element.getConceptMapGroupElementTargets()) {
-
-						myConceptMapGroupElementTargetDao.deleteTermConceptMapGroupElementTargetById(target.getId());
-					}
-
-					myConceptMapGroupElementDao.deleteTermConceptMapGroupElementById(element.getId());
-				}
-
-				myConceptMapGroupDao.deleteTermConceptMapGroupById(group.getId());
-			}
-
-			myConceptMapDao.deleteTermConceptMapById(existingTermConceptMap.getId());
-			ourLog.info("Done deleting existing TermConceptMap {} and its children.", existingTermConceptMap.getId());
-
-			ourLog.info("Flushing...");
-			myConceptMapGroupElementTargetDao.flush();
-			myConceptMapGroupElementDao.flush();
-			myConceptMapGroupDao.flush();
-			myConceptMapDao.flush();
-			ourLog.info("Done flushing.");
-		}
 
 		/*
 		 * Do the upload.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IHapiTerminologySvc.java

@@ -68,6 +68,8 @@ public interface IHapiTerminologySvc {
 	 */
 	IIdType storeNewCodeSystemVersion(org.hl7.fhir.r4.model.CodeSystem theCodeSystemResource, TermCodeSystemVersion theCodeSystemVersion, RequestDetails theRequestDetails, List<org.hl7.fhir.r4.model.ValueSet> theValueSets, List<org.hl7.fhir.r4.model.ConceptMap> theConceptMaps);
 
+	void deleteConceptMapAndChildren(ResourceTable theResourceTable);
+
 	void storeTermConceptMapAndChildren(ResourceTable theResourceTable, ConceptMap theConceptMap);
 
 	boolean supportsSystem(String theCodeSystem);

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcImpl.java

@@ -288,6 +288,13 @@ public class TerminologyLoaderSvcImpl implements IHapiTerminologyLoaderSvc {
 		handler = new LoincAnswerListLinkHandler(code2concept, valueSets);
 		iterateOverZipFile(theDescriptors, LOINC_ANSWERLIST_LINK_FILE, handler, ',', QuoteMode.NON_NUMERIC, false);
 
+		// RSNA Playbook file
+		// Note that this should come before the "Part Related Code Mapping"
+		// file because there are some duplicate mappings between these
+		// two files, and the RSNA Playbook file has more metadata
+		handler = new LoincRsnaPlaybookHandler(code2concept, valueSets, conceptMaps, uploadProperties);
+		iterateOverZipFile(theDescriptors, LOINC_RSNA_PLAYBOOK_FILE, handler, ',', QuoteMode.NON_NUMERIC, false);
+
 		// Part link file
 		handler = new LoincPartLinkHandler(codeSystemVersion, code2concept);
 		iterateOverZipFile(theDescriptors, LOINC_PART_LINK_FILE, handler, ',', QuoteMode.NON_NUMERIC, false);
@@ -300,10 +307,6 @@ public class TerminologyLoaderSvcImpl implements IHapiTerminologyLoaderSvc {
 		handler = new LoincDocumentOntologyHandler(code2concept, propertyNamesToTypes, valueSets, conceptMaps, uploadProperties);
 		iterateOverZipFile(theDescriptors, LOINC_DOCUMENT_ONTOLOGY_FILE, handler, ',', QuoteMode.NON_NUMERIC, false);
 
-		// RSNA Playbook file
-		handler = new LoincRsnaPlaybookHandler(code2concept, valueSets, conceptMaps, uploadProperties);
-		iterateOverZipFile(theDescriptors, LOINC_RSNA_PLAYBOOK_FILE, handler, ',', QuoteMode.NON_NUMERIC, false);
-
 		// Top 2000 Codes - US
 		handler = new LoincTop2000LabResultsUsHandler(code2concept, valueSets, conceptMaps, uploadProperties);
 		iterateOverZipFile(theDescriptors, LOINC_TOP2000_COMMON_LAB_RESULTS_US_FILE, handler, ',', QuoteMode.NON_NUMERIC, false);

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

@@ -26,6 +26,8 @@ import org.hl7.fhir.r4.model.ConceptMap;
 import org.hl7.fhir.r4.model.ContactPoint;
 import org.hl7.fhir.r4.model.Enumerations;
 import org.hl7.fhir.r4.model.ValueSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.List;
@@ -35,8 +37,9 @@ import java.util.Properties;
 import static org.apache.commons.lang3.StringUtils.*;
 
 public abstract class BaseLoincHandler implements IRecordHandler {
-
+	private static final Logger ourLog = LoggerFactory.getLogger(BaseLoincHandler.class);
 	public static final String LOINC_COPYRIGHT_STATEMENT = "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/";
+
 	/**
 	 * This is <b>NOT</b> the LOINC CodeSystem URI! It is just
 	 * the website URL to LOINC.
@@ -177,6 +180,8 @@ public abstract class BaseLoincHandler implements IRecordHandler {
 				.setCode(theMapping.getTargetCode())
 				.setDisplay(theMapping.getTargetDisplay())
 				.setEquivalence(theMapping.getEquivalence());
+		} else {
+			ourLog.info("Not going to add a mapping from [{}/{}] to [{}/{}] because one already exists", theMapping.getSourceCodeSystem(), theMapping.getSourceCode(), theMapping.getTargetCodeSystem(), theMapping.getTargetCode());
 		}
 	}
 

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincIeeeMedicalDeviceCodeHandler.java

@@ -37,7 +37,7 @@ import static org.apache.commons.lang3.StringUtils.trim;
 public class LoincIeeeMedicalDeviceCodeHandler extends BaseLoincHandler implements IRecordHandler {
 
 	public static final String LOINC_IEEE_CM_ID = "LOINC-IEEE-MEDICAL-DEVICE-CM";
-	public static final String LOINC_IEEE_CM_URI = "http://loinc.org/fhir/loinc-ieee-device-code-mappings";
+	public static final String LOINC_IEEE_CM_URI = "http://loinc.org/cm/loinc-to-ieee-device-codes";
 	public static final String LOINC_IEEE_CM_NAME = "LOINC/IEEE Device Code Mappings";
 	private static final String CM_COPYRIGHT = "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/. The LOINC/IEEE Medical Device Code Mapping Table contains content from IEEE (http://ieee.org), copyright © 2017 IEEE.";
 

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincImagingDocumentCodeHandler.java

@@ -36,7 +36,7 @@ import static org.apache.commons.lang3.StringUtils.trim;
 public class LoincImagingDocumentCodeHandler extends BaseLoincHandler implements IRecordHandler {
 
 	public static final String VS_ID = "loinc-imaging-document-codes";
-	public static final String VS_URI = "http://loinc.org/fhir/loinc-imaging-document-codes";
+	public static final String VS_URI = "http://loinc.org/vs/loinc-imaging-document-codes";
 	public static final String VS_NAME = "LOINC Imaging Document Codes";
 
 	public LoincImagingDocumentCodeHandler(Map<String, TermConcept> theCode2concept, List<ValueSet> theValueSets, List<ConceptMap> theConceptMaps, Properties theUploadProperties) {

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincPartRelatedCodeMappingHandler.java

@@ -40,13 +40,13 @@ public class LoincPartRelatedCodeMappingHandler extends BaseLoincHandler impleme
 
 	public static final String LOINC_SCT_PART_MAP_ID = "loinc-parts-to-snomed-ct";
 	public static final String LOINC_SCT_PART_MAP_URI = "http://loinc.org/cm/loinc-parts-to-snomed-ct";
+	static final String LOINC_RADLEX_PART_MAP_ID = "loinc-parts-to-radlex";
+	static final String LOINC_RADLEX_PART_MAP_URI = "http://loinc.org/cm/loinc-parts-to-radlex";
+	static final String LOINC_RADLEX_PART_MAP_NAME = "LOINC Part Map to RADLEX";
 	private static final String LOINC_SCT_PART_MAP_NAME = "LOINC Part Map to SNOMED CT";
 	private static final String LOINC_RXNORM_PART_MAP_ID = "loinc-parts-to-rxnorm";
 	private static final String LOINC_RXNORM_PART_MAP_URI = "http://loinc.org/cm/loinc-parts-to-rxnorm";
 	private static final String LOINC_RXNORM_PART_MAP_NAME = "LOINC Part Map to RxNORM";
-	private static final String LOINC_RADLEX_PART_MAP_ID = "loinc-parts-to-radlex";
-	private static final String LOINC_RADLEX_PART_MAP_URI = "http://loinc.org/cm/loinc-parts-to-radlex";
-	private static final String LOINC_RADLEX_PART_MAP_NAME = "LOINC Part Map to RADLEX";
 	private static final String CM_COPYRIGHT = "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/. The LOINC Part File, LOINC/SNOMED CT Expression Association and Map Sets File, RELMA database and associated search index files include SNOMED Clinical Terms (SNOMED CT®) which is used by permission of the International Health Terminology Standards Development Organisation (IHTSDO) under license. All rights are reserved. SNOMED CT® was originally created by The College of American Pathologists. “SNOMED” and “SNOMED CT” are registered trademarks of the IHTSDO. Use of SNOMED CT content is subject to the terms and conditions set forth in the SNOMED CT Affiliate License Agreement.  It is the responsibility of those implementing this product to ensure they are appropriately licensed and for more information on the license, including how to register as an Affiliate Licensee, please refer to http://www.snomed.org/snomed-ct/get-snomed-ct or info@snomed.org. Under the terms of the Affiliate License, use of SNOMED CT in countries that are not IHTSDO Members is subject to reporting and fee payment obligations. However, IHTSDO agrees to waive the requirements to report and pay fees for use of SNOMED CT content included in the LOINC Part Mapping and LOINC Term Associations for purposes that support or enable more effective use of LOINC. This material includes content from the US Edition to SNOMED CT, which is developed and maintained by the U.S. National Library of Medicine and is available to authorized UMLS Metathesaurus Licensees from the UTS Downloads site at https://uts.nlm.nih.gov.";
 	private static final String LOINC_PUBCHEM_PART_MAP_URI = "http://loinc.org/cm/loinc-parts-to-pubchem";
 	private static final String LOINC_PUBCHEM_PART_MAP_ID = "loinc-parts-to-pubchem";

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

@@ -39,21 +39,19 @@ public class LoincRsnaPlaybookHandler extends BaseLoincHandler implements IRecor
 	public static final String RSNA_CODES_VS_ID = "loinc-rsna-radiology-playbook";
 	public static final String RSNA_CODES_VS_URI = "http://loinc.org/vs/loinc-rsna-radiology-playbook";
 	public static final String RSNA_CODES_VS_NAME = "LOINC/RSNA Radiology Playbook";
-	public static final String RID_MAPPING_CM_ID = "LOINC-TO-RID-CODES-CM";
+	public static final String RADLEX_MAPPING_CM_ID = LoincPartRelatedCodeMappingHandler.LOINC_RADLEX_PART_MAP_ID;
-	public static final String RID_MAPPING_CM_URI = "http://loinc.org/rid-codes";
+	public static final String RADLEX_MAPPING_CM_URI = LoincPartRelatedCodeMappingHandler.LOINC_RADLEX_PART_MAP_URI;
-	public static final String RID_MAPPING_CM_NAME = "RSNA Playbook RID Codes Mapping";
+	public static final String RADLEX_MAPPING_CM_NAME = LoincPartRelatedCodeMappingHandler.LOINC_RADLEX_PART_MAP_NAME;
 	public static final String RID_CS_URI = "http://www.radlex.org";
-	public static final String RPID_MAPPING_CM_ID = "LOINC-TO-RPID-CODES-CM";
-	public static final String RPID_MAPPING_CM_URI = "http://loinc.org/rpid-codes";
-	public static final String RPID_MAPPING_CM_NAME = "RSNA Playbook RPID Codes Mapping";
 	/*
-	 * About these being the same - Per Dan:
+	 * About these being the same - Per Dan Vreeman:
 	 * We had some discussion about this, and both
 	 * RIDs (RadLex clinical terms) and RPIDs (Radlex Playbook Ids)
 	 * belong to the same "code system" since they will never collide.
 	 * The codesystem uri is "http://www.radlex.org". FYI, that's
 	 * now listed on the FHIR page:
 	 * https://www.hl7.org/fhir/terminologies-systems.html
+	 * -ja
 	 */
 	public static final String RPID_CS_URI = RID_CS_URI;
 	private static final String CM_COPYRIGHT = "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/. The LOINC/RSNA Radiology Playbook and the LOINC Part File contain content from RadLex® (http://rsna.org/RadLex.aspx), copyright © 2005-2017, The Radiological Society of North America, Inc., available at no cost under the license at http://www.rsna.org/uploadedFiles/RSNA/Content/Informatics/RadLex_License_Agreement_and_Terms_of_Use_V2_Final.pdf.";
@@ -179,9 +177,9 @@ public class LoincRsnaPlaybookHandler extends BaseLoincHandler implements IRecor
 		if (isNotBlank(rid)) {
 			addConceptMapEntry(
 				new ConceptMapping()
-					.setConceptMapId(RID_MAPPING_CM_ID)
+					.setConceptMapId(RADLEX_MAPPING_CM_ID)
-					.setConceptMapUri(RID_MAPPING_CM_URI)
+					.setConceptMapUri(RADLEX_MAPPING_CM_URI)
-					.setConceptMapName(RID_MAPPING_CM_NAME)
+					.setConceptMapName(RADLEX_MAPPING_CM_NAME)
 					.setSourceCodeSystem(IHapiTerminologyLoaderSvc.LOINC_URI)
 					.setSourceCode(partNumber)
 					.setSourceDisplay(partName)
@@ -196,9 +194,9 @@ public class LoincRsnaPlaybookHandler extends BaseLoincHandler implements IRecor
 		if (isNotBlank(rpid)) {
 			addConceptMapEntry(
 				new ConceptMapping()
-					.setConceptMapId(RPID_MAPPING_CM_ID)
+					.setConceptMapId(RADLEX_MAPPING_CM_ID)
-					.setConceptMapUri(RPID_MAPPING_CM_URI)
+					.setConceptMapUri(RADLEX_MAPPING_CM_URI)
-					.setConceptMapName(RPID_MAPPING_CM_NAME)
+					.setConceptMapName(RADLEX_MAPPING_CM_NAME)
 					.setSourceCodeSystem(IHapiTerminologyLoaderSvc.LOINC_URI)
 					.setSourceCode(loincNumber)
 					.setSourceDisplay(longCommonName)

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/loinc/LoincUniversalOrderSetHandler.java

@@ -34,7 +34,7 @@ import static org.apache.commons.lang3.StringUtils.trim;
 public class LoincUniversalOrderSetHandler extends BaseLoincHandler implements IRecordHandler {
 
 	public static final String VS_ID = "loinc-universal-order-set-vs";
-	public static final String VS_URI = "http://loinc.org/fhir/loinc-universal-order-set";
+	public static final String VS_URI = "http://loinc.org/vs/loinc-universal-order-set";
 	public static final String VS_NAME = "LOINC Universal Order Set";
 
 	public LoincUniversalOrderSetHandler(Map<String, TermConcept> theCode2concept, List<ValueSet> theValueSets, List<ConceptMap> theConceptMaps, Properties theUploadProperties) {

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ConceptMapTest.java

@@ -24,17 +24,33 @@ public class FhirResourceDaoDstu3ConceptMapTest extends BaseJpaDstu3Test {
 
 	private IIdType myConceptMapId;
 
-	@AfterClass
-	public static void afterClassClearContext() {
-		TestUtil.clearAllStaticFieldsForUnitTest();
-	}
-
 	@Before
 	@Transactional
 	public void before02() {
 		myConceptMapId = myConceptMapDao.create(createConceptMap(), mySrd).getId().toUnqualifiedVersionless();
 	}
 
+	@Test
+	public void testDeleteConceptMap() {
+		myConceptMapDao.delete(myConceptMapId);
+
+		new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
+			@Override
+			protected void doInTransactionWithoutResult(TransactionStatus theStatus) {
+				TranslationRequest translationRequest = new TranslationRequest();
+				translationRequest.getCodeableConcept().addCoding()
+					.setSystem(CS_URL)
+					.setCode("12345");
+				translationRequest.setTargetSystem(new UriType(CS_URL_3));
+
+				TranslationResult translationResult = myConceptMapDao.translate(translationRequest, null);
+
+				assertFalse(translationResult.getResult().booleanValue());
+			}
+		});
+
+	}
+
 	@Test
 	public void testTranslateByCodeSystemsAndSourceCodeOneToMany() {
 		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
@@ -81,4 +97,9 @@ public class FhirResourceDaoDstu3ConceptMapTest extends BaseJpaDstu3Test {
 			}
 		});
 	}
+
+	@AfterClass
+	public static void afterClassClearContext() {
+		TestUtil.clearAllStaticFieldsForUnitTest();
+	}
 }

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4ConceptMapTest.java

@@ -26,17 +26,33 @@ public class FhirResourceDaoR4ConceptMapTest extends BaseJpaR4Test {
 
 	private IIdType myConceptMapId;
 
-	@AfterClass
-	public static void afterClassClearContext() {
-		TestUtil.clearAllStaticFieldsForUnitTest();
-	}
-
 	@Before
 	@Transactional
 	public void before02() {
 		myConceptMapId = myConceptMapDao.create(createConceptMap(), mySrd).getId().toUnqualifiedVersionless();
 	}
 
+	@Test
+	public void testDeleteConceptMap() {
+		myConceptMapDao.delete(myConceptMapId);
+
+		new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
+			@Override
+			protected void doInTransactionWithoutResult(TransactionStatus theStatus) {
+				TranslationRequest translationRequest = new TranslationRequest();
+				translationRequest.getCodeableConcept().addCoding()
+					.setSystem(CS_URL)
+					.setCode("12345");
+				translationRequest.setTargetSystem(new UriType(CS_URL_3));
+
+				TranslationResult translationResult = myConceptMapDao.translate(translationRequest, null);
+
+				assertFalse(translationResult.getResult().booleanValue());
+			}
+		});
+
+	}
+
 	@Test
 	public void testTranslateByCodeSystemsAndSourceCodeOneToMany() {
 		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
@@ -205,6 +221,98 @@ public class FhirResourceDaoR4ConceptMapTest extends BaseJpaR4Test {
 		});
 	}
 
+	@Test
+	public void testTranslateUsingPredicatesWithSourceAndTargetSystem2() {
+		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
+
+		ourLog.info("ConceptMap:\n" + myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(conceptMap));
+
+		new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
+			@Override
+			protected void doInTransactionWithoutResult(TransactionStatus theStatus) {
+				/*
+				 * Provided:
+				 *   source code
+				 *   source code system
+				 *   target code system #2
+				 */
+				TranslationRequest translationRequest = new TranslationRequest();
+				translationRequest.getCodeableConcept().addCoding()
+					.setSystem(CS_URL)
+					.setCode("12345");
+				translationRequest.setTargetSystem(new UriType(CS_URL_2));
+
+				TranslationResult translationResult = myConceptMapDao.translate(translationRequest, null);
+
+				assertTrue(translationResult.getResult().booleanValue());
+				assertEquals("Matches found!", translationResult.getMessage().getValueAsString());
+
+				assertEquals(1, translationResult.getMatches().size());
+
+				TranslationMatch translationMatch = translationResult.getMatches().get(0);
+				assertEquals(ConceptMapEquivalence.EQUAL.toCode(), translationMatch.getEquivalence().getCode());
+				Coding concept = translationMatch.getConcept();
+				assertEquals("34567", concept.getCode());
+				assertEquals("Target Code 34567", concept.getDisplay());
+				assertEquals(CS_URL_2, concept.getSystem());
+				assertEquals("Version 2", concept.getVersion());
+				assertFalse(concept.getUserSelected());
+				assertEquals(CM_URL, translationMatch.getSource().getValueAsString());
+			}
+		});
+	}
+
+	@Test
+	public void testTranslateUsingPredicatesWithSourceAndTargetSystem3() {
+		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
+
+		ourLog.info("ConceptMap:\n" + myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(conceptMap));
+
+		new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
+			@Override
+			protected void doInTransactionWithoutResult(TransactionStatus theStatus) {
+				/*
+				 * Provided:
+				 *   source code
+				 *   source code system
+				 *   target code system #3
+				 */
+				TranslationRequest translationRequest = new TranslationRequest();
+				translationRequest.getCodeableConcept().addCoding()
+					.setSystem(CS_URL)
+					.setCode("12345");
+				translationRequest.setTargetSystem(new UriType(CS_URL_3));
+
+				TranslationResult translationResult = myConceptMapDao.translate(translationRequest, null);
+
+				assertTrue(translationResult.getResult().booleanValue());
+				assertEquals("Matches found!", translationResult.getMessage().getValueAsString());
+
+				assertEquals(2, translationResult.getMatches().size());
+
+				TranslationMatch translationMatch = translationResult.getMatches().get(0);
+				assertEquals(ConceptMapEquivalence.EQUAL.toCode(), translationMatch.getEquivalence().getCode());
+				Coding concept = translationMatch.getConcept();
+				assertEquals("56789", concept.getCode());
+				assertEquals("Target Code 56789", concept.getDisplay());
+				assertEquals(CS_URL_3, concept.getSystem());
+				assertEquals("Version 4", concept.getVersion());
+				assertFalse(concept.getUserSelected());
+				assertEquals(CM_URL, translationMatch.getSource().getValueAsString());
+
+				translationMatch = translationResult.getMatches().get(1);
+				assertEquals(ConceptMapEquivalence.WIDER.toCode(), translationMatch.getEquivalence().getCode());
+				concept = translationMatch.getConcept();
+				assertEquals("67890", concept.getCode());
+				assertEquals("Target Code 67890", concept.getDisplay());
+				assertEquals(CS_URL_3, concept.getSystem());
+				assertEquals("Version 4", concept.getVersion());
+				assertFalse(concept.getUserSelected());
+				assertEquals(CM_URL, translationMatch.getSource().getValueAsString());
+			}
+		});
+	}
+
 	@Test
 	public void testTranslateUsingPredicatesWithSourceSystem() {
 		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
@@ -356,98 +464,6 @@ public class FhirResourceDaoR4ConceptMapTest extends BaseJpaR4Test {
 		});
 	}
 
-	@Test
-	public void testTranslateUsingPredicatesWithSourceAndTargetSystem2() {
-		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
-
-		ourLog.info("ConceptMap:\n" + myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(conceptMap));
-
-		new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
-			@Override
-			protected void doInTransactionWithoutResult(TransactionStatus theStatus) {
-				/*
-				 * Provided:
-				 *   source code
-				 *   source code system
-				 *   target code system #2
-				 */
-				TranslationRequest translationRequest = new TranslationRequest();
-				translationRequest.getCodeableConcept().addCoding()
-					.setSystem(CS_URL)
-					.setCode("12345");
-				translationRequest.setTargetSystem(new UriType(CS_URL_2));
-
-				TranslationResult translationResult = myConceptMapDao.translate(translationRequest, null);
-
-				assertTrue(translationResult.getResult().booleanValue());
-				assertEquals("Matches found!", translationResult.getMessage().getValueAsString());
-
-				assertEquals(1, translationResult.getMatches().size());
-
-				TranslationMatch translationMatch = translationResult.getMatches().get(0);
-				assertEquals(ConceptMapEquivalence.EQUAL.toCode(), translationMatch.getEquivalence().getCode());
-				Coding concept = translationMatch.getConcept();
-				assertEquals("34567", concept.getCode());
-				assertEquals("Target Code 34567", concept.getDisplay());
-				assertEquals(CS_URL_2, concept.getSystem());
-				assertEquals("Version 2", concept.getVersion());
-				assertFalse(concept.getUserSelected());
-				assertEquals(CM_URL, translationMatch.getSource().getValueAsString());
-			}
-		});
-	}
-
-	@Test
-	public void testTranslateUsingPredicatesWithSourceAndTargetSystem3() {
-		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
-
-		ourLog.info("ConceptMap:\n" + myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(conceptMap));
-
-		new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
-			@Override
-			protected void doInTransactionWithoutResult(TransactionStatus theStatus) {
-				/*
-				 * Provided:
-				 *   source code
-				 *   source code system
-				 *   target code system #3
-				 */
-				TranslationRequest translationRequest = new TranslationRequest();
-				translationRequest.getCodeableConcept().addCoding()
-					.setSystem(CS_URL)
-					.setCode("12345");
-				translationRequest.setTargetSystem(new UriType(CS_URL_3));
-
-				TranslationResult translationResult = myConceptMapDao.translate(translationRequest, null);
-
-				assertTrue(translationResult.getResult().booleanValue());
-				assertEquals("Matches found!", translationResult.getMessage().getValueAsString());
-
-				assertEquals(2, translationResult.getMatches().size());
-
-				TranslationMatch translationMatch = translationResult.getMatches().get(0);
-				assertEquals(ConceptMapEquivalence.EQUAL.toCode(), translationMatch.getEquivalence().getCode());
-				Coding concept = translationMatch.getConcept();
-				assertEquals("56789", concept.getCode());
-				assertEquals("Target Code 56789", concept.getDisplay());
-				assertEquals(CS_URL_3, concept.getSystem());
-				assertEquals("Version 4", concept.getVersion());
-				assertFalse(concept.getUserSelected());
-				assertEquals(CM_URL, translationMatch.getSource().getValueAsString());
-
-				translationMatch = translationResult.getMatches().get(1);
-				assertEquals(ConceptMapEquivalence.WIDER.toCode(), translationMatch.getEquivalence().getCode());
-				concept = translationMatch.getConcept();
-				assertEquals("67890", concept.getCode());
-				assertEquals("Target Code 67890", concept.getDisplay());
-				assertEquals(CS_URL_3, concept.getSystem());
-				assertEquals("Version 4", concept.getVersion());
-				assertFalse(concept.getUserSelected());
-				assertEquals(CM_URL, translationMatch.getSource().getValueAsString());
-			}
-		});
-	}
-
 	@Test
 	public void testTranslateUsingPredicatesWithSourceValueSet() {
 		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
@@ -686,6 +702,92 @@ public class FhirResourceDaoR4ConceptMapTest extends BaseJpaR4Test {
 		});
 	}
 
+	@Test
+	public void testTranslateWithReverseUsingPredicatesWithSourceAndTargetSystem1() {
+		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
+
+		ourLog.info("ConceptMap:\n" + myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(conceptMap));
+
+		new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
+			@Override
+			protected void doInTransactionWithoutResult(TransactionStatus theStatus) {
+				/*
+				 * Provided:
+				 *   source code
+				 *   source code system
+				 *   target code system #1
+				 *   reverse = true
+				 */
+				TranslationRequest translationRequest = new TranslationRequest();
+				translationRequest.getCodeableConcept().addCoding()
+					.setSystem(CS_URL_2)
+					.setCode("34567");
+				translationRequest.setTargetSystem(new UriType(CS_URL));
+				translationRequest.setReverse(true);
+
+				TranslationResult translationResult = myConceptMapDao.translate(translationRequest, null);
+
+				assertTrue(translationResult.getResult().booleanValue());
+				assertEquals("Matches found!", translationResult.getMessage().getValueAsString());
+
+				assertEquals(1, translationResult.getMatches().size());
+
+				TranslationMatch translationMatch = translationResult.getMatches().get(0);
+				assertNull(translationMatch.getEquivalence());
+				Coding concept = translationMatch.getConcept();
+				assertEquals("12345", concept.getCode());
+				assertEquals("Source Code 12345", concept.getDisplay());
+				assertEquals(CS_URL, concept.getSystem());
+				assertEquals("Version 1", concept.getVersion());
+				assertFalse(concept.getUserSelected());
+				assertEquals(CM_URL, translationMatch.getSource().getValueAsString());
+			}
+		});
+	}
+
+	@Test
+	public void testTranslateWithReverseUsingPredicatesWithSourceAndTargetSystem4() {
+		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
+
+		ourLog.info("ConceptMap:\n" + myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(conceptMap));
+
+		new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
+			@Override
+			protected void doInTransactionWithoutResult(TransactionStatus theStatus) {
+				/*
+				 * Provided:
+				 *   source code
+				 *   source code system
+				 *   target code system #4
+				 *   reverse = true
+				 */
+				TranslationRequest translationRequest = new TranslationRequest();
+				translationRequest.getCodeableConcept().addCoding()
+					.setSystem(CS_URL_2)
+					.setCode("34567");
+				translationRequest.setTargetSystem(new UriType(CS_URL_4));
+				translationRequest.setReverse(true);
+
+				TranslationResult translationResult = myConceptMapDao.translate(translationRequest, null);
+
+				assertTrue(translationResult.getResult().booleanValue());
+				assertEquals("Matches found!", translationResult.getMessage().getValueAsString());
+
+				assertEquals(1, translationResult.getMatches().size());
+
+				TranslationMatch translationMatch = translationResult.getMatches().get(0);
+				assertNull(translationMatch.getEquivalence());
+				Coding concept = translationMatch.getConcept();
+				assertEquals("78901", concept.getCode());
+				assertEquals("Source Code 78901", concept.getDisplay());
+				assertEquals(CS_URL_4, concept.getSystem());
+				assertEquals("Version 5", concept.getVersion());
+				assertFalse(concept.getUserSelected());
+				assertEquals(CM_URL, translationMatch.getSource().getValueAsString());
+			}
+		});
+	}
+
 	@Test
 	public void testTranslateWithReverseUsingPredicatesWithSourceSystem() {
 		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
@@ -790,92 +892,6 @@ public class FhirResourceDaoR4ConceptMapTest extends BaseJpaR4Test {
 		});
 	}
 
-	@Test
-	public void testTranslateWithReverseUsingPredicatesWithSourceAndTargetSystem1() {
-		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
-
-		ourLog.info("ConceptMap:\n" + myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(conceptMap));
-
-		new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
-			@Override
-			protected void doInTransactionWithoutResult(TransactionStatus theStatus) {
-				/*
-				 * Provided:
-				 *   source code
-				 *   source code system
-				 *   target code system #1
-				 *   reverse = true
-				 */
-				TranslationRequest translationRequest = new TranslationRequest();
-				translationRequest.getCodeableConcept().addCoding()
-					.setSystem(CS_URL_2)
-					.setCode("34567");
-				translationRequest.setTargetSystem(new UriType(CS_URL));
-				translationRequest.setReverse(true);
-
-				TranslationResult translationResult = myConceptMapDao.translate(translationRequest, null);
-
-				assertTrue(translationResult.getResult().booleanValue());
-				assertEquals("Matches found!", translationResult.getMessage().getValueAsString());
-
-				assertEquals(1, translationResult.getMatches().size());
-
-				TranslationMatch translationMatch = translationResult.getMatches().get(0);
-				assertNull(translationMatch.getEquivalence());
-				Coding concept = translationMatch.getConcept();
-				assertEquals("12345", concept.getCode());
-				assertEquals("Source Code 12345", concept.getDisplay());
-				assertEquals(CS_URL, concept.getSystem());
-				assertEquals("Version 1", concept.getVersion());
-				assertFalse(concept.getUserSelected());
-				assertEquals(CM_URL, translationMatch.getSource().getValueAsString());
-			}
-		});
-	}
-
-	@Test
-	public void testTranslateWithReverseUsingPredicatesWithSourceAndTargetSystem4() {
-		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
-
-		ourLog.info("ConceptMap:\n" + myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(conceptMap));
-
-		new TransactionTemplate(myTxManager).execute(new TransactionCallbackWithoutResult() {
-			@Override
-			protected void doInTransactionWithoutResult(TransactionStatus theStatus) {
-				/*
-				 * Provided:
-				 *   source code
-				 *   source code system
-				 *   target code system #4
-				 *   reverse = true
-				 */
-				TranslationRequest translationRequest = new TranslationRequest();
-				translationRequest.getCodeableConcept().addCoding()
-					.setSystem(CS_URL_2)
-					.setCode("34567");
-				translationRequest.setTargetSystem(new UriType(CS_URL_4));
-				translationRequest.setReverse(true);
-
-				TranslationResult translationResult = myConceptMapDao.translate(translationRequest, null);
-
-				assertTrue(translationResult.getResult().booleanValue());
-				assertEquals("Matches found!", translationResult.getMessage().getValueAsString());
-
-				assertEquals(1, translationResult.getMatches().size());
-
-				TranslationMatch translationMatch = translationResult.getMatches().get(0);
-				assertNull(translationMatch.getEquivalence());
-				Coding concept = translationMatch.getConcept();
-				assertEquals("78901", concept.getCode());
-				assertEquals("Source Code 78901", concept.getDisplay());
-				assertEquals(CS_URL_4, concept.getSystem());
-				assertEquals("Version 5", concept.getVersion());
-				assertFalse(concept.getUserSelected());
-				assertEquals(CM_URL, translationMatch.getSource().getValueAsString());
-			}
-		});
-	}
-
 	@Test
 	public void testTranslateWithReverseUsingPredicatesWithSourceValueSet() {
 		ConceptMap conceptMap = myConceptMapDao.read(myConceptMapId);
@@ -977,4 +993,9 @@ public class FhirResourceDaoR4ConceptMapTest extends BaseJpaR4Test {
 			}
 		});
 	}
+
+	@AfterClass
+	public static void afterClassClearContext() {
+		TestUtil.clearAllStaticFieldsForUnitTest();
+	}
 }

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java

@@ -222,9 +222,9 @@ public class TerminologyLoaderSvcLoincTest {
 		assertEquals("NM", code.getCodingProperties(propertyName).get(0).getDisplay());
 
 		// RSNA Playbook - LOINC Part -> RadLex RID Mappings
-		conceptMap = conceptMaps.get(LoincRsnaPlaybookHandler.RID_MAPPING_CM_ID);
+		conceptMap = conceptMaps.get(LoincRsnaPlaybookHandler.RADLEX_MAPPING_CM_ID);
-		assertEquals(LoincRsnaPlaybookHandler.RID_MAPPING_CM_URI, conceptMap.getUrl());
+		assertEquals(LoincRsnaPlaybookHandler.RADLEX_MAPPING_CM_URI, conceptMap.getUrl());
-		assertEquals(LoincRsnaPlaybookHandler.RID_MAPPING_CM_NAME, conceptMap.getName());
+		assertEquals(LoincRsnaPlaybookHandler.RADLEX_MAPPING_CM_NAME, conceptMap.getName());
 		assertEquals(1, conceptMap.getGroup().size());
 		group = conceptMap.getGroupFirstRep();
 		// all entries have the same source and target so these should be null
@@ -238,9 +238,9 @@ public class TerminologyLoaderSvcLoincTest {
 		assertEquals(Enumerations.ConceptMapEquivalence.EQUAL, group.getElement().get(0).getTarget().get(0).getEquivalence());
 
 		// RSNA Playbook - LOINC Term -> RadLex RPID Mappings
-		conceptMap = conceptMaps.get(LoincRsnaPlaybookHandler.RPID_MAPPING_CM_ID);
+		conceptMap = conceptMaps.get(LoincRsnaPlaybookHandler.RADLEX_MAPPING_CM_ID);
-		assertEquals(LoincRsnaPlaybookHandler.RPID_MAPPING_CM_URI, conceptMap.getUrl());
+		assertEquals(LoincRsnaPlaybookHandler.RADLEX_MAPPING_CM_URI, conceptMap.getUrl());
-		assertEquals(LoincRsnaPlaybookHandler.RPID_MAPPING_CM_NAME, conceptMap.getName());
+		assertEquals(LoincRsnaPlaybookHandler.RADLEX_MAPPING_CM_URI, conceptMap.getName());
 		assertEquals(1, conceptMap.getGroup().size());
 		group = conceptMap.getGroupFirstRep();
 		// all entries have the same source and target so these should be null