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

NIAD-2851: Remove unexplained call to handleObservationStatement #722

Merged
merged 1 commit into from
Jul 25, 2024
+4 −124
Merged

NIAD-2851: Remove unexplained call to handleObservationStatement #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## Added
* Password percent-encoding has been added to help handle the caeses when password includes special '%' characters
### Fixed
* Resolved issue where the SNOMED import script would reject a password containing a '%' character.
* Fixed some Test Results being given a duplicated `Observation.category` entries for `Laboratory`.

## [3.0.2] - 2024-07-18

## Added
### Added
* If a `ehrComposition` record includes a `confidentialityCode`, the `meta.security` field of the corresponding
`Encounter` FHIR resource will now be [appropriately populated][nopat-docs].
* Add support for an Organization being referenced within the `ReferralRequest.recipient` field.
Expand Down
102 changes: 0 additions & 102 deletions gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP9-output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4129,12 +4129,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -4190,12 +4184,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -4251,12 +4239,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -4312,12 +4294,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -4373,12 +4349,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -4434,12 +4404,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -4495,12 +4459,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -4556,12 +4514,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -4617,12 +4569,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -4678,12 +4624,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -4739,12 +4679,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -4800,12 +4734,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -5288,12 +5216,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -6606,12 +6528,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -6901,12 +6817,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -9147,12 +9057,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down Expand Up @@ -9213,12 +9117,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down
6 changes: 0 additions & 6 deletions gp2gp-translator/src/integrationTest/resources/json/expectedBundle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22958,12 +22958,6 @@
"code": "laboratory",
"display": "Laboratory"
} ]
}, {
"coding": [ {
"system": "http://hl7.org/fhir/observation-category",
"code": "laboratory",
"display": "Laboratory"
} ]
} ],
"code": {
"coding": [ {
Expand Down
13 changes: 0 additions & 13 deletions .../java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,19 +230,6 @@ private void handleBatteryCompoundStatement(RCMRMT030101UKCompoundStatement spec
);
}

batteryCompoundStatement.getComponent().stream()
.filter(RCMRMT030101UKComponent02::hasCompoundStatement)
.map(RCMRMT030101UKComponent02::getCompoundStatement)
.forEach(compoundStatement -> compoundStatement.getComponent().stream()
.filter(RCMRMT030101UKComponent02::hasObservationStatement)
.map(RCMRMT030101UKComponent02::getObservationStatement)
.findFirst()
.ifPresent(
observationStatement -> getObservationById(observations, observationStatement.getId().getRoot()).ifPresent(
observation -> handleObservationStatement(specimenCompoundStatement, observationStatement, observation)
)
));

var observationStatements = batteryCompoundStatement.getComponent().stream()
.filter(RCMRMT030101UKComponent02::hasObservationStatement)
.map(RCMRMT030101UKComponent02::getObservationStatement)
Expand Down