NIAD-3153: Adding confidentialityCode to RequestStatement (#1149)

* Adding confidentialityCode to RequestStatement

* changelog

Author: ORybak5

CHANGELOG.md

@@ -14,8 +14,8 @@ In the case that neither of these are present, the existing behavior of using th
 
 ### Added
 
-* GP2GP Adaptor now populates the PlanStatement / confidentialityCode field 
-when the ProcedureRequest.meta.security field contains NOPAT and the message type is RCMR_IN030000UK07
+* GP2GP Adaptor now populates the PlanStatement / confidentialityCode field when the ProcedureRequest.meta.security field contains NOPAT
+* When the ReferralRequest.meta.security field contains NOPAT, the GP2GP Adaptor will now populate the RequestStatement / confidentialityCode field accordingly.
 
 ## [2.2.2] - 2025-02-07
 

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/CodeableConceptCdMapper.java

@@ -62,8 +62,7 @@ public String mapCodeableConceptForMedication(CodeableConcept codeableConcept) {
 
     private String mapCodeableConcept(
         CodeableConcept codeableConcept,
-        BiFunction<Optional<List<Extension>>, Coding, Optional<String>> getMainCodeFunction
-    ) {
+        BiFunction<Optional<List<Extension>>, Coding, Optional<String>> getMainCodeFunction) {
         Optional<Coding> snomedCodeCoding = getSnomedCodeCoding(codeableConcept);
 
         if (snomedCodeCoding.isEmpty()) {

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/RequestStatementMapper.java

@@ -33,6 +33,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import uk.nhs.adaptors.gp2gp.common.service.ConfidentialityService;
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrMapperException;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.parameters.RequestStatementTemplateParameters;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.parameters.RequestStatementTemplateParameters.RequestStatementTemplateParametersBuilder;
@@ -66,11 +67,6 @@ public class RequestStatementMapper {
     private static final String NOTE_WITH_NO_AUTHOR_AND_TIME = "Annotation: %s";
     private static final String COMMA = ", ";
 
-    private static final String PRIORITY_CODE_IMMEDIATE =
-        "<priorityCode code=\"88694003\" displayName=\"Immediate\" codeSystem=\"2.16.840.1.113883.2.1.3.2.4.15\">"
-            + "<originalText>Asap</originalText>"
-            + "</priorityCode>";
-
     private static final String PRIORITY_CODE_NORMAL =
         "<priorityCode code=\"394848005\" displayName=\"Normal\" codeSystem=\"2.16.840.1.113883.2.1.3.2.4.15\">"
             + "<originalText>Routine</originalText>"
@@ -84,6 +80,7 @@ public class RequestStatementMapper {
     private final MessageContext messageContext;
     private final CodeableConceptCdMapper codeableConceptCdMapper;
     private final ParticipantMapper participantMapper;
+    private final ConfidentialityService confidentialityService;
 
     public String mapReferralRequestToRequestStatement(ReferralRequest referralRequest, boolean isNested) {
         return new InnerMapper(referralRequest, isNested).map();
@@ -106,11 +103,14 @@ private String map() {
                 processAgent(agentRef, onBehalfOf);
             }
 
+            var confidentialityCode = confidentialityService.generateConfidentialityCode(referralRequest);
+
             final IdMapper idMapper = messageContext.getIdMapper();
             templateParameters
                 .requestStatementId(idMapper.getOrNew(ResourceType.ReferralRequest, referralRequest.getIdElement()))
                 .isNested(isNested)
                 .availabilityTime(StatementTimeMappingUtils.prepareAvailabilityTime(referralRequest.getAuthoredOnElement()))
+                .confidentialityCode(confidentialityCode.orElse(null))
                 .text(buildTextDescription())
                 .priorityCode(buildPriorityCode())
                 .code(buildCode());

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/parameters/RequestStatementTemplateParameters.java

@@ -17,4 +17,5 @@ public class RequestStatementTemplateParameters {
     private String participant;
     private String responsibleParty;
     private String text;
+    private String confidentialityCode;
 }

service/src/main/resources/templates/ehr_request_statement_template.mustache

@@ -10,6 +10,9 @@
             <center nullFlavor="NI"/>
         </effectiveTime>
         {{{availabilityTime}}}
+        {{#confidentialityCode}}
+            {{{confidentialityCode}}}
+        {{/confidentialityCode}}
         {{#priorityCode}}
         {{{priorityCode}}}
         {{/priorityCode}}

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapperComponentTest.java

@@ -187,7 +187,7 @@ codeableConceptCdMapper, new ParticipantMapper()),
                 codeableConceptCdMapper,
                 participantMapper
             ),
-            new RequestStatementMapper(messageContext, codeableConceptCdMapper, participantMapper),
+            new RequestStatementMapper(messageContext, codeableConceptCdMapper, participantMapper, confidentialityService),
             new DiagnosticReportMapper(
                 messageContext, specimenMapper, participantMapper, randomIdGeneratorService, confidentialityService
             ),

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EncounterComponentsMapperTest.java

@@ -181,7 +181,7 @@ public void setUp() {
                 confidentialityService
             );
         RequestStatementMapper requestStatementMapper
-            = new RequestStatementMapper(messageContext, codeableConceptCdMapper, participantMapper);
+            = new RequestStatementMapper(messageContext, codeableConceptCdMapper, participantMapper, confidentialityService);
         DiagnosticReportMapper diagnosticReportMapper = new DiagnosticReportMapper(
             messageContext, specimenMapper, participantMapper, randomIdGeneratorService, confidentialityService
         );

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/RequestStatementMapperTest.java

@@ -6,10 +6,10 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
+import static uk.nhs.adaptors.gp2gp.utils.ConfidentialityCodeUtility.NOPAT_HL7_CONFIDENTIALITY_CODE;
 
-import java.io.IOException;
+import java.util.Optional;
 import java.util.stream.Stream;
-
 import org.hl7.fhir.dstu3.model.Bundle;
 import org.hl7.fhir.dstu3.model.CodeableConcept;
 import org.hl7.fhir.dstu3.model.IdType;
@@ -30,6 +30,7 @@
 
 import org.mockito.stubbing.Answer;
 
+import uk.nhs.adaptors.gp2gp.common.service.ConfidentialityService;
 import uk.nhs.adaptors.gp2gp.common.service.FhirParseService;
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrMapperException;
 import uk.nhs.adaptors.gp2gp.utils.CodeableConceptMapperMockUtil;
@@ -77,6 +78,7 @@ public class RequestStatementMapperTest {
         + "example-referral-request-no-resolved-reference-requester.json";
     private static final String INPUT_JSON_WITH_NO_RESOLVED_REFERENCE_RECIPIENT = TEST_FILE_DIRECTORY
         + "example-referral-request-no-resolved-reference-recipient.json";
+    private static final String INPUT_JSON_WITH_NOPAT = TEST_FILE_DIRECTORY + "example-referral-request-with-nopat.json";
     private static final String INPUT_JSON_WITH_NO_RESOLVED_REFERENCE_NOTE_AUTHOR = TEST_FILE_DIRECTORY
         + "example-referral-request-no-resolved-reference-note-author.json";
     private static final String INPUT_JSON_WITH_PRACTITIONER_REQUESTER_NO_ONBEHALFOF = TEST_FILE_DIRECTORY
@@ -197,6 +199,8 @@ public class RequestStatementMapperTest {
     private IdMapper idMapper;
     @Mock
     private AgentDirectory agentDirectory;
+    @Mock
+    private ConfidentialityService confidentialityService;
 
     private InputBundle inputBundle;
 
@@ -272,7 +276,7 @@ private static Stream<Arguments> resourceFileParamsWithInvalidData() {
     }
 
     @BeforeEach
-    public void setUp() throws IOException {
+    public void setUp() {
         var bundleInput = ResourceTestFileUtils.getFileContent(INPUT_JSON_BUNDLE);
         Bundle bundle = new FhirParseService().parseResource(bundleInput, Bundle.class);
         inputBundle = new InputBundle(bundle);
@@ -285,7 +289,10 @@ public void setUp() throws IOException {
         lenient().when(agentDirectory.getAgentId(any(Reference.class))).thenAnswer(mockIdForReference());
         lenient().when(agentDirectory.getAgentRef(any(Reference.class), any(Reference.class))).thenAnswer(mockIdForAgentReference());
 
-        requestStatementMapper = new RequestStatementMapper(messageContext, codeableConceptCdMapper, new ParticipantMapper());
+        requestStatementMapper = new RequestStatementMapper(messageContext,
+                                                            codeableConceptCdMapper,
+                                                            new ParticipantMapper(),
+                                                            confidentialityService);
     }
 
     private Answer<String> mockIdForResourceAndId() {
@@ -342,7 +349,7 @@ public void When_MappingObservationJsonWithReason_Expect_NarrativeStatementXmlOu
     }
 
     @Test
-    public void When_MappingReferralRequestJsonWithNestedTrue_Expect_RequestStatementXmlOutput() throws IOException {
+    public void When_MappingReferralRequestJsonWithNestedTrue_Expect_RequestStatementXmlOutput() {
         String expectedOutputMessage = ResourceTestFileUtils.getFileContent(OUTPUT_XML_USES_NO_OPTIONAL_FIELDS_NESTED);
         var jsonInput = ResourceTestFileUtils.getFileContent(INPUT_JSON_WITH_NO_OPTIONAL_FIELDS);
         ReferralRequest parsedReferralRequest = new FhirParseService().parseResource(jsonInput, ReferralRequest.class);
@@ -352,10 +359,21 @@ public void When_MappingReferralRequestJsonWithNestedTrue_Expect_RequestStatemen
         assertThat(outputMessage).isEqualTo(expectedOutputMessage);
     }
 
+    @Test
+    public void When_MappingReferralRequestWithNoPat_Expect_RequestStatementWithConfidentialityCode() {
+        when(confidentialityService.generateConfidentialityCode(any(ReferralRequest.class)))
+            .thenReturn(Optional.of(NOPAT_HL7_CONFIDENTIALITY_CODE));
+        var jsonInput = ResourceTestFileUtils.getFileContent(INPUT_JSON_WITH_NOPAT);
+        ReferralRequest parsedReferralRequest = new FhirParseService().parseResource(jsonInput, ReferralRequest.class);
+
+        String outputMessage = requestStatementMapper.mapReferralRequestToRequestStatement(parsedReferralRequest, true);
+
+        assertThat(outputMessage).contains(NOPAT_HL7_CONFIDENTIALITY_CODE);
+    }
+
     @ParameterizedTest
     @MethodSource("resourceFileParamsWithInvalidData")
-    public void When_MappingReferralRequestJsonWithInvalidData_Expect_Exception(String inputJson, String exceptionMessage)
-        throws IOException {
+    public void When_MappingReferralRequestJsonWithInvalidData_Expect_Exception(String inputJson, String exceptionMessage) {
         var jsonInput = ResourceTestFileUtils.getFileContent(inputJson);
         ReferralRequest parsedReferralRequest = new FhirParseService().parseResource(jsonInput, ReferralRequest.class);
 

service/src/test/java/uk/nhs/adaptors/gp2gp/uat/EhrExtractUATTest.java

@@ -207,7 +207,7 @@ codeableConceptCdMapper, new ParticipantMapper()),
                 codeableConceptCdMapper,
                 participantMapper
             ),
-            new RequestStatementMapper(messageContext, codeableConceptCdMapper, participantMapper),
+            new RequestStatementMapper(messageContext, codeableConceptCdMapper, participantMapper, confidentialityService),
             new DiagnosticReportMapper(messageContext, specimenMapper, participantMapper, randomIdGeneratorService, confidentialityService),
             new BloodPressureValidator(),
             codeableConceptCdMapper

service/src/test/resources/ehr/mapper/referral/example-referral-request-with-nopat.json

@@ -0,0 +1,36 @@
+{
+    "resourceType": "ReferralRequest",
+    "id": "E63AF323-919F-4D5F-9A1D-BA933BC230BC",
+    "meta": {
+        "profile": [
+            "https://fhir.nhs.uk/STU3/StructureDefinition/CareConnect-GPC-Immunization-1"
+        ],
+        "security": [{
+            "system":"http://hl7.org/fhir/v3/ActCode",
+            "code":"NOPAT",
+            "display":"no disclosure to patient, family or caregivers without attending provider's authorization"
+        }]
+    },
+    "authoredOn": "2010-01-19",
+    "priority": "routine",
+    "description": "Referred for investigation into low blood pressure",
+    "specialty": {
+        "coding": [
+            {
+                "system": "http://hl7.org/fhir/v3/NullFlavor",
+                "code": "UNK",
+                "display": "unknown"
+            }
+        ]
+    },
+    "identifier": [
+        {
+            "system": "https://fhir.nhs.uk/Id/cross-care-setting-identifier",
+            "value": "B154D1A3-D631-49BD-8B67-2F76D7D85865"
+        },
+        {
+            "system": "https://fhir.nhs.uk/Id/ubr-number",
+            "value": "bb2378b6-dde2-11e9-9d36-2a2ae2dbcce4"
+        }
+    ]
+}