Skip to content

Commit db5204c

Browse files
LeonardoAlcaroLeonardoAlcaro
authored
Merge pull request #124 from davidespanu/master
fix issues IG-lab
2 parents 2703a0b + 65283b2 commit db5204c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+547
-377
lines changed

‎input/fsh/Aliases.fsh‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
// GC: Suggest to reoganzie the entries (not always included in the right block )
2+
13
//------Valueset------//
24
Alias: $conf = http://terminology.hl7.org/ValueSet/v3-Confidentiality
35
Alias: $sct = http://snomed.info/sct
4-
Alias: $LOINC = http://loinc.org
6+
Alias: $loinc = http://loinc.org
57
Alias: $diagn-status = http://hl7.org/fhir/ValueSet/diagnostic-report-status
68
Alias: $diagnosticreport-category = http://terminology.hl7.org/CodeSystem/v2-0074
79
Alias: $diagnosticreport-category-valueset = http://hl7.org/fhir/ValueSet/diagnostic-service-sections
@@ -26,6 +28,7 @@ Alias: $additivo-campione-it = http://terminology.hl7.it/ValueSet/additivo-campi
2628
Alias: $sezione-referto-laboratorio = http://terminology.hl7.it/ValueSet/sezione-referto-laboratorio
2729
Alias: $risultato-osservazione = http://terminology.hl7.it/ValueSet/risultato-osservazione
2830
Alias: $media-type = http://terminology.hl7.org/CodeSystem/media-type
31+
Alias: $results-laboratory-observations-uv-ips = http://hl7.org/fhir/uv/ips/ValueSet/results-laboratory-observations-uv-ips
2932
//------Profile------//
3033
Alias: $sct-device = http://hl7.org/fhir/ValueSet/device-type
3134
Alias: $observation-status = http://hl7.org/fhir/ValueSet/observation-status
@@ -57,6 +60,29 @@ Alias: $sct-method = http://hl7.org/fhir/ValueSet/observation-methods
5760
Alias: $MediaType = http://hl7.org/fhir/ValueSet/media-type
5861
Alias: $typeName-device = http://hl7.org/fhir/ValueSet/device-nametype
5962
Alias: $practitionerrole-code-lab-it = http://hl7.org/fhir/ValueSet/practitioner-role
63+
64+
//-- HL7 EU Profiles
65+
Alias: $Observation-resultslab-eu-lab = http://hl7.eu/fhir/laboratory/StructureDefinition/Observation-resultslab-eu-lab
66+
Alias: $Specimen-eu-lab = http://hl7.eu/fhir/laboratory/StructureDefinition/Specimen-eu-lab
67+
Alias: $Patient-eu-lab = http://hl7.eu/fhir/laboratory/StructureDefinition/Patient-eu-lab
68+
Alias: $Quantity-eu-lab = http://hl7.eu/fhir/laboratory/StructureDefinition/Quantity-eu-lab
69+
Alias: $Practitioner-eu-lab = http://hl7.eu/fhir/laboratory/StructureDefinition/Practitioner-eu-lab
70+
Alias: $PractitionerRole-eu-lab = http://hl7.eu/fhir/laboratory/StructureDefinition/PractitionerRole-eu-lab
71+
Alias: $Organization-uv-ips = http://hl7.org/fhir/uv/ips/StructureDefinition/Organization-uv-ips
72+
Alias: $Composition-eu-lab = http://hl7.eu/fhir/laboratory/StructureDefinition/Composition-eu-lab
73+
Alias: $Bundle-eu-lab = http://hl7.eu/fhir/laboratory/StructureDefinition/Bundle-eu-lab
74+
Alias: $DiagnosticReport-eu-lab = http://hl7.eu/fhir/laboratory/StructureDefinition/DiagnosticReport-eu-lab
75+
Alias: $ServiceRequest-eu-lab = http://hl7.eu/fhir/laboratory/StructureDefinition/ServiceRequest-eu-lab
76+
Alias: $Specimen-additive-substance-eu-lab = http://hl7.eu/fhir/laboratory/StructureDefinition/specimen-additive-substance-eu-lab
77+
78+
79+
Alias: $CodeableConcept-uv-ips = http://hl7.org/fhir/uv/ips/StructureDefinition/CodeableConcept-uv-ips
80+
Alias: $SD-data-absent-reason = http://hl7.org/fhir/StructureDefinition/data-absent-reason
81+
82+
Alias: $Range-uv-ips = http://hl7.org/fhir/uv/ips/StructureDefinition/Range-uv-ips
83+
Alias: $Ratio-uv-ips = http://hl7.org/fhir/uv/ips/StructureDefinition/Ratio-uv-ips
84+
Alias: $Quantity-uv-ips = http://hl7.org/fhir/uv/ips/StructureDefinition/Quantity-uv-ips
85+
6086
//---Example
6187
Alias: $serviceRequest-category = http://example.it/FHIR/schema/serviceRequest-category
6288
Alias: $servicerequest-lab = http://example.it/FHIR/schema/servicerequest-englab
@@ -71,3 +97,4 @@ Alias: $sequelTo = http://hl7.org/fhir/StructureDefinition/observation-sequelTo
7197
Alias: $diagnostic-report-composition-r5 = http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.composition
7298
//---ClinicalDocument
7399
Alias: $clinical-document = http://hl7.org/fhir/StructureDefinition/clinicaldocument
100+
Alias: $CodeableConcept-uv-ips = http://hl7.org/fhir/uv/ips/StructureDefinition/CodeableConcept-uv-ips

