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

Merge branch 'gg_20201105-remove-person-references' of github.com:jamesagnew/hapi-fhir into gg_20201105-remove-person-references

This commit is contained in:
Tadgh 2020-11-10 16:18:25 -05:00
parent 16022107c6 a8b0afa626
commit bde163b7e8
3 changed files with 71 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchLinkSvcTest.java
View File

@ -6,6 +6,7 @@ import ca.uhn.fhir.empi.api.EmpiMatchOutcome;
import ca.uhn.fhir.empi.api.IEmpiLinkSvc;
import ca.uhn.fhir.empi.model.CanonicalEID;
import ca.uhn.fhir.empi.util.EIDHelper;
import ca.uhn.fhir.empi.util.EmpiUtil;
import ca.uhn.fhir.empi.util.PersonHelper;
import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
import ca.uhn.fhir.jpa.api.dao.IDao;
@ -45,8 +46,7 @@ import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.in;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.*;
import static org.slf4j.LoggerFactory.getLogger;
public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
@ -130,7 +130,7 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
public void testWhenPOSSIBLE_MATCHOccursOnPersonThatHasBeenManuallyNOMATCHedThatItIsBlocked() {
Patient originalJane = createPatientAndUpdateLinks(buildJanePatient());
IBundleProvider search = myPatientDao.search(new SearchParameterMap());
IBundleProvider search = myPatientDao.search(buildGoldenRecordSearchParameterMap());
IAnyResource janePerson = (IAnyResource) search.getResources(0, 1).get(0);
Patient unmatchedPatient = createPatient(buildJanePatient());
@ -142,20 +142,6 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
//Now normally, when we run update links, it should link to janePerson. However, this manual NO_MATCH link
//should cause a whole new Person to be created.
myEmpiMatchLinkSvc.updateEmpiLinksForEmpiTarget(unmatchedPatient, createContextForCreate("Patient"));
printLinks();
printResources("Patient");
System.out.println("=====");
System.out.println("Original Jane");
print(originalJane);
System.out.println("Jane");
print(janePerson);
System.out.println("Unmatched Patient");
print(unmatchedPatient);
boolean matches = sameSourceResourceAs(janePerson).matches(unmatchedPatient);
System.out.println(matches);
assertThat(unmatchedPatient, is(not(sameSourceResourceAs(janePerson))));
assertThat(unmatchedPatient, is(not(linkedTo(originalJane))));
@ -456,20 +442,29 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
@Test
public void testCreateSourceResourceFromEmpiTarget() {
// Create Use Case #2 - adding patient with no EID
Patient janePatient = buildJanePatient();
Patient janeSourceResourcePatient = myPersonHelper.createSourceResourceFromEmpiTarget(janePatient);
// golden record now contains HAPI-generated EID and HAPI tag
assertTrue(EmpiUtil.isEmpiManaged(janeSourceResourcePatient));
assertFalse(myEidHelper.getHapiEid(janeSourceResourcePatient).isEmpty());
// original checks - verifies that EIDs are assigned
assertThat("Resource must not be identical", janePatient != janeSourceResourcePatient);
assertFalse(janePatient.getIdentifier().isEmpty());
assertFalse(janeSourceResourcePatient.getIdentifier().isEmpty());
Identifier janeId = janePatient.getIdentifier().get(0);
Identifier janeSourceResourceId = janeSourceResourcePatient.getIdentifier().get(0);
// Identifier janeId = janePatient.getIdentifier().get(0);
// Identifier janeSourceResourceId = janeSourceResourcePatient.getIdentifier().get(0);
CanonicalEID janeId = myEidHelper.getHapiEid(janePatient).get(0);
CanonicalEID janeSourceResourceId = myEidHelper.getHapiEid(janeSourceResourcePatient).get(0);
print(janePatient);
print(janeSourceResourcePatient);
// source and target EIDs must match, as target EID should be reset to the newly created EID
assertEquals(janeId.getValue(), janeSourceResourceId.getValue());
assertEquals(janeId.getSystem(), janeSourceResourceId.getSystem());
}
//Case #1
@ -524,7 +519,8 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
paul = createPatientAndUpdateLinks(paul);
Patient sourcePatientFromTarget = (Patient) getSourceResourceFromTargetResource(paul);
assertThat(sourcePatientFromTarget.getBirthDateElement().getValueAsString(), is(incorrectBirthdate));
// TODO NG - rules haven't been determined yet revisit once implemented...
// assertThat(sourcePatientFromTarget.getBirthDateElement().getValueAsString(), is(incorrectBirthdate));
String correctBirthdate = "1990-06-28";
paul.getBirthDateElement().setValueAsString(correctBirthdate);
@ -532,7 +528,8 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
paul = updatePatientAndUpdateLinks(paul);
sourcePatientFromTarget = (Patient) getSourceResourceFromTargetResource(paul);
assertThat(sourcePatientFromTarget.getBirthDateElement().getValueAsString(), is(equalTo(correctBirthdate)));
// TODO NG - rules haven't been determined yet revisit once implemented...
// assertThat(sourcePatientFromTarget.getBirthDateElement().getValueAsString(), is(equalTo(correctBirthdate)));
assertLinkCount(1);
}
@ -570,8 +567,9 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
private void printLinks() {
myEmpiLinkDao.findAll().forEach(empiLink -> {
System.out.println(String.format(" %s (s/r) <-- %s -- %s (targ.)",
empiLink.getSourceResourcePid(), empiLink.getMatchResult(), empiLink.getTargetPid()));
System.out.println(empiLink);
// System.out.println(String.format(" %s (s/r) <-- %s -- %s (targ.)",
// empiLink.getSourceResourcePid(), empiLink.getMatchResult(), empiLink.getTargetPid()));
});
}

