Skip to content

Commit 88327a5

Browse files
bvdhbvdh
committed
Updated category and type
1 parent e237c1b commit 88327a5

File tree

21 files changed

+515
-79
lines changed

21 files changed

+515
-79
lines changed

‎ig-src/input/fsh/profiles/im-composition.liquid.fsh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,12 @@ The `text` field of each section SHALL contain a textual representation of all l
6565

6666
* category 0..*
6767
* insert SliceElement( #value, $this )
68-
* category contains diagnostic-service 0..1
68+
* category contains diagnostic-service 0..1 and imaging-report 1..1 and imaging 1..1
6969
* category[diagnostic-service] from $diagnostic-service-sections (required)
70+
* category[imaging] = http://hl7.eu/fhir/eu-health-data-api/CodeSystem/eehrxf-document-priority-category-cs#Medical-Imaging
71+
* ^definition = "Defines the priority category of the report as defined in the API spec."
72+
* category[imaging-report] = $loinc#85430-7 //Diagnostic imaging report
73+
* ^definition = "Defines the category of the report, Diagnostic imaging report."
7074

7175

7276
* status

‎ig-src/input/fsh/profiles/im-diagnosticreport.liquid.fsh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ The regions SHALL overlap with the bodysite references from `ImagingStudy.serie.
9898
* ^short = "Status of the Report"
9999
* ^comment = "DiagnosticReport.status and Composition.status shall be aligned"
100100

101+
/////////////////////
102+
101103
//* status
102104
// code --> TODO will likely change based on composition discussions
103105
* code from ImagingReportTypesEuVSEuImaging (preferred)
@@ -106,8 +108,12 @@ The regions SHALL overlap with the bodysite references from `ImagingStudy.serie.
106108

107109
* category 0..*
108110
* insert SliceElement( #value, $this )
109-
* category contains diagnostic-service 0..1
111+
* category contains diagnostic-service 0..1 and imaging-report 1..1 and imaging 1..1
110112
* category[diagnostic-service] from $diagnostic-service-sections (required)
113+
* category[imaging] = http://hl7.eu/fhir/eu-health-data-api/CodeSystem/eehrxf-document-priority-category-cs#Medical-Imaging
114+
* ^definition = "Defines the priority category of the report as defined in the API spec."
115+
* category[imaging-report] = $loinc#85430-7 //Diagnostic imaging report
116+
* ^definition = "Defines the category of the report, Diagnostic imaging report."
111117

112118
* subject only Reference($EuPatient)
113119

‎ig-src/input/fsh/report-example-structured/composition.liquid.fsh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ Usage: #example
2727
* type = http://www.ama-assn.org/go/cpt#93351 "STRESS TTE COMPLETE"
2828

2929
* category[diagnostic-service] = http://terminology.hl7.org/CodeSystem/v2-0074#CUS "Cardiac Ultrasound"
30-
30+
* category[imaging] = http://hl7.eu/fhir/eu-health-data-api/CodeSystem/eehrxf-document-priority-category-cs#Medical-Imaging
31+
* category[imaging-report] = $loinc#85430-7 //Diagnostic imaging report
32+
3133
* author[author].reference = "urn:uuid:11111111-2222-4333-8444-000000000005"
3234
* author[organization].reference = "urn:uuid:11111111-2222-4333-8444-000000000007"
3335

‎ig-src/input/fsh/report-example-structured/diagnostic-report.liquid.fsh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ Usage: #example
1717
* value = "87654321" // invented - not there in the report
1818
* code = http://www.ama-assn.org/go/cpt#93351 "STRESS TTE COMPLETE"
1919
* category[diagnostic-service] = http://terminology.hl7.org/CodeSystem/v2-0074#CUS "Cardiac Ultrasound"
20+
* category[imaging] = http://hl7.eu/fhir/eu-health-data-api/CodeSystem/eehrxf-document-priority-category-cs#Medical-Imaging
21+
* category[imaging-report] = $loinc#85430-7 //Diagnostic imaging report
22+
2023
* subject.reference = "urn:uuid:11111111-2222-4333-8444-000000000003"
2124
* extension[anatomical-region].valueCodeableConcept.coding = $sct#67734004
2225

‎ig-src/input/fsh/report-example-unstructured/unstructured-example.liquid.fsh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ Usage: #example
9999
* value = "unstructured-report-001"
100100
* status = #final
101101
* code = $loinc#85430-7 "Diagnostic imaging report - example sections and entries"
102+
* category[imaging] = http://hl7.eu/fhir/eu-health-data-api/CodeSystem/eehrxf-document-priority-category-cs#Medical-Imaging
103+
* category[imaging-report] = $loinc#85430-7 //Diagnostic imaging report
104+
102105
* subject.reference = "urn:uuid:1d3c5b7a-9e0f-4a2b-8c6d-5e4f3a2b1c0d"
103106
* performer[organization] = Reference(OrganizationUnstructuredReport)
104107
* basedOn[order-identifier].identifier

‎ig-src/input/fsh/terminologies/category-and-type.fsh‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@ Description: "The set of radiology types as defined by LOINC."
88
* include codes from system $loinc where concept is-a #18726-0
99

1010

11-
// TODO refer to manifest?
12-
ValueSet: XdsClassCodeVs
13-
Id: im-xds-class-code-valueset
14-
Title: "ValueSet: XDS Class Codes"
15-
Description: """
16-
A list of XDS class codes that can be used for filtering manifests (zie [XDS_classCode_MetaData_Coding_System](https://wiki.ihe.net/index.php/XDS_classCode_Metadata_Coding_System)).
17-
**Note**: a IHE needs to make a formal FHIR CodeSystem for this.
18-
"""
19-
* insert SetFmmAndStatusRule( 1, draft )
20-
* ^experimental = false
21-
* ^identifier[0].system = "urn:ietf:rfc:3986"
22-
* ^identifier[0].value = "urn:oid:1.3.6.1.4.1.19376.1.2.6.1.1"
23-
* ^identifier[0].assigner.display = "IHE"
24-
* $xds-class-code#REPORTS //"Reports" "Reports are the result of an inquiry or investigation by a licensed professional"
25-
* $xds-class-code#SUMMARIES //"Summaries" "A record of the most salient facts known at a point in time by a licenses health professional"
26-
* $xds-class-code#IMAGES //"Images" "An artifact that depicts or records visual perception for a subject"
27-
* $xds-class-code#PRESCRIPTIONS //"Prescribed Treatments and Diagnoses" "Description of any treatment or order for a diagnosis for a patient"
28-
* $xds-class-code#DISPENSATIONS //"Dispensations" "Acts performed by a health professional delivering a treatment"
29-
* $xds-class-code#PLANS //"Treatment Plan or Protocol" "A set of intended treatments informing a team of health professionals about the goals, type of services,service intensity and progress indicators that are designed to reach a clinical objective"
30-
* $xds-class-code#HEALTH //"Health Certificates and Notifications" "Health information produced by health professionals for specific use outside of healthcare"
31-
* $xds-class-code#PATIENT //"Patient Expression and Preferences" "Statements produced by the patient expressing information/data about own health, preferences for care or any directive provided by patients in the handling of their health information."
32-
* $xds-class-code#WORKFLOWS //"Workflow Management" "Information related to the tracking and coordination process in care delivery
33-
// TODO - do we need OTHER?
11+
// // TODO refer to manifest?
12+
// ValueSet: XdsClassCodeVs
13+
// Id: im-xds-class-code-valueset
14+
// Title: "ValueSet: XDS Class Codes"
15+
// Description: """
16+
// A list of XDS class codes that can be used for filtering manifests (zie [XDS_classCode_MetaData_Coding_System](https://wiki.ihe.net/index.php/XDS_classCode_Metadata_Coding_System)).
17+
// **Note**: a IHE needs to make a formal FHIR CodeSystem for this.
18+
// """
19+
// * insert SetFmmAndStatusRule( 1, draft )
20+
// * ^experimental = false
21+
// * ^identifier[0].system = "urn:ietf:rfc:3986"
22+
// * ^identifier[0].value = "urn:oid:1.3.6.1.4.1.19376.1.2.6.1.1"
23+
// * ^identifier[0].assigner.display = "IHE"
24+
// * $xds-class-code#REPORTS //"Reports" "Reports are the result of an inquiry or investigation by a licensed professional"
25+
// * $xds-class-code#SUMMARIES //"Summaries" "A record of the most salient facts known at a point in time by a licenses health professional"
26+
// * $xds-class-code#IMAGES //"Images" "An artifact that depicts or records visual perception for a subject"
27+
// * $xds-class-code#PRESCRIPTIONS //"Prescribed Treatments and Diagnoses" "Description of any treatment or order for a diagnosis for a patient"
28+
// * $xds-class-code#DISPENSATIONS //"Dispensations" "Acts performed by a health professional delivering a treatment"
29+
// * $xds-class-code#PLANS //"Treatment Plan or Protocol" "A set of intended treatments informing a team of health professionals about the goals, type of services,service intensity and progress indicators that are designed to reach a clinical objective"
30+
// * $xds-class-code#HEALTH //"Health Certificates and Notifications" "Health information produced by health professionals for specific use outside of healthcare"
31+
// * $xds-class-code#PATIENT //"Patient Expression and Preferences" "Statements produced by the patient expressing information/data about own health, preferences for care or any directive provided by patients in the handling of their health information."
32+
// * $xds-class-code#WORKFLOWS //"Workflow Management" "Information related to the tracking and coordination process in care delivery
33+
// // TODO - do we need OTHER?

‎igs/imaging-r4/FHIR-eu-imaging-r4.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
<artifact id="ValueSet/ImagingReportTypesEuVSEuImaging" key="ValueSet-ImagingReportTypesEuVSEuImaging" name="ValueSet: Radiology Report Types"/>
126126
<artifact id="ValueSet/SectionEmptyReasonEuImaging" key="ValueSet-SectionEmptyReasonEuImaging" name="ValueSet: Reasons a section in an imaging report is empty."/>
127127
<artifact id="ValueSet/valueset-diagnosticreport-notes" key="ValueSet-valueset-diagnosticreport-notes" name="ValueSet: Section codes used to label annotations."/>
128-
<artifact id="ValueSet/im-xds-class-code-valueset" key="ValueSet-im-xds-class-code-valueset" name="ValueSet: XDS Class Codes"/>
129128
<page key="NA" name="(NA)"/>
130129
<page key="many" name="(many)"/>
131130
<page key="adapting" name="Adapting Guidelines for Country use"/>

‎igs/imaging-r4/input/fsh/profiles/im-composition.fsh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,12 @@ The `text` field of each section SHALL contain a textual representation of all l
6565

6666
* category 0..*
6767
* insert SliceElement( #value, $this )
68-
* category contains diagnostic-service 0..1
68+
* category contains diagnostic-service 0..1 and imaging-report 1..1 and imaging 1..1
6969
* category[diagnostic-service] from $diagnostic-service-sections (required)
70+
* category[imaging] = http://hl7.eu/fhir/eu-health-data-api/CodeSystem/eehrxf-document-priority-category-cs#Medical-Imaging
71+
* ^definition = "Defines the priority category of the report as defined in the API spec."
72+
* category[imaging-report] = $loinc#85430-7 //Diagnostic imaging report
73+
* ^definition = "Defines the category of the report, Diagnostic imaging report."
7074

7175

7276
* status

‎igs/imaging-r4/input/fsh/profiles/im-diagnosticreport.fsh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ The regions SHALL overlap with the bodysite references from `ImagingStudy.serie.
9898
* ^short = "Status of the Report"
9999
* ^comment = "DiagnosticReport.status and Composition.status shall be aligned"
100100

101+
/////////////////////
102+
101103
//* status
102104
// code --> TODO will likely change based on composition discussions
103105
* code from ImagingReportTypesEuVSEuImaging (preferred)
@@ -106,8 +108,12 @@ The regions SHALL overlap with the bodysite references from `ImagingStudy.serie.
106108

107109
* category 0..*
108110
* insert SliceElement( #value, $this )
109-
* category contains diagnostic-service 0..1
111+
* category contains diagnostic-service 0..1 and imaging-report 1..1 and imaging 1..1
110112
* category[diagnostic-service] from $diagnostic-service-sections (required)
113+
* category[imaging] = http://hl7.eu/fhir/eu-health-data-api/CodeSystem/eehrxf-document-priority-category-cs#Medical-Imaging
114+
* ^definition = "Defines the priority category of the report as defined in the API spec."
115+
* category[imaging-report] = $loinc#85430-7 //Diagnostic imaging report
116+
* ^definition = "Defines the category of the report, Diagnostic imaging report."
111117

112118
* subject only Reference($EuPatient)
113119

‎igs/imaging-r4/input/fsh/report-example-structured/composition.fsh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ Usage: #example
2727
* type = http://www.ama-assn.org/go/cpt#93351 "STRESS TTE COMPLETE"
2828

2929
* category[diagnostic-service] = http://terminology.hl7.org/CodeSystem/v2-0074#CUS "Cardiac Ultrasound"
30-
30+
* category[imaging] = http://hl7.eu/fhir/eu-health-data-api/CodeSystem/eehrxf-document-priority-category-cs#Medical-Imaging
31+
* category[imaging-report] = $loinc#85430-7 //Diagnostic imaging report
32+
3133
* author[author].reference = "urn:uuid:11111111-2222-4333-8444-000000000005"
3234
* author[organization].reference = "urn:uuid:11111111-2222-4333-8444-000000000007"
3335

0 commit comments

Comments
 (0)