Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix for RemovePatientNameTypeCode transformation #1171

Merged
merged 2 commits into from
Jul 11, 2024
Merged

Bugfix for RemovePatientNameTypeCode transformation #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac9c1ea
Added fix for issue in RS: instead of removing PID-5.7 it replaces it…
basiliskus Jul 10, 2024
1af20f4
Changed removePID5_7Extension to setPID5_7ExtensionValue
basiliskus Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .../trustedintermediary/etor/ruleengine/transformation/custom/RemovePatientNameTypeCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ public class RemovePatientNameTypeCode implements CustomFhirTransformation {
@Override
public void transform(final FhirResource<?> resource, final Map<String, String> args) {
Bundle bundle = (Bundle) resource.getUnderlyingResource();
HapiHelper.removePID5_7Extension(bundle);
// Need to set the value for extension to empty instead of removing the extension,
// otherwise RS will set its own value in its place
HapiHelper.setPID5_7ExtensionValue(bundle, null);
}
}
6 changes: 4 additions & 2 deletions shared/src/main/java/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,12 @@ public static Extension getPID5Extension(Bundle bundle) {
return name.getExtensionByUrl(HapiHelper.EXTENSION_XPN_HUMAN_NAME_URL);
}

public static void removePID5_7Extension(Bundle bundle) {
public static void setPID5_7ExtensionValue(Bundle bundle, String value) {
Extension extension = getPID5Extension(bundle);
if (extension != null && extension.hasExtension(HapiHelper.EXTENSION_XPN7_URL)) {
extension.removeExtension(HapiHelper.EXTENSION_XPN7_URL);
extension
.getExtensionByUrl(HapiHelper.EXTENSION_XPN7_URL)
.setValue(new StringType(value));
}
}

Expand Down
6 changes: 3 additions & 3 deletions shared/src/test/groovy/gov/hhs/cdc/trustedintermediary/external/hapi/HapiHelperTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,15 +457,15 @@ class HapiHelperTest extends Specification {

when:
def bundle = new Bundle()
HapiHelper.removePID5_7Extension(bundle)
HapiHelper.setPID5_7ExtensionValue(bundle, null)

then:
HapiHelper.getPID5Extension(bundle) == null

when:
HapiFhirHelper.createPIDPatient(bundle)
HapiFhirHelper.setPID5Extension(bundle)
HapiHelper.removePID5_7Extension(bundle)
HapiHelper.setPID5_7ExtensionValue(bundle, null)

then:
HapiFhirHelper.getPID5_7Value(bundle) == null
Expand All @@ -478,7 +478,7 @@ class HapiHelperTest extends Specification {
HapiFhirHelper.getPID5_7Value(bundle) == pid5_7

when:
HapiHelper.removePID5_7Extension(bundle)
HapiHelper.setPID5_7ExtensionValue(bundle, null)

then:
HapiHelper.getPID5Extension(bundle) != null
Expand Down