[NIAD-3029] Full PS Adaptor Compatibility with RCMR_IN030000UK07 Mess…

…age Type (#666)
NHSDigital · Jun 28, 2024 · 0907119 · 0907119
1 parent 68c1a5d
commit 0907119
Show file tree

Hide file tree

Showing 214 changed files with 45,498 additions and 29,835 deletions.
diff --git a/...tor/src/integrationTest/java/uk/nhs/adaptors/pss/translator/mapper/ConditionMapperIT.java b/...tor/src/integrationTest/java/uk/nhs/adaptors/pss/translator/mapper/ConditionMapperIT.java
@@ -13,7 +13,7 @@
 import org.hl7.fhir.dstu3.model.Condition;
 import org.hl7.fhir.dstu3.model.Observation;
 import org.hl7.fhir.dstu3.model.Patient;
-import org.hl7.v3.RCMRMT030101UK04EhrExtract;
+import org.hl7.v3.RCMRMT030101UKEhrExtract;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -63,7 +63,7 @@ public static Stream<Arguments> ehrExtractsWithObservationActualProblemCode() {
     @MethodSource("ehrExtractsWithObservationActualProblemCode")
     public void When_AddReferences_With_ObservationAsProblem_Expect_CodeAddedToCondition(String filename) {
 
-        final RCMRMT030101UK04EhrExtract ehrExtract = unmarshallEhrExtract(filename);
+        final RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract(filename);
         final List<Condition> conditions = conditionMapper.mapResources(ehrExtract, patient, List.of(), PRACTISE_CODE);
 
         conditionMapper.addReferences(buildBundleWithNamedStatementObservation(), conditions, ehrExtract);
@@ -88,7 +88,7 @@ public static Stream<Arguments> ehrExtractsWithAllergyIntoleranceActualProblemCo
     @MethodSource("ehrExtractsWithAllergyIntoleranceActualProblemCode")
     public void When_AddReferences_With_AllergyIntoleranceAsProblem_Expect_CodeAddedToCondition(String filename) {
 
-        final RCMRMT030101UK04EhrExtract ehrExtract = unmarshallEhrExtract(filename);
+        final RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract(filename);
         final List<Condition> conditions = conditionMapper.mapResources(ehrExtract, patient, List.of(), PRACTISE_CODE);
 
         conditionMapper.addReferences(buildBundleWithNamedStatementAllergy(), conditions, ehrExtract);
@@ -101,8 +101,8 @@ public void When_AddReferences_With_AllergyIntoleranceAsProblem_Expect_CodeAdded
     }
 
     @SneakyThrows
-    private RCMRMT030101UK04EhrExtract unmarshallEhrExtract(String filename) {
-        return unmarshallFile(getFile("classpath:" + CONDITION_RESOURCES_BASE + filename), RCMRMT030101UK04EhrExtract.class);
+    private RCMRMT030101UKEhrExtract unmarshallEhrExtract(String filename) {
+        return unmarshallFile(getFile("classpath:" + CONDITION_RESOURCES_BASE + filename), RCMRMT030101UKEhrExtract.class);
     }
 
     private Bundle buildBundleWithNamedStatementObservation() {

diff --git a/...p-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/BloodPressureMapper.java b/...p-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/BloodPressureMapper.java
@@ -34,13 +34,12 @@
 import org.hl7.v3.CD;
 import org.hl7.v3.RCMRMT030101UKAnnotation;
 import org.hl7.v3.RCMRMT030101UKComponent02;
-import org.hl7.v3.RCMRMT030101UK04PertinentInformation02;
+import org.hl7.v3.RCMRMT030101UKPertinentInformation02;
 import org.hl7.v3.RCMRMT030101UKCompoundStatement;
 import org.hl7.v3.RCMRMT030101UKEhrComposition;
 import org.hl7.v3.RCMRMT030101UKEhrExtract;
 import org.hl7.v3.RCMRMT030101UKNarrativeStatement;
 import org.hl7.v3.RCMRMT030101UKObservationStatement;
-import org.hl7.v3.RCMRMT030101UKPertinentInformation02;
 import org.springframework.stereotype.Service;
 
 import lombok.AllArgsConstructor;
@@ -134,8 +133,8 @@ private String getComment(List<RCMRMT030101UKObservationStatement> observationSt
             : observationStatements) {
             var bloodPressureText = observationStatement.getPertinentInformation().stream()
                 .filter(this::pertinentInformationHasText)
-                .map(RCMRMT030101UK04PertinentInformation02.class::cast)
-                .map(RCMRMT030101UK04PertinentInformation02::getPertinentAnnotation)
+                .map(RCMRMT030101UKPertinentInformation02.class::cast)
+                .map(RCMRMT030101UKPertinentInformation02::getPertinentAnnotation)
                 .map(RCMRMT030101UKAnnotation::getText)
                 .map(text -> {
 
@@ -169,7 +168,7 @@ private String getComment(List<RCMRMT030101UKObservationStatement> observationSt
         return stringBuilder.toString().trim();
     }
 
-    private boolean pertinentInformationHasText(RCMRMT030101UKPertinentInformation02 pertinentInformation) {
+    private boolean pertinentInformationHasText(org.hl7.v3.RCMRMT030101UKPertinentInformation02 pertinentInformation) {
         return pertinentInformation != null && pertinentInformation.getPertinentAnnotation() != null
             && StringUtils.isNotEmpty(pertinentInformation.getPertinentAnnotation().getText());
     }

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ConditionMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ConditionMapper.java
@@ -43,9 +43,8 @@
 import org.hl7.v3.RCMRMT030101UKComponent4;
 import org.hl7.v3.RCMRMT030101UKComponent6;
 import org.hl7.v3.RCMRMT030101UKEhrComposition;
-import org.hl7.v3.RCMRMT030101UK04EhrExtract;
-import org.hl7.v3.RCMRMT030101UKEhrFolder;
 import org.hl7.v3.RCMRMT030101UKEhrExtract;
+import org.hl7.v3.RCMRMT030101UKEhrFolder;
 import org.hl7.v3.RCMRMT030101UKLinkSet;
 import org.hl7.v3.RCMRMT030101UKMedicationStatement;
 import org.hl7.v3.RCMRMT030101UKObservationStatement;
@@ -143,7 +142,7 @@ private Condition getCondition(Patient patient, List<Encounter> encounters, RCMR
         return condition;
     }
 
-    public void addHierarchyReferencesToConditions(List<Condition> conditions, RCMRMT030101UK04EhrExtract ehrExtract) {
+    public void addHierarchyReferencesToConditions(List<Condition> conditions, RCMRMT030101UKEhrExtract ehrExtract) {
         var allLinkSets = getCompositionsContainingLinkSets(ehrExtract).stream()
                 .flatMap(ehrComposition -> ehrComposition.getComponent().stream())
                 .map(RCMRMT030101UKComponent4::getLinkSet)
@@ -179,7 +178,7 @@ public void addHierarchyReferencesToConditions(List<Condition> conditions, RCMRM
         });
     }
 
-    public void addReferences(Bundle bundle, List<Condition> conditions, RCMRMT030101UK04EhrExtract ehrExtract) {
+    public void addReferences(Bundle bundle, List<Condition> conditions, RCMRMT030101UKEhrExtract ehrExtract) {
         getCompositionsContainingLinkSets(ehrExtract).stream()
             .flatMap(ehrComposition -> ehrComposition.getComponent().stream())
             .map(RCMRMT030101UKComponent4::getLinkSet)
@@ -335,7 +334,7 @@ private CodeableConcept generateCategory() {
     }
 
     private List<Extension> buildRelatedClinicalContent(Bundle bundle, List<RCMRMT030101UKStatementRef> relatedClinicalStatementReferences,
-                                                        RCMRMT030101UK04EhrExtract ehrExtract) {
+                                                        RCMRMT030101UKEhrExtract ehrExtract) {
 
         // Filter for bundle entries where entry ID exists in both streams
         var bundleIds = bundle.getEntry()
@@ -366,7 +365,7 @@ private List<Extension> buildRelatedClinicalContent(Bundle bundle, List<RCMRMT03
 
     }
 
-    private List<String> getMedicationRequestIds(RCMRMT030101UK04EhrExtract ehrExtract, List<RCMRMT030101UKStatementRef> statementRefs) {
+    private List<String> getMedicationRequestIds(RCMRMT030101UKEhrExtract ehrExtract, List<RCMRMT030101UKStatementRef> statementRefs) {
 
         var medicationStatements = getMedicationStatements(ehrExtract);
         Map<String, String> medicationStatementIdMapping = getMedicationStatementIdMapping(medicationStatements);
@@ -442,7 +441,7 @@ private List<Annotation> buildNotes(Optional<RCMRMT030101UKObservationStatement>
         return annotationList;
     }
 
-    private List<RCMRMT030101UKEhrComposition> getCompositionsContainingLinkSets(RCMRMT030101UK04EhrExtract ehrExtract) {
+    private List<RCMRMT030101UKEhrComposition> getCompositionsContainingLinkSets(RCMRMT030101UKEhrExtract ehrExtract) {
 
         return ehrExtract.getComponent().stream()
             .flatMap(component -> component.getEhrFolder().getComponent().stream())
@@ -454,7 +453,7 @@ private List<RCMRMT030101UKEhrComposition> getCompositionsContainingLinkSets(RCM
             .toList();
     }
 
-    private Optional<RCMRMT030101UKObservationStatement> getObservationStatementById(RCMRMT030101UK04EhrExtract ehrExtract, String id) {
+    private Optional<RCMRMT030101UKObservationStatement> getObservationStatementById(RCMRMT030101UKEhrExtract ehrExtract, String id) {
 
         List<RCMRMT030101UKObservationStatement> observationStatements = ehrExtract.getComponent().stream()
             .map(RCMRMT030101UKComponent::getEhrFolder)

diff --git a/.../main/java/uk/nhs/adaptors/pss/translator/mapper/DuplicateObservationStatementMapper.java b/.../main/java/uk/nhs/adaptors/pss/translator/mapper/DuplicateObservationStatementMapper.java
@@ -2,7 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.hl7.v3.II;
-import org.hl7.v3.RCMRMT030101UK04EhrExtract;
+import org.hl7.v3.RCMRMT030101UKEhrExtract;
 import org.hl7.v3.RCMRMT030101UKAnnotation;
 import org.hl7.v3.RCMRMT030101UKComponent;
 import org.hl7.v3.RCMRMT030101UKComponent3;
@@ -28,7 +28,7 @@ public class DuplicateObservationStatementMapper {
     public static final int CHAR_LIMIT_FOR_TRUNCATION = 50;
     public static final String ELLIPSIS = "...";
 
-    public void mergeDuplicateObservationStatements(RCMRMT030101UK04EhrExtract ehrExtract) {
+    public void mergeDuplicateObservationStatements(RCMRMT030101UKEhrExtract ehrExtract) {
         ehrExtract.getComponent()
                 .stream()
                 .map(RCMRMT030101UKComponent::getEhrFolder)

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/EncounterMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/EncounterMapper.java
@@ -34,7 +34,7 @@
 import org.hl7.v3.RCMRMT030101UKComponent02;
 import org.hl7.v3.RCMRMT030101UKComponent3;
 import org.hl7.v3.RCMRMT030101UKComponent4;
-import org.hl7.v3.RCMRMT030101UK04EhrExtract;
+import org.hl7.v3.RCMRMT030101UKEhrExtract;
 import org.hl7.v3.RCMRMT030101UKEhrFolder;
 import org.hl7.v3.RCMRMT030101UKLinkSet;
 import org.hl7.v3.RCMRMT030101UKAuthor;
@@ -80,7 +80,7 @@ public class EncounterMapper {
     private final ResourceReferenceUtil resourceReferenceUtil;
 
     public Map<String, List<? extends DomainResource>> mapEncounters(
-            RCMRMT030101UK04EhrExtract ehrExtract,
+            RCMRMT030101UKEhrExtract ehrExtract,
             Patient patient,
             String practiseCode,
             List<Location> entryLocations
@@ -242,7 +242,7 @@ private boolean hasValidCategoryCompoundStatement(RCMRMT030101UKCompoundStatemen
         return compoundStatement != null && CATEGORY_CLASS_CODE.equals(compoundStatement.getClassCode().get(0));
     }
 
-    private List<RCMRMT030101UKEhrComposition> getEncounterEhrCompositions(RCMRMT030101UK04EhrExtract ehrExtract) {
+    private List<RCMRMT030101UKEhrComposition> getEncounterEhrCompositions(RCMRMT030101UKEhrExtract ehrExtract) {
         return ehrExtract
             .getComponent()
             .stream()

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/LocationMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/LocationMapper.java
@@ -8,7 +8,7 @@
 import org.hl7.fhir.dstu3.model.Identifier;
 import org.hl7.fhir.dstu3.model.Location;
 import org.hl7.fhir.dstu3.model.ContactPoint;
-import org.hl7.v3.RCMRMT030101UK04Place;
+import org.hl7.v3.RCMRMT030101UKPlace;
 import org.hl7.v3.RCMRMT030101UKLocation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,12 +42,12 @@ public Location mapToLocation(RCMRMT030101UKLocation location, String practiseCo
         return createLocation(id, identifier, null, null, null);
     }
 
-    private String getName(RCMRMT030101UK04Place locatedPlace) {
+    private String getName(RCMRMT030101UKPlace locatedPlace) {
         var name = locatedPlace.getName();
         return name != null ? name : UNKNOWN_NAME;
     }
 
-    private ContactPoint getLocationTelecom(RCMRMT030101UK04Place locatedPlace) {
+    private ContactPoint getLocationTelecom(RCMRMT030101UKPlace locatedPlace) {
         var telecom = locatedPlace.getTelecom().stream().findFirst();
         if (telecom.isPresent()) {
             return TelecomUtil.mapTelecom(telecom.get());
@@ -56,7 +56,7 @@ private ContactPoint getLocationTelecom(RCMRMT030101UK04Place locatedPlace) {
         return null;
     }
 
-    private Address getLocationAddress(RCMRMT030101UK04Place locatedPlace) {
+    private Address getLocationAddress(RCMRMT030101UKPlace locatedPlace) {
         var address = locatedPlace.getAddr();
         if (address != null) {
             return AddressUtil.mapAddress(address);

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/TemplateMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/TemplateMapper.java
@@ -27,11 +27,10 @@
 import org.hl7.fhir.dstu3.model.Reference;
 import org.hl7.fhir.dstu3.model.ResourceType;
 import org.hl7.v3.RCMRMT030101UKComponent02;
-import org.hl7.v3.RCMRMT030101UK04EhrExtract;
-import org.hl7.v3.RCMRMT030101UK04ObservationStatement;
+import org.hl7.v3.RCMRMT030101UKEhrExtract;
+import org.hl7.v3.RCMRMT030101UKObservationStatement;
 import org.hl7.v3.RCMRMT030101UKCompoundStatement;
 import org.hl7.v3.RCMRMT030101UKEhrComposition;
-import org.hl7.v3.RCMRMT030101UKEhrExtract;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -64,7 +63,7 @@ public List<DomainResource> mapResources(RCMRMT030101UKEhrExtract ehrExtract, Pa
 
     }
 
-    public void addReferences(List<DomainResource> templates, List<Observation> observations, RCMRMT030101UK04EhrExtract ehrExtract) {
+    public void addReferences(List<DomainResource> templates, List<Observation> observations, RCMRMT030101UKEhrExtract ehrExtract) {
         List<Observation> parentObservations = templates.stream()
             .filter(Observation.class::isInstance)
             .map(Observation.class::cast)
@@ -88,7 +87,7 @@ public void addReferences(List<DomainResource> templates, List<Observation> obse
                     .extractResourcesFromCompound(parentCompoundStatement,
                         RCMRMT030101UKComponent02::hasObservationStatement, RCMRMT030101UKComponent02::getObservationStatement)
                     .stream()
-                    .map(RCMRMT030101UK04ObservationStatement.class::cast)
+                    .map(RCMRMT030101UKObservationStatement.class::cast)
                     .map(observationStatement -> observationStatement.getId().getRoot())
                     .toList();
 
@@ -174,7 +173,7 @@ private InstantType getIssued(RCMRMT030101UKEhrComposition ehrComposition) {
         return null;
     }
 
-    private List<RCMRMT030101UKCompoundStatement> getCompoundStatementsByIds(RCMRMT030101UK04EhrExtract ehrExtract, List<String> ids) {
+    private List<RCMRMT030101UKCompoundStatement> getCompoundStatementsByIds(RCMRMT030101UKEhrExtract ehrExtract, List<String> ids) {
 
         return ehrExtract.getComponent().get(0).getEhrFolder().getComponent()
             .stream()

diff --git a/...n/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java b/...n/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java
@@ -31,10 +31,9 @@
 import org.hl7.fhir.dstu3.model.ResourceType;
 import org.hl7.v3.II;
 import org.hl7.v3.RCMRMT030101UKComponent02;
-import org.hl7.v3.RCMRMT030101UK04EhrExtract;
+import org.hl7.v3.RCMRMT030101UKEhrExtract;
 import org.hl7.v3.RCMRMT030101UKCompoundStatement;
 import org.hl7.v3.RCMRMT030101UKEhrComposition;
-import org.hl7.v3.RCMRMT030101UKEhrExtract;
 import org.hl7.v3.RCMRMT030101UKNarrativeStatement;
 import org.hl7.v3.RCMRMT030101UKAuthor;
 import org.jetbrains.annotations.NotNull;
@@ -91,7 +90,7 @@ public List<DiagnosticReport> mapResources(RCMRMT030101UKEhrExtract ehrExtract,
                         )).toList();
     }
 
-    public void handleChildObservationComments(RCMRMT030101UK04EhrExtract ehrExtract, List<Observation> observationComments) {
+    public void handleChildObservationComments(RCMRMT030101UKEhrExtract ehrExtract, List<Observation> observationComments) {
 
         List<Observation> conclusionComments = new ArrayList<>();
 

diff --git a/...in/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenBatteryMapper.java b/...in/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenBatteryMapper.java
@@ -30,7 +30,7 @@
 import org.hl7.fhir.dstu3.model.Reference;
 import org.hl7.fhir.dstu3.model.ResourceType;
 import org.hl7.v3.RCMRMT030101UKComponent02;
-import org.hl7.v3.RCMRMT030101UK04ObservationStatement;
+import org.hl7.v3.RCMRMT030101UKObservationStatement;
 import org.hl7.v3.RCMRMT030101UKCompoundStatement;
 import org.hl7.v3.RCMRMT030101UKEhrComposition;
 import org.hl7.v3.RCMRMT030101UKEhrExtract;
@@ -275,7 +275,7 @@ private Stream<ObservationRelatedComponent> getObservationReferences(RCMRMT03010
         return extractResourcesFromCompound(batteryCompoundStatement, RCMRMT030101UKComponent02::hasObservationStatement,
             RCMRMT030101UKComponent02::getObservationStatement)
             .stream()
-            .map(RCMRMT030101UK04ObservationStatement.class::cast)
+            .map(RCMRMT030101UKObservationStatement.class::cast)
             .map(observationStatement -> new Reference(new IdType(ResourceType.Observation.name(), observationStatement.getId().getRoot())))
             .map(reference -> new ObservationRelatedComponent().setTarget(reference)
                 .setType(ObservationRelationshipType.HASMEMBER));

diff --git a/.../src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java b/.../src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java
@@ -21,9 +21,8 @@
 import org.hl7.fhir.dstu3.model.Specimen;
 import org.hl7.fhir.dstu3.model.Specimen.SpecimenCollectionComponent;
 import org.hl7.v3.RCMRMT030101UKComponent02;
-import org.hl7.v3.RCMRMT030101UK04EhrExtract;
-import org.hl7.v3.RCMRMT030101UKCompoundStatement;
 import org.hl7.v3.RCMRMT030101UKEhrExtract;
+import org.hl7.v3.RCMRMT030101UKCompoundStatement;
 import org.hl7.v3.RCMRMT030101UKSpecimenRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,8 +41,8 @@ public class SpecimenMapper {
 
     private final DateTimeMapper dateTimeMapper;
 
-    public List<Specimen> mapSpecimen(RCMRMT030101UK04EhrExtract ehrExtract, List<DiagnosticReport> diagnosticReports,
-        Patient patient, String practiceCode) {
+    public List<Specimen> mapSpecimen(RCMRMT030101UKEhrExtract ehrExtract, List<DiagnosticReport> diagnosticReports,
+                                      Patient patient, String practiceCode) {
 
         return diagnosticReports.stream()
             .flatMap(diagnosticReport -> diagnosticReport.getSpecimen().stream())
@@ -58,7 +57,7 @@ public List<Specimen> mapSpecimen(RCMRMT030101UK04EhrExtract ehrExtract, List<Di
             .toList();
     }
 
-    public List<Observation> removeSurplusObservationComments(RCMRMT030101UK04EhrExtract ehrExtract,
+    public List<Observation> removeSurplusObservationComments(RCMRMT030101UKEhrExtract ehrExtract,
                                                               List<Observation> observationComments) {
 
         var specimenCompoundStatements = findAllSpecimenCompoundStatements(ehrExtract);
@@ -153,7 +152,7 @@ private Optional<RCMRMT030101UKSpecimenRole> getSpecimenRole(RCMRMT030101UKCompo
     }
 
     private Optional<RCMRMT030101UKCompoundStatement> getParentCompoundStatementByChildId(
-        RCMRMT030101UK04EhrExtract ehrExtract, String id) {
+        RCMRMT030101UKEhrExtract ehrExtract, String id) {
 
         return ehrExtract.getComponent().get(0).getEhrFolder().getComponent().stream()
             .flatMap(component3 -> component3.getEhrComposition().getComponent().stream())