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

WIP removing Person

This commit is contained in:
Nick Goupinets 2020-11-05 14:23:53 -05:00
parent 656b8aeba7
commit 4bfc62804c
6 changed files with 68 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hapi-fhir-jpaserver-empi/smile.basedir_IS_UNDEFINED/Link Service.puml Normal file
View File

@ -0,0 +1,26 @@
@startuml
abstract class AbstractList
abstract AbstractCollection
interface List
interface Collection
List <|-- AbstractList
Collection <|-- AbstractCollection
Collection <|- List
AbstractCollection <|- AbstractList
AbstractList <|-- ArrayList
class ArrayList {
Object[] elementData
size()
}
enum TimeUnit {
DAYS
HOURS
MINUTES
}
@enduml

6
hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiMatchLinkSvc.java
View File

@ -120,8 +120,12 @@ public class EmpiMatchLinkSvc {
}
private void handleEmpiWithNoCandidates(IAnyResource theResource, EmpiTransactionContext theEmpiTransactionContext) {
log(theEmpiTransactionContext, "There were no matched candidates for EMPI, creating a new Person.");
log(theEmpiTransactionContext, String.format("There were no matched candidates for EMPI, creating a new %s.", theResource.getIdElement().getResourceType()));
IAnyResource newPerson = myPersonHelper.createPersonFromEmpiTarget(theResource);
// TODO GGG :)
// 1. Get the right helper
// 2. Create source resoruce for the EMPI target
// 3. UPDATE EMPI LINK TABLE
myEmpiLinkSvc.updateLink(newPerson, theResource, EmpiMatchOutcome.NEW_PERSON_MATCH, EmpiLinkSourceEnum.AUTO, theEmpiTransactionContext);
}

1
hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/BaseEmpiR4Test.java
View File