‎input/fsh/examples/ObservationEsempio.fsh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ Usage: #example
44
Description: "Esempio di un'osservazione: rilevazione di glucosio nel sangue."
55

66

7-
* category[+][esame-laboratorio].coding.code = #laboratory
8-
* category[=][esame-laboratorio].coding.system = "http://terminology.hl7.org/CodeSystem/observation-category"
9-
* category[=][esame-laboratorio].coding.display = "Laboratory"
7+
* category[+][laboratory].coding.code = #laboratory
8+
* category[=][laboratory].coding.system = "http://terminology.hl7.org/CodeSystem/observation-category"
9+
* category[=][laboratory].coding.display = "Laboratory"
1010

11-
* category[+][specialita-esame-laboratorio].coding.code = #18723-7
12-
* category[=][specialita-esame-laboratorio].coding.system = "http://loinc.org"
13-
* category[=][specialita-esame-laboratorio].coding.display = "Hematology studies (set)"
11+
// * category[+][specialita-laboratory].coding.code = #18723-7
12+
// * category[=][specialita-laboratory].coding.system = "http://loinc.org"
13+
// * category[=][specialita-laboratory].coding.display = "Hematology studies (set)"
1414

1515
* status = #final
16-
16+
* effectiveDateTime = "2022-10-25T13:35:00+01:00"
1717
* code.coding.system = "http://loinc.org"
1818
* code.coding.code = #10450-5
1919
* code.coding.display = "Glucose [Mass/volume] in Serum or Plasma --10 hours fasting"

‎input/fsh/examples/PazienteSSN.fsh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ InstanceOf: patient-it-lab
33
Usage: #example
44
Description: "Esempio di un paziente: soggetto iscritto al Sistema Sanitario Nazionale (SSN) con rappresentazione strutturata dell'attributo birthPlace."
55

6+
* id = "8472931c-fbd0-437b-9ed1-4f66472c78b5"
67
* extension.url = "http://hl7.org/fhir/StructureDefinition/patient-birthPlace"
78
* extension.valueAddress.line.extension[0].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName"
89
* extension.valueAddress.line.extension[0].valueString = "Via della Vittoria"

