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-19 14:23:50 -05:00
parent f11f8a38ac b44ae49dd2
commit 3ad0fa8fda
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptor.java
View File

@ -107,7 +107,7 @@ public class MdmStorageInterceptor implements IMdmStorageInterceptor {
@Hook(Pointcut.STORAGE_PRESTORAGE_RESOURCE_DELETED) @Hook(Pointcut.STORAGE_PRESTORAGE_RESOURCE_DELETED)
public void deleteMdmLinks(RequestDetails theRequest, IBaseResource theResource) { public void deleteMdmLinks(RequestDetails theRequest, IBaseResource theResource) {
if (!MdmUtil.isMdmResourceType(myFhirContext, theResource)) { if (!myMdmSettings.isSupportedMdmType(myFhirContext.getResourceType(theResource))) {
return; return;
} }
myMdmLinkDeleteSvc.deleteWithAnyReferenceTo(theResource); myMdmLinkDeleteSvc.deleteWithAnyReferenceTo(theResource);

8
hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MdmUtil.java
View File

@ -31,14 +31,6 @@ import java.util.Optional;
public final class MdmUtil { public final class MdmUtil {
private MdmUtil() {} private MdmUtil() {}
public static boolean isMdmResourceType(FhirContext theFhirContext, IBaseResource theResource) {
String resourceType = theFhirContext.getResourceType(theResource);
return ("Patient".equals(resourceType) ||
"Practitioner".equals(resourceType)) ||
"Person".equals(resourceType);
}
/** /**
* If the resource is tagged as not managed by empi, return false. Otherwise true. * If the resource is tagged as not managed by empi, return false. Otherwise true.
* @param theBaseResource The Patient/Practitioner that is potentially managed by EMPI. * @param theBaseResource The Patient/Practitioner that is potentially managed by EMPI.