@ -167,6 +167,7 @@ abstract public class BaseEmpiR4Test extends BaseJpaR4Test {
protected Patient createPatient(Patient thePatient) {
//Note that since our empi-rules block on active=true, all patients must be active.
thePatient.setActive(true);
DaoMethodOutcome outcome = myPatientDao.create(thePatient);
Patient patient = (Patient) outcome.getResource();
patient.setId(outcome.getId());

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

@ -205,7 +205,7 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
//We want to make sure the patients were linked to the same person.
assertThat(patient, is(sameSourceResourceAs(janePatient)));
Patient sourcePatient = (Patient)getSourceResourceFromTargetResource(patient);
Patient sourcePatient = (Patient) getSourceResourceFromTargetResource(patient);
List<Identifier> identifier = sourcePatient.getIdentifier();
@ -424,7 +424,7 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
@Test
public void testPatientUpdateOverwritesPersonDataOnChanges() {
Patient janePatient = createPatientAndUpdateLinks(buildJanePatient());
Patient janeSourcePatient = (Patient)getSourceResourceFromTargetResource(janePatient);
Patient janeSourcePatient = (Patient) getSourceResourceFromTargetResource(janePatient);
//Change Jane's name to paul.
Patient patient1 = buildPaulPatient();
@ -434,7 +434,7 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
assertThat(janeSourcePatient, is(sameSourceResourceAs(janePaulPatient)));
//Ensure the related person was updated with new info.
Patient sourcePatientFromTarget = (Patient) t geetSourceResourceFromTargetResource(janePaulPatient);
Patient sourcePatientFromTarget = (Patient) getSourceResourceFromTargetResource(janePaulPatient);
HumanName nameFirstRep = sourcePatientFromTarget.getNameFirstRep();
assertThat(nameFirstRep.getGivenAsSingleString(), is(equalToIgnoringCase("paul")));
}
@ -445,8 +445,8 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
paul.setGender(Enumerations.AdministrativeGender.MALE);
paul = createPatientAndUpdateLinks(paul);
Person personFromTarget = getSourceResourceFromTargetResource(paul);
assertThat(personFromTarget.getGender(), is(equalTo(Enumerations.AdministrativeGender.MALE)));
Patient sourcePatientFromTarget = (Patient) getSourceResourceFromTargetResource(paul);
assertThat(sourcePatientFromTarget.getGender(), is(equalTo(Enumerations.AdministrativeGender.MALE)));
Patient paul2 = buildPaulPatient();
paul2.setGender(Enumerations.AdministrativeGender.FEMALE);
@ -455,7 +455,7 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
assertThat(paul2, is(sameSourceResourceAs(paul)));
//Newly matched patients aren't allowed to overwrite Person Attributes unless they are empty, so gender should still be set to male.
Person paul2Person = getSourceResourceFromTargetResource(paul2);
Patient paul2Person = (Patient) getSourceResourceFromTargetResource(paul2);
assertThat(paul2Person.getGender(), is(equalTo(Enumerations.AdministrativeGender.MALE)));
}
@ -467,16 +467,16 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
paul.getBirthDateElement().setValueAsString(incorrectBirthdate);
paul = createPatientAndUpdateLinks(paul);
Person personFromTarget = getSourceResourceFromTargetResource(paul);
assertThat(personFromTarget.getBirthDateElement().getValueAsString(), is(incorrectBirthdate));
Patient sourcePatientFromTarget = (Patient) getSourceResourceFromTargetResource(paul);
assertThat(sourcePatientFromTarget.getBirthDateElement().getValueAsString(), is(incorrectBirthdate));
String correctBirthdate = "1990-06-28";
paul.getBirthDateElement().setValueAsString(correctBirthdate);
paul = updatePatientAndUpdateLinks(paul);
personFromTarget = getSourceResourceFromTargetResource(paul);
assertThat(personFromTarget.getBirthDateElement().getValueAsString(), is(equalTo(correctBirthdate)));
sourcePatientFromTarget = (Patient) getSourceResourceFromTargetResource(paul);
assertThat(sourcePatientFromTarget.getBirthDateElement().getValueAsString(), is(equalTo(correctBirthdate)));
assertLinkCount(1);
}
@ -487,16 +487,16 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
String EID_2 = "456";
Patient paul = createPatientAndUpdateLinks(addExternalEID(buildPaulPatient(), EID_1));
Person originalPaulPerson = getSourceResourceFromTargetResource(paul);
Patient originalPaulPatient = (Patient) getSourceResourceFromTargetResource(paul);
Patient jane = createPatientAndUpdateLinks(addExternalEID(buildJanePatient(), EID_2));
Person originalJanePerson = getSourceResourceFromTargetResource(jane);
Patient originalJanePatient = (Patient) getSourceResourceFromTargetResource(jane);
clearExternalEIDs(paul);
addExternalEID(paul, EID_2);
updatePatientAndUpdateLinks(paul);
assertThat(originalJanePerson, is(possibleDuplicateOf(originalPaulPerson)));
assertThat(originalJanePatient, is(possibleDuplicateOf(originalPaulPatient)));
assertThat(jane, is(sameSourceResourceAs(paul)));
}
@ -507,8 +507,8 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
String EID_2 = "456";
Patient paul = createPatientAndUpdateLinks(addExternalEID(buildPaulPatient(), EID_1));
Person originalPaulPerson = getSourceResourceFromTargetResource(paul);
String oldEid = myEidHelper.getExternalEid(originalPaulPerson).get(0).getValue();
Patient originalPaulPatient = (Patient) getSourceResourceFromTargetResource(paul);
String oldEid = myEidHelper.getExternalEid(originalPaulPatient).get(0).getValue();
assertThat(oldEid, is(equalTo(EID_1)));
clearExternalEIDs(paul);
@ -518,9 +518,9 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
assertNoDuplicates();
Person newlyFoundPaulPerson = getSourceResourceFromTargetResource(paul);
assertThat(originalPaulPerson, is(sameSourceResourceAs(newlyFoundPaulPerson)));
String newEid = myEidHelper.getExternalEid(newlyFoundPaulPerson).get(0).getValue();
Patient newlyFoundPaulPatient = (Patient) getSourceResourceFromTargetResource(paul);
assertThat(originalPaulPatient, is(sameSourceResourceAs(newlyFoundPaulPatient)));
String newEid = myEidHelper.getExternalEid(newlyFoundPaulPatient).get(0).getValue();
assertThat(newEid, is(equalTo(EID_2)));
}
@ -565,28 +565,4 @@ public class EmpiMatchLinkSvcTest extends BaseEmpiR4Test {
assertThat(patient3, is(possibleDuplicateOf(patient1)));
}
@Test
public void testPatientUpdatesCauseCandidateSearchToContainExistingLinksAndNewFinds() {
Date today = new Date();
Patient jane = buildJaneWithBirthday(today);
jane.setActive(true);
Patient janePatient = createPatientAndUpdateLinks(jane);
Person janePerson = getSourceResourceFromTargetResource(janePatient);
Patient paul = buildPaulPatient();
paul.setActive(true);
Patient paulPatient = createPatientAndUpdateLinks(paul);
Person paulPerson = getSourceResourceFromTargetResource(paulPatient);
paulPatient.setBirthDate(jane.getBirthDate());
paulPatient.setName(jane.getName());
myEmpiMatchLinkSvc.updateEmpiLinksForEmpiTarget(paulPatient, createContextForUpdate());
assertThat(paulPerson.getBirthDate(), is(nullValue()));
paulPerson = getSourceResourceFromTargetResource(paulPatient);
assertThat(paulPerson.getBirthDate(), is(notNullValue()));
}
}

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

@ -220,13 +220,15 @@ public class PersonHelper {
}
switch (myFhirContext.getVersion().getVersion()) {
case R4:
Person personR4 = new Person();
personR4.setActive(true);
eidsToApply.forEach(eid -> personR4.addIdentifier(eid.toR4()));
personR4.getMeta().addTag((Coding) buildEmpiManagedTag());
copyEmpiTargetDataIntoPerson(theSourceResource, personR4, true);
return personR4;
// Person personR4 = new Person();
//
// personR4.setActive(true);
// eidsToApply.forEach(eid -> personR4.addIdentifier(eid.toR4()));
// personR4.getMeta().addTag((Coding) buildEmpiManagedTag());
// copyEmpiTargetDataIntoPerson(theSourceResource, personR4, true);
// return personR4;
// IAnyResource sourceResource = theSourceResource;
return null;
case DSTU3:
org.hl7.fhir.dstu3.model.Person personDstu3 = new org.hl7.fhir.dstu3.model.Person();
personDstu3.setActive(true);

9
hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/SourceResourceBuilder.java Normal file
View File

@ -0,0 +1,9 @@
package ca.uhn.fhir.empi.util;
import org.hl7.fhir.instance.model.api.IAnyResource;
public class SourceResourceBuilder {
IAnyResource copy(IAnyResource)
}