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

Resolving category and elems error in fhir converter #2587

Merged
merged 3 commits into from
Sep 20, 2024
Merged

Resolving category and elems error in fhir converter #2587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dddab27
Revising fhirpath and fixing device and elems issue
KennethSkylight Sep 19, 2024
9382405
fixing test
KennethSkylight Sep 19, 2024
a5fd9ae
Merge branch 'main' into category-error
KennethSkylight Sep 19, 2024
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
2 changes: 1 addition & 1 deletion containers/ecr-viewer/src/app/api/fhirPath.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ patientGenderIdentity: "Bundle.entry.resource.where(resourceType = 'Patient').ex
eicrIdentifier: "Bundle.entry.resource.where(resourceType= 'Composition').id"
eicrCustodianRef: "Bundle.entry.resource.where(resourceType= 'Composition').custodian.reference"
dateTimeEcrCreated: "Bundle.entry.resource.where(resourceType = 'Composition').date"
senderSoftware: "Bundle.entry.resource.where(resourceType = 'Device').where(category.coding.code='software').type.coding.display"
senderSoftware: "Bundle.entry.resource.where(resourceType = 'Device').where(property[0].type.coding.code='software').type.coding.display"
senderFacilityName: "Bundle.entry.resource.where(resourceType = 'Encounter')[0].location[0].location.display"

# Encounter Info
Expand Down
20 changes: 12 additions & 8 deletions containers/ecr-viewer/src/app/tests/assets/BundleNoActiveProblems.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,15 +1011,19 @@
"value": "Epic - Version 10.1"
}
],
"category": {
"coding": [
{
"system": "http://hl7.org/fhir/device-category",
"code": "software",
"display": "software"
"property": [
{
"type": {
"coding": [
{
"system": "http://hl7.org/fhir/device-category",
"code": "software",
"display": "software"
}
]
}
]
},
}
],
"owner": {
"reference": "Organization/c725142c-ed88-5f3c-aa55-6bd2744dc939"
},
Expand Down
23 changes: 13 additions & 10 deletions containers/fhir-converter/Templates/eCR/Resource/_Device.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,19 @@
"value":"{{ author.assignedAuthoringDevice.softwareName._ }}",
},
],
"category": {
"coding":
[
{
"system": "http://hl7.org/fhir/device-category",
"code": "software",
"display": "software",
},
],
},
"property": [
{
"type": {
"coding": [
{
"system": "http://hl7.org/fhir/device-category",
"code": "software",
"display": "software",
},
]
}
}
],
},
"request":{
"method":"PUT",
Expand Down
5 changes: 0 additions & 5 deletions containers/fhir-converter/Templates/eCR/Resource/_Observation.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,6 @@
"note":
[
{
"elems": [
{
"elemText": "test",
}
],
{% if valueStringObject != null %}
{% if valueStringObject._ != null %}
{% if valueStringObject.br != null %}
Expand Down
Loading