‎input/fsh/examples/bundleEsempio.fsh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ Usage: #example
88
* identifier.value = "urn:uuid:bfcf00e2-e2bb-4a7d-adaa-3de9d419d27e"
99
* type = #document
1010
* timestamp = "2023-02-25T14:30:00+01:00"
11-
* entry[+].fullUrl = "Composition/2ae95a5c-9094-41a3-a437-ce6d34c55a54" //"urn:uuid:2ae95a5c-9094-41a3-a437-ce6d34c55a54"
11+
* entry[+].fullUrl = "Composition/Composition-Lab-Esempio" //"urn:uuid:2ae95a5c-9094-41a3-a437-ce6d34c55a54"
1212
* entry[=].resource = Composition-Lab-Esempio
1313
* entry[+].fullUrl = "Patient/Paziente-SSN" //urn:uuid:168d4960-0a0b-43af-8025-180f0965f324
1414
* entry[=].resource = Paziente-SSN
15-
* entry[+].fullUrl = "DiagnosticReport/56f19992-e73e-45b5-bbdd-6d9aeb60b15a" //urn:uuid:56f19992-e73e-45b5-bbdd-6d9aeb60b15a
15+
* entry[+].fullUrl = "DiagnosticReport/DiagnosticReport-Lab-Esempio" //urn:uuid:56f19992-e73e-45b5-bbdd-6d9aeb60b15a
1616
* entry[=].resource = DiagnosticReport-Lab-Esempio
17-
* entry[+].fullUrl = "Encounter/7b06368c-7089-4f66-acc8-29e1fcbd31f6" //urn:uuid:7b06368c-7089-4f66-acc8-29e1fcbd31f6
17+
* entry[+].fullUrl = "Encounter/Encounter-Lab-Esempio" //urn:uuid:7b06368c-7089-4f66-acc8-29e1fcbd31f6
1818
* entry[=].resource = Encounter-Lab-Esempio
19-
* entry[+].fullUrl = "Specimen/168d4960-0a0b-43af-8025-180f0965f324" //urn:uuid:168d4960-0a0b-43af-8025-180f0965f324
19+
* entry[+].fullUrl = "Specimen/Specimen-Lab-Esempio" //urn:uuid:168d4960-0a0b-43af-8025-180f0965f324
2020
* entry[=].resource = Specimen-Lab-Esempio
2121
* entry[+].fullUrl = "Observation/Observation-Lab-Esempio-Glucosio" //urn:uuid:333b62b2-47b0-43b5-9745-abec1f0c4656
2222
* entry[=].resource = Observation-Lab-Esempio-Glucosio
23-
* entry[+].fullUrl = "ServiceRequest/463ae6fe-60d4-4b38-84b3-1008e0925678" //urn:uuid:463ae6fe-60d4-4b38-84b3-1008e0925678
23+
* entry[+].fullUrl = "ServiceRequest/ServiceRequest-Lab-Esempio" //urn:uuid:463ae6fe-60d4-4b38-84b3-1008e0925678
2424
* entry[=].resource = ServiceRequest-Lab-Esempio
25-
* entry[+].fullUrl = "PractitionerRole/dc5842a1-83b6-43c7-b063-75ae989b803c" //urn:uuid:dc5842a1-83b6-43c7-b063-75ae989b803c
25+
* entry[+].fullUrl = "PractitionerRole/PractitionerRole-Lab-Esempio" //urn:uuid:dc5842a1-83b6-43c7-b063-75ae989b803c
2626
* entry[=].resource = PractitionerRole-Lab-Esempio
2727
* entry[+].fullUrl = "Practitioner/Practitioner-Lab-Esempio" //urn:uuid:dc5842a1-83b6-43c7-b063-75ae989b803c
2828
* entry[=].resource = Practitioner-Lab-Esempio

‎input/fsh/examples/compositionEsempio.fsh‎

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,45 @@ Description: "Esempio di una Composition: descrizione header e struttura body de
77
* extension[dataEnterer].extension[dataEnterer].valueReference = Reference(PractitionerRole-Lab-Esempio)
88
* extension[dataEnterer].extension[tempoCompilazione].valueDateTime = "2023-02-25T10:45:00+01:00"
99

