Temporary disabling changes introduced in NIAD-3153 and NIAD-3154 (#1174)

* temporary disabling changes introduced in NIAD-3153 and NIAD-3154

* spotbugs

Author: ORybak5

CHANGELOG.md

@@ -15,8 +15,6 @@ 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
-* When the ReferralRequest.meta.security field contains NOPAT, the GP2GP Adaptor will now populate the RequestStatement / confidentialityCode field accordingly.
-* The GP2GP Adaptor now populates the CompoundStatement / confidentialityCode field when Observation.meta.security field contains NOPAT
 
 ## [2.2.2] - 2025-02-07
 

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

@@ -62,14 +62,11 @@ public class BloodPressureMapper {
 
     public String mapBloodPressure(Observation observation, boolean isNested) {
 
-        var confidentialityCode = confidentialityService.generateConfidentialityCode(observation);
-
         BloodPressureParametersBuilder builder = BloodPressureParameters.builder()
             .isNested(isNested)
             .id(messageContext.getIdMapper().getOrNew(ResourceType.Observation, observation.getIdElement()))
             .effectiveTime(prepareEffectiveTimeForObservation(observation))
             .availabilityTime(prepareAvailabilityTimeForObservation(observation))
-            .confidentialityCode(confidentialityCode.orElse(null))
             .compoundStatementCode(buildBloodPressureCode(observation));
 
         extractBloodPressureComponent(observation, SYSTOLIC_CODE).ifPresent(observationComponent -> {

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

@@ -103,14 +103,11 @@ 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/BloodPressureParameters.java

@@ -23,5 +23,4 @@ public class BloodPressureParameters {
     private String systolicCode;
     private String diastolicCode;
     private String participant;
-    private String confidentialityCode;
 }

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

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

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

@@ -7,9 +7,6 @@
             {{{effectiveTime}}}
         </effectiveTime>
         {{{availabilityTime}}}
-        {{#confidentialityCode}}
-            {{{confidentialityCode}}}
-        {{/confidentialityCode}}
         {{#systolicId}}
         <component typeCode="COMP" contextConductionInd="true">
             <ObservationStatement classCode="OBS" moodCode="EVN">

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

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

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

@@ -5,6 +5,7 @@
 import org.hl7.fhir.dstu3.model.Observation;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -94,6 +95,7 @@ public void tearDown() {
         messageContext.resetMessageContext();
     }
 
+    @Disabled
     @Test
     public void When_MappingBloodPressureWithNopat_Expect_CompoundStatementWithConfidentialityCode() {
         when(mockCodeableConceptCdMapper.mapCodeableConceptToCdForBloodPressure(any(CodeableConcept.class)))

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

@@ -18,6 +18,7 @@
 import org.hl7.fhir.dstu3.model.ResourceType;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -359,6 +360,7 @@ public void When_MappingReferralRequestJsonWithNestedTrue_Expect_RequestStatemen
         assertThat(outputMessage).isEqualTo(expectedOutputMessage);
     }
 
+    @Disabled
     @Test
     public void When_MappingReferralRequestWithNoPat_Expect_RequestStatementWithConfidentialityCode() {
         when(confidentialityService.generateConfidentialityCode(any(ReferralRequest.class)))