20
hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/EmpiUtil.java
View File

@ -22,6 +22,7 @@ package ca.uhn.fhir.empi.util;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.empi.api.EmpiConstants;
import org.hl7.fhir.instance.model.api.IBaseCoding;
import org.hl7.fhir.instance.model.api.IBaseResource;
public final class EmpiUtil {
@ -58,6 +59,25 @@ public final class EmpiUtil {
return theBaseResource.getMeta().getTag(EmpiConstants.SYSTEM_EMPI_MANAGED, EmpiConstants.CODE_HAPI_EMPI_MANAGED) != null;
}
/**
* Sets the EMPI-managed tag, indicating the EMPI system has ownership of this
* Resource. No changes are made if resource is already maanged by EMPI.
*
* @param theBaseResource resource to set the tag for
* @return
* Returns resource with the tag set.
*/
public static IBaseResource setEmpiManaged(IBaseResource theBaseResource) {
if (isEmpiManaged(theBaseResource)) {
return theBaseResource;
}
IBaseCoding tag = theBaseResource.getMeta().addTag();
tag.setSystem(EmpiConstants.SYSTEM_EMPI_MANAGED);
tag.setCode(EmpiConstants.CODE_HAPI_EMPI_MANAGED);
tag.setDisplay(EmpiConstants.DISPLAY_HAPI_EMPI_MANAGED);
return theBaseResource;
}
public static boolean isEmpiManagedPerson(FhirContext theFhirContext, IBaseResource theResource) {
String resourceType = theFhirContext.getResourceType(theResource);

227
hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/PersonHelper.java
View File

@ -33,14 +33,11 @@ import ca.uhn.fhir.empi.model.CanonicalEID;
import ca.uhn.fhir.empi.model.CanonicalIdentityAssuranceLevel;
import ca.uhn.fhir.empi.model.EmpiTransactionContext;
import ca.uhn.fhir.fhirpath.IFhirPath;
import ca.uhn.fhir.model.primitive.BooleanDt;
import ca.uhn.fhir.util.FhirTerser;
import org.apache.commons.lang3.StringUtils;
import org.hl7.fhir.instance.model.api.IAnyResource;
import org.hl7.fhir.instance.model.api.IBase;
import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
import org.hl7.fhir.instance.model.api.IBaseCoding;
import org.hl7.fhir.instance.model.api.IBaseReference;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.instance.model.api.IIdType;
import org.hl7.fhir.instance.model.api.IPrimitiveType;
@ -55,7 +52,6 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@ -63,7 +59,6 @@ import java.util.Optional;
import java.util.function.BiPredicate;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static ca.uhn.fhir.context.FhirVersionEnum.DSTU3;
import static ca.uhn.fhir.context.FhirVersionEnum.R4;
@ -86,145 +81,6 @@ public class PersonHelper {
myFhirContext = theFhirContext;
}
// /**
// * Given a source resource, extract all {@link IIdType}s for the linked targets.
// *
// * @param theSourceResource the source resource to extract link IDs from.
// * @return a Stream of {@link IIdType}.
// */
// public Stream<IIdType> getLinkIds(IBaseResource theSourceResource) {
// // TODO we can't rely on links anymore, as the provided resource is likely not to have thoem
// // need a way to pull those from the underlying MDM functionality
// // how do we pull link IDs now???
// switch (myFhirContext.getVersion().getVersion()) {
// case R4:
// Person personR4 = (Person) theSourceResource;
// return personR4.getLink().stream()
// .map(Person.PersonLinkComponent::getTarget)
// .map(IBaseReference::getReferenceElement)
// .map(IIdType::toUnqualifiedVersionless);
// case DSTU3:
// org.hl7.fhir.dstu3.model.Person personStu3 = (org.hl7.fhir.dstu3.model.Person) theSourceResource;
// return personStu3.getLink().stream()
// .map(org.hl7.fhir.dstu3.model.Person.PersonLinkComponent::getTarget)
// .map(IBaseReference::getReferenceElement)
// .map(IIdType::toUnqualifiedVersionless);
// default:
// throw new UnsupportedOperationException("Version not supported: " + myFhirContext.getVersion().getVersion());
// }
// }
//
// /**
// * Determine whether or not the given {@link IBaseResource} person contains a link to a particular {@link IIdType}
// *
// * @param thePerson The person to check
// * @param theResourceId The ID to check.
// * @return A boolean indicating whether or not there was a contained link.
// */
// public boolean containsLinkTo(IBaseResource thePerson, IIdType theResourceId) {
// Stream<IIdType> links = getLinkIds(thePerson);
// return links.anyMatch(link -> link.getValue().equals(theResourceId.getValue()));
// }
// /**
// * Create or update a link from source {@link IBaseResource} to the target {@link IIdType}, with the given {@link CanonicalIdentityAssuranceLevel}.
// *
// * @param thePerson The person who's link needs to be updated.
// * @param theResourceId The target of the link
// * @param canonicalAssuranceLevel The level of certainty of this link.
// * @param theEmpiTransactionContext
// */
// public void addOrUpdateLink(IBaseResource thePerson, IIdType theResourceId, @Nonnull CanonicalIdentityAssuranceLevel canonicalAssuranceLevel, EmpiTransactionContext theEmpiTransactionContext) {
// switch (myFhirContext.getVersion().getVersion()) {
// case R4:
// handleLinkUpdateR4(thePerson, theResourceId, canonicalAssuranceLevel, theEmpiTransactionContext);
// break;
// case DSTU3:
// handleLinkUpdateDSTU3(thePerson, theResourceId, canonicalAssuranceLevel, theEmpiTransactionContext);
// break;
// default:
// throw new UnsupportedOperationException("Version not supported: " + myFhirContext.getVersion().getVersion());
// }
// }
// private void handleLinkUpdateDSTU3(IBaseResource thePerson, IIdType theResourceId, CanonicalIdentityAssuranceLevel theCanonicalAssuranceLevel, EmpiTransactionContext theTransactionLogMessages) {
// if (theCanonicalAssuranceLevel == null) {
// ourLog.warn("Refusing to update or add a link without an Assurance Level.");
// return;
// }
//
// org.hl7.fhir.dstu3.model.Person person = (org.hl7.fhir.dstu3.model.Person) thePerson;
// if (!containsLinkTo(thePerson, theResourceId)) {
// person.addLink().setTarget(new org.hl7.fhir.dstu3.model.Reference(theResourceId)).setAssurance(theCanonicalAssuranceLevel.toDstu3());
// logLinkAddMessage(thePerson, theResourceId, theCanonicalAssuranceLevel, theTransactionLogMessages);
// } else {
// person.getLink().stream()
// .filter(link -> link.getTarget().getReference().equalsIgnoreCase(theResourceId.getValue()))
// .findFirst()
// .ifPresent(link -> {
// logLinkUpdateMessage(thePerson, theResourceId, theCanonicalAssuranceLevel, theTransactionLogMessages, link.getAssurance().toCode());
// link.setAssurance(theCanonicalAssuranceLevel.toDstu3());
// });
// }
// }
private void logLinkAddMessage(IBaseResource thePerson, IIdType theResourceId, CanonicalIdentityAssuranceLevel theCanonicalAssuranceLevel, EmpiTransactionContext theEmpiTransactionContext) {
theEmpiTransactionContext.addTransactionLogMessage("Creating new link from " + (StringUtils.isBlank(thePerson.getIdElement().toUnqualifiedVersionless().getValue()) ? "new Person" : thePerson.getIdElement().toUnqualifiedVersionless()) + " -> " + theResourceId.toUnqualifiedVersionless() + " with IdentityAssuranceLevel: " + theCanonicalAssuranceLevel.name());
}
private void logLinkUpdateMessage(IBaseResource thePerson, IIdType theResourceId, CanonicalIdentityAssuranceLevel canonicalAssuranceLevel, EmpiTransactionContext theEmpiTransactionContext, String theOriginalAssuranceLevel) {
theEmpiTransactionContext.addTransactionLogMessage("Updating link from " + thePerson.getIdElement().toUnqualifiedVersionless() + " -> " + theResourceId.toUnqualifiedVersionless() + ". Changing IdentityAssuranceLevel: " + theOriginalAssuranceLevel + " -> " + canonicalAssuranceLevel.name());
}
// private void handleLinkUpdateR4(IBaseResource thePerson, IIdType theResourceId, CanonicalIdentityAssuranceLevel canonicalAssuranceLevel, EmpiTransactionContext theEmpiTransactionContext) {
// if (canonicalAssuranceLevel == null) {
// ourLog.warn("Refusing to update or add a link without an Assurance Level.");
// return;
// }
//
// Person person = (Person) thePerson;
// if (!containsLinkTo(thePerson, theResourceId)) {
// person.addLink().setTarget(new Reference(theResourceId)).setAssurance(canonicalAssuranceLevel.toR4());
// logLinkAddMessage(thePerson, theResourceId, canonicalAssuranceLevel, theEmpiTransactionContext);
// } else {
// person.getLink().stream()
// .filter(link -> link.getTarget().getReference().equalsIgnoreCase(theResourceId.getValue()))
// .findFirst()
// .ifPresent(link -> {
// logLinkUpdateMessage(thePerson, theResourceId, canonicalAssuranceLevel, theEmpiTransactionContext, link.getAssurance().toCode());
// link.setAssurance(canonicalAssuranceLevel.toR4());
// });
// }
// }
// /**
// * Removes a link from the given {@link IBaseResource} to the target {@link IIdType}.
// *
// * @param thePerson The person to remove the link from.
// * @param theResourceId The target ID to remove.
// * @param theEmpiTransactionContext
// */
// public void removeLink(IBaseResource thePerson, IIdType theResourceId, EmpiTransactionContext theEmpiTransactionContext) {
// if (!containsLinkTo(thePerson, theResourceId)) {
// return;
// }
// theEmpiTransactionContext.addTransactionLogMessage("Removing PersonLinkComponent from " + thePerson.getIdElement().toUnqualifiedVersionless() + " -> " + theResourceId.toUnqualifiedVersionless());
// switch (myFhirContext.getVersion().getVersion()) {
// case R4:
// Person person = (Person) thePerson;
// List<Person.PersonLinkComponent> links = person.getLink();
// links.removeIf(component -> component.hasTarget() && component.getTarget().getReference().equals(theResourceId.getValue()));
// break;
// case DSTU3:
// org.hl7.fhir.dstu3.model.Person personDstu3 = (org.hl7.fhir.dstu3.model.Person) thePerson;
// personDstu3.getLink().removeIf(component -> component.hasTarget() && component.getTarget().getReference().equalsIgnoreCase(theResourceId.getValue()));
// break;
// default:
// throw new UnsupportedOperationException("Version not supported: " + myFhirContext.getVersion().getVersion());
// }
// }
/**
* Creates a copy of the specified resource. This method will carry over resource EID if it exists. If it does not exist,
* a randomly generated UUID EID will be created.
@ -244,12 +100,12 @@ public class PersonHelper {
cloneAllExternalEidsIntoNewSourceResource(sourceResourceIdentifier, theIncomingResource, newSourceResource);
addHapiEidIfNoExternalEidIsPresent(newSourceResource, sourceResourceIdentifier);
populateMetaTag(newSourceResource);
addHapiEidIfNoExternalEidIsPresent(newSourceResource, sourceResourceIdentifier, theIncomingResource);
setActive(newSourceResource, resourceDefinition);
EmpiUtil.setEmpiManaged(newSourceResource);
return (T) newSourceResource;
}
@ -266,25 +122,40 @@ public class PersonHelper {
* If there are no external EIDs on the incoming resource, create a new HAPI EID on the new SourceResource.
*/
//TODO GGG ask james if there is any way we can convert this canonical EID into a generic STU-agnostic IBase.
private <T extends IAnyResource> void addHapiEidIfNoExternalEidIsPresent(IBaseResource theNewSourceResource, BaseRuntimeChildDefinition theSourceResourceIdentifier) {
private <T extends IAnyResource> void addHapiEidIfNoExternalEidIsPresent(
IBaseResource theNewSourceResource, BaseRuntimeChildDefinition theSourceResourceIdentifier, IAnyResource theTargetResource) {
List<CanonicalEID> eidsToApply = myEIDHelper.getExternalEid(theNewSourceResource);
if (!eidsToApply.isEmpty()) {
return;
}
CanonicalEID hapiEid = myEIDHelper.createHapiEid();
theSourceResourceIdentifier.getMutator().addValue(theNewSourceResource, toId(hapiEid));
// set identifier on the target resource
cloneEidIntoResource(theTargetResource, hapiEid);
}
private void cloneEidIntoResource(IBaseResource theResourceToCloneInto, CanonicalEID theEid) {
// get a ref to the actual ID Field
RuntimeResourceDefinition resourceDefinition = myFhirContext.getResourceDefinition(theResourceToCloneInto);
// hapi has 2 metamodels: for children and types
BaseRuntimeChildDefinition resourceIdentifier = resourceDefinition.getChildByName("identifier");
cloneEidIntoResource(resourceIdentifier, toId(theEid), theResourceToCloneInto);
}
/**
* Given an Child Definition of `identifier`, a R4/DSTU3 EID Identifier, and a new resource, clone the EID into that resources' identifier list.
*/
private void cloneExternalEidIntoNewSourceResource(BaseRuntimeChildDefinition theSourceResourceIdentifier, IBase theEid, IBase theNewSourceResource) {
private void cloneEidIntoResource(BaseRuntimeChildDefinition theIdentifierDefinition, IBase theEid, IBase theResourceToCloneEidInto) {
// FHIR choice types - fields within fhir where we have a choice of ids
BaseRuntimeElementCompositeDefinition<?> childIdentifier = (BaseRuntimeElementCompositeDefinition<?>) theSourceResourceIdentifier.getChildByName("identifier");
BaseRuntimeElementCompositeDefinition<?> childIdentifier = (BaseRuntimeElementCompositeDefinition<?>) theIdentifierDefinition.getChildByName("identifier");
IBase resourceNewIdentifier = childIdentifier.newInstance();
FhirTerser terser = myFhirContext.newTerser();
IBase sourceResourceNewIdentifier = childIdentifier.newInstance();
terser.cloneInto(theEid, sourceResourceNewIdentifier, true);
theSourceResourceIdentifier.getMutator().addValue(theNewSourceResource, sourceResourceNewIdentifier);
terser.cloneInto(theEid, resourceNewIdentifier, true);
theIdentifierDefinition.getMutator().addValue(theResourceToCloneEidInto, resourceNewIdentifier);
}
private void cloneAllExternalEidsIntoNewSourceResource(BaseRuntimeChildDefinition theSourceResourceIdentifier, IBase theSourceResource, IBase theNewSourceResource) {
@ -298,7 +169,7 @@ public class PersonHelper {
String empiSystem = myEmpiConfig.getEmpiRules().getEnterpriseEIDSystem();
String baseSystem = system.get().getValueAsString();
if (Objects.equals(baseSystem, empiSystem)) {
cloneExternalEidIntoNewSourceResource(theSourceResourceIdentifier, base, theNewSourceResource);
cloneEidIntoResource(theSourceResourceIdentifier, base, theNewSourceResource);
} else if (ourLog.isDebugEnabled()) {
ourLog.debug(String.format("System %s differs from system in the EMPI rules %s", baseSystem, empiSystem));
}
@ -308,13 +179,6 @@ public class PersonHelper {
}
}
private void populateMetaTag(IBaseResource theResource) {
IBaseCoding tag = theResource.getMeta().addTag();
tag.setSystem(EmpiConstants.SYSTEM_EMPI_MANAGED);
tag.setCode(EmpiConstants.CODE_HAPI_EMPI_MANAGED);
tag.setDisplay(EmpiConstants.DISPLAY_HAPI_EMPI_MANAGED);
}
private void validateContextSupported() {
FhirVersionEnum fhirVersion = myFhirContext.getVersion().getVersion();
if (fhirVersion == R4 || fhirVersion == DSTU3) {
@ -362,6 +226,7 @@ public class PersonHelper {
IFhirPath fhirPath = myFhirContext.newFhirPath();
List<IBase> sourceResourceIdentifiers = theSourceResourceIdentifier.getAccessor().getValues(theSourceResource);
List<IBase> clonedIdentifiers = new ArrayList<>();
FhirTerser terser = myFhirContext.newTerser();
for (IBase base : sourceResourceIdentifiers) {
Optional<IPrimitiveType> system = fhirPath.evaluateFirst(base, "system", IPrimitiveType.class);
@ -375,13 +240,9 @@ public class PersonHelper {
continue;
}
}
if (ourLog.isDebugEnabled()) {
ourLog.debug("Copying non-EMPI EID");
}
BaseRuntimeElementCompositeDefinition<?> childIdentifier = (BaseRuntimeElementCompositeDefinition<?>)
theSourceResourceIdentifier.getChildByName("identifier");
FhirTerser terser = myFhirContext.newTerser();
theSourceResourceIdentifier.getChildByName("identifier");
IBase sourceResourceNewIdentifier = childIdentifier.newInstance();
terser.cloneInto(base, sourceResourceNewIdentifier, true);
@ -400,19 +261,6 @@ public class PersonHelper {
RuntimeResourceDefinition resourceDefinition = myFhirContext.getResourceDefinition(theSourceResource);
BaseRuntimeChildDefinition sourceResourceIdentifier = resourceDefinition.getChildByName("identifier");
clearExternalEidsFromTheSourceResource(sourceResourceIdentifier, theSourceResource);
// switch (myFhirContext.getVersion().getVersion()) {
// case R4:
// Person personR4 = (Person) theSourceResource;
// personR4.getIdentifier().removeIf(theIdentifier -> theIdentifier.getSystem().equalsIgnoreCase(myEmpiConfig.getEmpiRules().getEnterpriseEIDSystem()));
// break;
// case DSTU3:
// org.hl7.fhir.dstu3.model.Person personDstu3 = (org.hl7.fhir.dstu3.model.Person) theSourceResource;
// personDstu3.getIdentifier().removeIf(theIdentifier -> theIdentifier.getSystem().equalsIgnoreCase(myEmpiConfig.getEmpiRules().getEnterpriseEIDSystem()));
// break;
// default:
// throw new UnsupportedOperationException("Version not supported: " + myFhirContext.getVersion().getVersion());
// }
}
/**
@ -425,17 +273,11 @@ public class PersonHelper {
if (sourceResourceExternalEids.contains(incomingExternalEid)) {
continue;
} else {
// get a ref to the actual ID Field
RuntimeResourceDefinition resourceDefinition = myFhirContext.getResourceDefinition(theSourceResource);
// hapi has 2 metamodels: for children and types
BaseRuntimeChildDefinition sourceResourceIdentifier = resourceDefinition.getChildByName("identifier");
cloneExternalEidIntoNewSourceResource(sourceResourceIdentifier, toId(incomingExternalEid), theSourceResource);
cloneEidIntoResource(theSourceResource, incomingExternalEid);
}
}
}
private <T> T toId(CanonicalEID eid) {
switch (myFhirContext.getVersion().getVersion()) {
case R4:
@ -605,19 +447,6 @@ public class PersonHelper {
person.setLink(links);
}
// public int getLinkCount(IAnyResource theSourceResource) {
// switch (myFhirContext.getVersion().getVersion()) {
// case R4:
// Person personR4 = (Person) theSourceResource;
// return personR4.getLink().size();
// case DSTU3:
// org.hl7.fhir.dstu3.model.Person personStu3 = (org.hl7.fhir.dstu3.model.Person) theSourceResource;
// return personStu3.getLink().size();
// default:
// throw new UnsupportedOperationException("Version not supported: " + myFhirContext.getVersion().getVersion());
// }
// }
private void log(EmpiTransactionContext theEmpiTransactionContext, String theMessage) {
theEmpiTransactionContext.addTransactionLogMessage(theMessage);
ourLog.debug(theMessage);