10-
* language = #IT-it
10+
* language = #it-IT
1111
* identifier.use = #official
1212
* identifier.value = "urn:uuid:10b545ea-725c-446d-9b95-8aeb444eddf3"
13-
13+
* identifier.assigner.display = "Regione Lazio"
1414
* status = #final
15-
16-
* type.coding.system = "http://loinc.org"
17-
* type.coding.code = #11502-2
18-
* type.coding.display = "Laboratory report"
19-
20-
* subject = Reference(Paziente-SSN)
21-
* subject.display = "Rossi Maria"
22-
15+
* category[studyType] = $diagnosticreport-category#HM "Hematology"
16+
* type = http://loinc.org#11502-2 "Laboratory report"
17+
* type.text = "Referto di laboratorio"
18+
* subject = Reference(Patient/8472931c-fbd0-437b-9ed1-4f66472c78b5)
2319
* encounter = Reference(Encounter-Lab-Esempio)
24-
25-
* date = "2023-03-28"
26-
27-
* author = Reference(PractitionerRole-Lab-Esempio)
28-
20+
* date = "2022-03-30T11:24:26+01:00"
21+
* author[+] = Reference(PractitionerRole-Lab-Esempio)
2922
* title = "Referto di Laboratorio"
30-
3123
* confidentiality = #N
32-
3324
* attester[legalAuthenticator].mode = #legal
3425
* attester[legalAuthenticator].time = "2023-02-25T12:45:00+01:00"
3526
* attester[legalAuthenticator].party = Reference(PractitionerRole-Lab-Esempio)
36-
27+
// * attester[+].mode = #professional
28+
// * attester[=].party = Reference(PractitionerRole-Lab-Esempio)
29+
// * attester[=].time = "2022-03-25T11:00:00+01:00"
3730
* custodian = Reference(Organization-Lab-Esempio)
38-
39-
* section[con-sottosezione].code.coding.system = $LOINC
40-
* section[con-sottosezione].code.coding.code = #26436-6
41-
* section[con-sottosezione].code.coding.display = "Laboratory studies (set)"
42-
* section[con-sottosezione].title = "Laboratory studies (set)"
43-
44-
* section[con-sottosezione].section.title = "Esame del sangue"
45-
* section[con-sottosezione].section.code.coding.system = $LOINC
46-
* section[con-sottosezione].section.code.coding.code = #10450-5
47-
* section[con-sottosezione].section.code.coding.display = "Glucosio [massa / volume] nel siero o nel plasma - 10 ore di digiuno"
48-
* section[con-sottosezione].section.entry = Reference(Observation-Lab-Esempio-Glucosio)
31+
// * section.title = "Laboratory studies (set)"
32+
// * section.code = http://loinc.org#26436-6 "Laboratory studies (set)"
33+
// * section.code.text = "ESAMI DEL SANGUE"
34+
// * section.section.title = "Esame del sangue"
35+
// * section.section.code.coding[+] = http://loinc.org#14957-5 "Microalbumin [Mass/volume] in Urine"
36+
// * section.section.text.status = #generated
37+
// * section.section.text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><ul><li><table id=\"nota1\"><thead><tr><th>Esame</th><th>Metodo utilizzato per l'esame</th><th>Materiale utilizzato per l'esame</th><th>Risultato dell'esame</th><th>Commenti e note</th><th>Unità di Misura</th><th>Range di Riferimento</th><th>Criteri per il range di riferimento</th><th>Interpretazione</th><th>Allegati multimediali</th></tr></thead><tbody><tr><td>Microalbumina massa/volume in urine</td><td/><td>Urine</td><td>20</td><td/><td>mg/L</td><td> 0 - 20 </td><td/><td>N</td><td/></tr></tbody></table></li></ul></div>"
38+
// * section.section.entry = Reference(Observation-Lab-Esempio-Glucosio)
39+
40+
* section[lab-subsections].code.coding.system = $loinc
41+
* section[lab-subsections].code.coding.code = #26436-6
42+
* section[lab-subsections].code.coding.display = "Laboratory studies (set)"
43+
* section[lab-subsections].title = "Laboratory studies (set)"
44+
45+
* section[lab-subsections].section.title = "Esame del sangue"
46+
* section[lab-subsections].section.code.coding.system = $loinc
47+
* section[lab-subsections].section.code.coding.code = #10450-5
48+
* section[lab-subsections].section.text.status = #generated
49+
* section[lab-subsections].section.text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><ul><li><table id=\"nota1\"><thead><tr><th>Esame</th><th>Metodo utilizzato per l'esame</th><th>Materiale utilizzato per l'esame</th><th>Risultato dell'esame</th><th>Commenti e note</th><th>Unità di Misura</th><th>Range di Riferimento</th><th>Criteri per il range di riferimento</th><th>Interpretazione</th><th>Allegati multimediali</th></tr></thead><tbody><tr><td>Microalbumina massa/volume in urine</td><td/><td>Urine</td><td>20</td><td/><td>mg/L</td><td> 0 - 20 </td><td/><td>N</td><td/></tr></tbody></table></li></ul></div>"
50+
* section[lab-subsections].section.code.coding.display = "Glucose p 10h fast SerPl-mCnc"
51+
* section[lab-subsections].section.entry = Reference(Observation-Lab-Esempio-Glucosio)

‎input/fsh/examples/diagnosticReport.fsh‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,19 @@ Usage: #example
44
Description: "Esempio di un report diagnostico: report prodotto durante l'incontro."
55

66
* id = "56f19992-e73e-45b5-bbdd-6d9aeb60b15a"
7-
* extension[DiagnosticReportCompositionR5].valueReference = Reference(Composition-Lab-Esempio)
8-
7+
* extension[$diagnostic-report-composition-r5].valueReference = Reference(Composition/2ae95a5c-9094-41a3-a437-ce6d34c55a54)
8+
* identifier.use = #official
9+
* identifier.value = "urn:uuid:10b545ea-725c-446d-9b95-8aeb444eddf3"
910
* basedOn = Reference(ServiceRequest-Lab-Esempio)
1011
* status = #final
1112
* category = $diagnosticreport-category#HM "Hematology"
12-
* code = $LOINC#11502-2 "Laboratory report"
13-
14-
* subject.reference = "Patient/Paziente-SSN"
15-
13+
* code = $loinc#11502-2 "Laboratory report"
14+
* subject = Reference(Paziente-SSN)
1615
* encounter = Reference(Encounter-Lab-Esempio)
1716
* result[+] = Reference(Observation-Lab-Esempio-Glucosio)
1817
* result[+] = Reference(Observation-Lab-Esempio-Cloruro)
19-
2018
* effectivePeriod.start = "2023-02-25T11:45:00+01:00"
2119
* effectivePeriod.end = "2023-02-25T12:45:00+01:00"
22-
2320
* issued = "2023-02-25T12:45:00+01:00"
2421
* performer = Reference(PractitionerRole-Lab-Esempio)
2522
* specimen = Reference(Specimen-Lab-Esempio)

0 commit comments

Comments
 (0)