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-16 19:12:08 -05:00
parent 511696bd84 406bbafafe
commit 9940d4c4eb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java
View File

@ -11,6 +11,8 @@ import ca.uhn.fhir.empi.rules.similarity.EmpiSimilarityEnum;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.BeforeEach;
import java.util.ArrayList;
public abstract class BaseEmpiRulesR4Test extends BaseR4Test {
public static final String PATIENT_GIVEN = "patient-given";
public static final String PATIENT_FAMILY = "patient-last";
@ -18,9 +20,16 @@ public abstract class BaseEmpiRulesR4Test extends BaseR4Test {
public static final double NAME_THRESHOLD = 0.8;
protected EmpiFieldMatchJson myGivenNameMatchField;
protected String myBothNameFields;
protected EmpiRulesJson myEmpiRulesJson;
@BeforeEach
public void before() {
myEmpiRulesJson = new EmpiRulesJson();
ArrayList<String> myLegalMdmTypes = new ArrayList<>();
myLegalMdmTypes.add("Patient");
myEmpiRulesJson.setMdmTypes(myLegalMdmTypes);
myGivenNameMatchField = new EmpiFieldMatchJson()
.setName(PATIENT_GIVEN)
.setResourceType("Patient")

4
hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceFieldMatcherR4Test.java
View File

@ -23,16 +23,12 @@ public class EmpiResourceFieldMatcherR4Test extends BaseEmpiRulesR4Test {
protected EmpiResourceFieldMatcher myComparator;
private Patient myJohn;
private Patient myJohny;
private EmpiRulesJson myEmpiRulesJson;
@Override
@BeforeEach
public void before() {
super.before();
ArrayList<String> myLegalMdmTypes = new ArrayList<>();
//myLegalMdmTypes.add("Patient");
myEmpiRulesJson.setMdmTypes(myLegalMdmTypes);
myComparator = new EmpiResourceFieldMatcher(ourFhirContext, myGivenNameMatchField, myEmpiRulesJson);
myJohn = buildJohn();
myJohny = buildJohny();