Skip to content

Commit 1dc3355

Browse files
committed
TPP confidentiality code fix
1 parent 0e6a384 commit 1dc3355

File tree

3 files changed

+11
-21
lines changed

3 files changed

+11
-21
lines changed

service/src/main/java/uk/nhs/adaptors/gp2gp/common/service/ConfidentialityService.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@
1515
public class ConfidentialityService {
1616
private static final String REDACTION_CODE_SYSTEM = "http://hl7.org/fhir/v3/ActCode";
1717
public static final String NOPAT = "NOPAT";
18-
private static final String REDACTION_CONFIDENTIALITY_CODE = """
19-
<confidentialityCode
20-
code="NOPAT"
21-
codeSystem="2.16.840.1.113883.4.642.3.47"
22-
displayName="no disclosure to patient, family or caregivers without attending provider's authorization"
23-
/>""";
18+
public static final String REDACTION_CONFIDENTIALITY_CODE = "<confidentialityCode code=\"NOPAT\" "
19+
+ "codeSystem=\"2.16.840.1.113883.4.642.3.47\" "
20+
+ "displayName=\"no disclosure to patient, family or caregivers without attending provider's authorization\" />";
2421

2522
private final RedactionsContext redactionsContext;
2623

service/src/test/java/uk/nhs/adaptors/gp2gp/common/service/ConfidentialityServiceTest.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,10 @@ public void When_GenerateAndIsRedactionMessageAndNOPATMetaSecurityIsPresent_Expe
9696

9797
var confidentialityCode = confidentialityService.generateConfidentialityCode(resource);
9898

99-
assertThat(confidentialityCode)
100-
.isPresent();
99+
assertThat(confidentialityCode).isPresent();
101100
assertThat(confidentialityCode.get())
102-
.isEqualTo("""
103-
<confidentialityCode
104-
code="NOPAT"
105-
codeSystem="2.16.840.1.113883.4.642.3.47"
106-
displayName="no disclosure to patient, family or caregivers without attending provider's authorization"
107-
/>"""
108-
);
101+
.isEqualTo(new String("<confidentialityCode code=\"NOPAT\" "
102+
+ "codeSystem=\"2.16.840.1.113883.4.642.3.47\" "
103+
+ "displayName=\"no disclosure to patient, family or caregivers without attending provider's authorization\" />"));
109104
}
110105
}

service/src/test/java/uk/nhs/adaptors/gp2gp/utils/ConfidentialityCodeUtility.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ public final class ConfidentialityCodeUtility {
1010
private ConfidentialityCodeUtility() { }
1111
public static final String NOPAT = "NOPAT";
1212
public static final String NOSCRUB = "NOSCRUB";
13-
public static final String NOPAT_HL7_CONFIDENTIALITY_CODE = """
14-
<confidentialityCode
15-
code="NOPAT"
16-
codeSystem="2.16.840.1.113883.4.642.3.47"
17-
displayName="no disclosure to patient, family or caregivers without attending provider's authorization" />
18-
""";
13+
public static final String NOPAT_HL7_CONFIDENTIALITY_CODE =
14+
"<confidentialityCode code=\"NOPAT\" "
15+
+ "codeSystem=\"2.16.840.1.113883.4.642.3.47\" "
16+
+ "displayName=\"no disclosure to patient, family or caregivers without attending provider's authorization\" />";
1917

2018
public static <R extends DomainResource> String getSecurityCodeFromResource(R resource) {
2119
return resource.getMeta()

0 commit comments

Comments
 (0)