Skip to content

Commit f5566e4

Browse files
LeonardoAlcaroLeonardoAlcaro
authored
Merge pull request #125 from davidespanu/master
fix warnings
2 parents db5204c + e539d90 commit f5566e4

Some content is hidden

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

54 files changed

+482
-400
lines changed

‎input/fsh/Aliases.fsh‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Alias: $diagnosticreport-category = http://terminology.hl7.org/CodeSystem/v2-007
99
Alias: $diagnosticreport-category-valueset = http://hl7.org/fhir/ValueSet/diagnostic-service-sections
1010
Alias: $ucum = https://ucum.org
1111
Alias: $istat-titoloStudio = http://terminology.hl7.it/ValueSet/istat-titoloStudio
12-
Alias: $istat-professione = http://terminology.hl7.it/ValueSet/istat-professione
12+
Alias: $istat-professione = http://terminology.hl7.it/ValueSet/istat-professione
1313
Alias: $istat-cittadinanza = http://terminology.hl7.it/ValueSet/istat-cittadinanza
1414
Alias: $istat-luogoNascita = http://terminology.hl7.it/ValueSet/istat-luogoNascita
1515
Alias: $practitionerRole-code = http://terminology.hl7.org/CodeSystem/practitioner-role
@@ -60,7 +60,7 @@ Alias: $sct-method = http://hl7.org/fhir/ValueSet/observation-methods
6060
Alias: $MediaType = http://hl7.org/fhir/ValueSet/media-type
6161
Alias: $typeName-device = http://hl7.org/fhir/ValueSet/device-nametype
6262
Alias: $practitionerrole-code-lab-it = http://hl7.org/fhir/ValueSet/practitioner-role
63-
63+
Alias: CS_Estero = http://terminology.hl7.it/sid/istat-unitaAmministrativeTerritorialiEstere
6464
//-- HL7 EU Profiles
6565
Alias: $Observation-resultslab-eu-lab = http://hl7.eu/fhir/laboratory/StructureDefinition/Observation-resultslab-eu-lab
6666
Alias: $Specimen-eu-lab = http://hl7.eu/fhir/laboratory/StructureDefinition/Specimen-eu-lab
@@ -97,4 +97,7 @@ Alias: $sequelTo = http://hl7.org/fhir/StructureDefinition/observation-sequelTo
9797
Alias: $diagnostic-report-composition-r5 = http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.composition
9898
//---ClinicalDocument
9999
Alias: $clinical-document = http://hl7.org/fhir/StructureDefinition/clinicaldocument
100-
Alias: $CodeableConcept-uv-ips = http://hl7.org/fhir/uv/ips/StructureDefinition/CodeableConcept-uv-ips
100+
Alias: $CodeableConcept-uv-ips = http://hl7.org/fhir/uv/ips/StructureDefinition/CodeableConcept-uv-ips
101+
//---EU
102+
Alias: $basedOnOrder = http://hl7.eu/fhir/StructureDefinition/composition-basedOn-order-or-requisition
103+
Alias: $informationRecipient = http://hl7.eu/fhir/StructureDefinition/information-recipient

‎input/fsh/examples/ObservationEsempio.fsh‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Description: "Esempio di un'osservazione: rilevazione di glucosio nel sangue."
88
* category[=][laboratory].coding.system = "http://terminology.hl7.org/CodeSystem/observation-category"
99
* category[=][laboratory].coding.display = "Laboratory"
1010

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)"
11+
12+
13+
1414

1515
* status = #final
1616
* effectiveDateTime = "2022-10-25T13:35:00+01:00"
@@ -27,4 +27,5 @@ Description: "Esempio di un'osservazione: rilevazione di glucosio nel sangue."
2727

2828
* encounter = Reference(Encounter-Lab-Esempio)
2929
* performer = Reference(PractitionerRole-Lab-Esempio)
30-
* specimen = Reference (Specimen-Lab-Esempio)
30+
* specimen = Reference (Specimen-Lab-Esempio)
31+
* device = Reference (Device-Lab-Esempio)

‎input/fsh/examples/OrganizationOperatoreEsempio.fsh‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
Alias: $it-tipoEntita = http://terminology.hl7.it/CodeSystem/it-tipoEntita
2+
Alias: $istat-unitaAmministrativeTerritoriali = http://terminology.hl7.it/CodeSystem/istat-unitaAmministrativeTerritoriali
3+
Alias: $minsan-regione = http://terminology.hl7.it/CodeSystem/minsan-regione
4+
5+
Instance: OrganizationOperatore-Lab-Esempio
6+
InstanceOf: OrganizationOperatoreSanitarioRefertoLabIt
7+
Usage: #example
8+
Title: "Esempio di risorsa Organization che descrive le informazioni dell' operatore sanitario/socio sanitario"
9+
Description: "Esempio di Organization: Azienda di Assistenza del paziente"
10+
11+
* id = "ae0365ea-d8a1-45e0-a39d-f14fac4ccfe8"
12+
* identifier[asl].system = "http://hl7.it/sid/fls"
13+
* identifier[asl].value = "020101"
14+
15+
16+
17+
18+
* active = true
19+
* type = $it-tipoEntita#asl "Azienda Sanitaria Locale"
20+
* name = "AZIENDA U.S.L. VALLE D'AOSTA"
21+
* telecom[0].system = #phone
22+
* telecom[=].value = "(0165) 5431"
23+
* telecom[+].system = #fax
24+
* telecom[=].value = "(0165) 544587"
25+
* telecom[+].system = #email
26+
* telecom[=].value = "protocollo@pec.ausl.vda.it"
27+
* telecom[+].system = #url
28+
* telecom[=].value = "http://www.ausl.vda.it"
29+
* address.line = "VIA GUIDO REY 1"
30+
* address.city = "AOSTA"
31+
* address.city.extension.url = "http://hl7.org/fhir/StructureDefinition/iso21090-SC-coding"
32+
* address.city.extension.valueCoding = $istat-unitaAmministrativeTerritoriali#007003 "AOSTA"
33+
* address.district = "AO"
34+
* address.state = "VALLE D'AOSTA"
35+
* address.state.extension.url = "http://hl7.org/fhir/StructureDefinition/iso21090-SC-coding"
36+
* address.state.extension.valueCoding = $minsan-regione#020 "VALLE D'AOSTA"
37+
* address.postalCode = "11100"
38+
* address.country = "IT"

‎input/fsh/examples/PazienteSSN.fsh‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,28 @@ Usage: #example
44
Description: "Esempio di un paziente: soggetto iscritto al Sistema Sanitario Nazionale (SSN) con rappresentazione strutturata dell'attributo birthPlace."
55

66
* id = "8472931c-fbd0-437b-9ed1-4f66472c78b5"
7-
* extension.url = "http://hl7.org/fhir/StructureDefinition/patient-birthPlace"
8-
* extension.valueAddress.line.extension[0].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName"
9-
* extension.valueAddress.line.extension[0].valueString = "Via della Vittoria"
10-
* extension.valueAddress.line.extension[1].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
11-
* extension.valueAddress.line.extension[1].valueString = "1"
12-
* extension.valueAddress.line = "Via della Vittoria, 1"
13-
* extension.valueAddress.city = "Milano"
14-
* extension.valueAddress.postalCode = "20100"
15-
* extension.valueAddress.country = "Italia"
7+
* extension[luogoNascita].url = "http://hl7.org/fhir/StructureDefinition/patient-birthPlace"
8+
* extension[luogoNascita].valueAddress.line[0].extension[odonimo].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName"
9+
* extension[luogoNascita].valueAddress.line[0].extension[odonimo].valueString = "Via della Vittoria"
10+
* extension[luogoNascita].valueAddress.line[0].extension[houseNumber].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
11+
* extension[luogoNascita].valueAddress.line[0].extension[houseNumber].valueString = "1"
12+
* extension[luogoNascita].valueAddress.line[0] = "Via della Vittoria, 1"
13+
* extension[luogoNascita].valueAddress.city = "Milano"
14+
* extension[luogoNascita].valueAddress.postalCode = "20100"
15+
* extension[luogoNascita].valueAddress.country = "IT"
16+
17+
* extension[professione].url = "http://hl7.it/fhir/StructureDefinition/patient-occupation-it"
18+
* extension[professione].valueCodeableConcept = CsIstatProfessioni#1.1.3 "Dirigenti della magistratura"
19+
20+
* extension[titoloStudio].url = "http://hl7.it/fhir/StructureDefinition/patient-qualification-it"
21+
* extension[titoloStudio].valueCodeableConcept = CsIstatTitoliStudio#40205013 "Giuridico economico aziendale"
22+
23+
* identifier.extension[certificazioneId].url = "http://hl7.it/fhir/StructureDefinition/recordCertification"
24+
* identifier.extension[certificazioneId].extension[when].url = "when"
25+
* identifier.extension[certificazioneId].extension[when].valueDateTime = "2022-05-01"
26+
27+
* extension[luogoNascitaCodeable].url = "http://hl7.it/fhir/StructureDefinition/patient-codeableBirthPlace"
28+
* extension[luogoNascitaCodeable].valueCodeableConcept = CS_Estero#100 "Italia"
1629

1730
* identifier.system = "http://hl7.it/sid/codiceFiscale"
1831
* identifier.value = "RSSMRA71E01F205E"
@@ -31,10 +44,13 @@ Description: "Esempio di un paziente: soggetto iscritto al Sistema Sanitario Naz
3144
* gender = #female
3245

3346
* address.city = "Milano"
34-
* address.country = "Italia"
47+
* address.country = "IT"
3548
* address.postalCode = "20100"
3649
* address.line = "Via della Libertà, 52"
3750
* address.use = #home
51+
* address.extension[OfficialAddress].valueBoolean = true
52+
* address.line.extension[ExtDug].url = "http://hl7.it/fhir/StructureDefinition/address-dug"
53+
* address.line.extension[ExtDug].valueCodeableConcept = $istat-DUG-CS#67 "via"
3854

3955
* contact[0].name.family = "Rossi"
4056
* contact[0].name.given = "Luigi"
@@ -50,6 +66,7 @@ Description: "Esempio di un paziente: soggetto iscritto al Sistema Sanitario Naz
5066
* contact[0].telecom.value = "3312345567"
5167
* contact[1].telecom.system = #phone
5268
* contact[1].telecom.value = "3311234598"
69+
* generalPractitioner[aziendaAssistenza] = Reference(OrganizationOperatore-Lab-Esempio)
5370

5471

5572

‎input/fsh/examples/Specimen.fsh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ Description: "Esempio di campione: sangue prelevato dall'avambraccio del pazient
1515
* collection.bodySite.coding.display = "Anterior surface of arm"
1616
* container.type.coding.code = #706052002
1717
* container.type.coding.system = "http://www.snomed.org/"
18-
* container.type.coding.display = "Evacuated blood collection tube"
18+
* container.type.coding.display = "Evacuated blood collection tube"
19+
* container.additiveReference = Reference(Specimen-Additive-Substance-Lab-Esempio)

‎input/fsh/examples/bundleEsempio.fsh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@ 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/Composition-Lab-Esempio" //"urn:uuid:2ae95a5c-9094-41a3-a437-ce6d34c55a54"
11+
* entry[+].fullUrl = "Composition/2ae95a5c-9094-41a3-a437-ce6d34c55a54"
1212
* entry[=].resource = Composition-Lab-Esempio
13-
* entry[+].fullUrl = "Patient/Paziente-SSN" //urn:uuid:168d4960-0a0b-43af-8025-180f0965f324
13+
* entry[+].fullUrl = "Patient/8472931c-fbd0-437b-9ed1-4f66472c78b5"
1414
* entry[=].resource = Paziente-SSN
15-
* entry[+].fullUrl = "DiagnosticReport/DiagnosticReport-Lab-Esempio" //urn:uuid:56f19992-e73e-45b5-bbdd-6d9aeb60b15a
15+
* entry[+].fullUrl = "DiagnosticReport/56f19992-e73e-45b5-bbdd-6d9aeb60b15a"
1616
* entry[=].resource = DiagnosticReport-Lab-Esempio
17-
* entry[+].fullUrl = "Encounter/Encounter-Lab-Esempio" //urn:uuid:7b06368c-7089-4f66-acc8-29e1fcbd31f6
17+
* entry[+].fullUrl = "Encounter/7b06368c-7089-4f66-acc8-29e1fcbd31f6"
1818
* entry[=].resource = Encounter-Lab-Esempio
19-
* entry[+].fullUrl = "Specimen/Specimen-Lab-Esempio" //urn:uuid:168d4960-0a0b-43af-8025-180f0965f324
19+
* entry[+].fullUrl = "Specimen/168d4960-0a0b-43af-8025-180f0965f324"
2020
* entry[=].resource = Specimen-Lab-Esempio
21-
* entry[+].fullUrl = "Observation/Observation-Lab-Esempio-Glucosio" //urn:uuid:333b62b2-47b0-43b5-9745-abec1f0c4656
21+
* entry[+].fullUrl = "Observation/Observation-Lab-Esempio-Glucosio"
2222
* entry[=].resource = Observation-Lab-Esempio-Glucosio
23-
* entry[+].fullUrl = "ServiceRequest/ServiceRequest-Lab-Esempio" //urn:uuid:463ae6fe-60d4-4b38-84b3-1008e0925678
23+
* entry[+].fullUrl = "ServiceRequest/463ae6fe-60d4-4b38-84b3-1008e0925678"
2424
* entry[=].resource = ServiceRequest-Lab-Esempio
25-
* entry[+].fullUrl = "PractitionerRole/PractitionerRole-Lab-Esempio" //urn:uuid:dc5842a1-83b6-43c7-b063-75ae989b803c
25+
* entry[+].fullUrl = "PractitionerRole/dc5842a1-83b6-43c7-b063-75ae989b803c"
2626
* entry[=].resource = PractitionerRole-Lab-Esempio
27-
* entry[+].fullUrl = "Practitioner/Practitioner-Lab-Esempio" //urn:uuid:dc5842a1-83b6-43c7-b063-75ae989b803c
27+
* entry[+].fullUrl = "Practitioner/dc5842a1-83b6-43c7-b063-75ae989b803c"
2828
* entry[=].resource = Practitioner-Lab-Esempio
29-
* entry[+].fullUrl = "Practitioner/Infermiere-Lab-Esempio" //urn:uuid:dc5842a1-83b6-43c7-b063-75ae989b803c
29+
* entry[+].fullUrl = "Practitioner/Infermiere-Lab-Esempio"
3030
* entry[=].resource = Infermiere-Lab-Esempio
31-
* entry[+].fullUrl = "Organization/Organization-Lab-Esempio" //urn:uuid:dc5842a1-83b6-43c7-b063-75ae989b803c
31+
* entry[+].fullUrl = "Organization/Organization-Lab-Esempio"
3232
* entry[=].resource = Organization-Lab-Esempio
3333

‎input/fsh/examples/compositionEsempio.fsh‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ Instance: Composition-Lab-Esempio
22
InstanceOf: composition-it-lab
33
Usage: #example
44
Description: "Esempio di una Composition: descrizione header e struttura body del referto."
5-
// *text.div = """<div xmlns="http://www.w3.org/1999/xhtml" xml:lang="IT-it" lang="IT-it"><p><b>Generated Narrative: Composition</b><a name="2ae95a5c-9094-41a3-a437-ce6d34c55a54"> </a></p><div style="display: inline-block; background-color: #d9e0e7; padding: 6px; margin: 4px; border: 1px solid #8da1b4; border-radius: 5px; line-height: 60%"><p style="margin-bottom: 0px">Resource Composition &quot;2ae95a5c-9094-41a3-a437-ce6d34c55a54&quot; (Language &quot;IT-it&quot;) </p><p style="margin-bottom: 0px">Profile: <a href="StructureDefinition-composition-it-lab.html">Composition - Lab Report</a></p></div><blockquote><p><b>subject</b>: <a href="#Patient_Paziente-SSN">See above (Patient/Paziente-SSN)</a></p><p><b>DataEnterer</b></p><blockquote><p><b>url</b></p><code>dataEnterer</code></blockquote><p><b>value</b>: <a href="#PractitionerRole_dc5842a1-83b6-43c7-b063-75ae989b803c">See above (PractitionerRole/dc5842a1-83b6-43c7-b063-75ae989b803c)</a></p><blockquote><p><b>url</b></p><a href="StructureDefinition-dataEnterer-time.html">TempoCompilazione</a></blockquote><p><b>value</b>: 2023-02-25 10:45:00+0100</p></blockquote><p><b>identifier</b>: id: urn:uuid:10b545ea-725c-446d-9b95-8aeb444eddf3 (use: OFFICIAL)</p><p><b>status</b>: final</p><p><b>type</b>: Referto di laboratorio <span style="background: LightGoldenRodYellow; margin: 4px; border: 1px solid khaki"> (<a href="https://loinc.org/">LOINC</a>#11502-2)</span></p><p><b>encounter</b>: <a href="#Encounter_7b06368c-7089-4f66-acc8-29e1fcbd31f6">See above (Encounter/7b06368c-7089-4f66-acc8-29e1fcbd31f6)</a></p><p><b>date</b>: 2023-03-28</p><p><b>author</b>: <a href="#PractitionerRole_dc5842a1-83b6-43c7-b063-75ae989b803c">See above (PractitionerRole/dc5842a1-83b6-43c7-b063-75ae989b803c)</a></p><p><b>title</b>: Referto di Laboratorio</p><p><b>confidentiality</b>: N</p><h3>Attesters</h3><table class="grid"><tr><td>-</td><td><b>Mode</b></td><td><b>Time</b></td><td><b>Party</b></td></tr><tr><td>*</td><td>legal</td><td>2023-02-25 12:45:00+0100</td><td><a href="#PractitionerRole_dc5842a1-83b6-43c7-b063-75ae989b803c">See above (PractitionerRole/dc5842a1-83b6-43c7-b063-75ae989b803c)</a></td></tr></table><p><b>custodian</b>: <a href="#Organization_Organization-Lab-Esempio">See above (Organization/Organization-Lab-Esempio)</a></p></div>"""
65
* id = "2ae95a5c-9094-41a3-a437-ce6d34c55a54"
76
* extension[dataEnterer].extension[dataEnterer].valueReference = Reference(PractitionerRole-Lab-Esempio)
87
* extension[dataEnterer].extension[tempoCompilazione].valueDateTime = "2023-02-25T10:45:00+01:00"
98

9+
* extension[$basedOnOrder].valueReference = Reference(ServiceRequest-Lab-Esempio)
10+
* extension[$informationRecipient].valueReference = Reference(Infermiere-Lab-Esempio)
11+
1012
* language = #it-IT
1113
* identifier.use = #official
1214
* identifier.value = "urn:uuid:10b545ea-725c-446d-9b95-8aeb444eddf3"
@@ -24,18 +26,7 @@ Description: "Esempio di una Composition: descrizione header e struttura body de
2426
* attester[legalAuthenticator].mode = #legal
2527
* attester[legalAuthenticator].time = "2023-02-25T12:45:00+01:00"
2628
* attester[legalAuthenticator].party = Reference(PractitionerRole-Lab-Esempio)
27-
// * attester[+].mode = #professional
28-
// * attester[=].party = Reference(PractitionerRole-Lab-Esempio)
29-
// * attester[=].time = "2022-03-25T11:00:00+01:00"
3029
* custodian = Reference(Organization-Lab-Esempio)
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)
3930

4031
* section[lab-subsections].code.coding.system = $loinc
4132
* section[lab-subsections].code.coding.code = #26436-6

‎input/fsh/examples/deviceEsempio.fsh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Instance: Device-Lab-Esempio
2+
InstanceOf: device-it-lab
3+
Usage: #example
4+
Title: "Esempio di Device"
5+
Description: "Esempio di device utilizzato per l'analisi dell'emocromo: Analizzatore per analisi del sangue"
6+
7+
* id = "168d4960-0a0b-43af-8025-180f0965f324"
8+
9+
* deviceName.name = "Analizzatore Automatico"
10+
* deviceName.type = #other

‎input/fsh/examples/diagnosticReport.fsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Usage: #example
44
Description: "Esempio di un report diagnostico: report prodotto durante l'incontro."
55

66
* id = "56f19992-e73e-45b5-bbdd-6d9aeb60b15a"
7-
* extension[$diagnostic-report-composition-r5].valueReference = Reference(Composition/2ae95a5c-9094-41a3-a437-ce6d34c55a54)
7+
* extension[DiagnosticReportCompositionR5].valueReference = Reference(Composition/2ae95a5c-9094-41a3-a437-ce6d34c55a54)
88
* identifier.use = #official
99
* identifier.value = "urn:uuid:10b545ea-725c-446d-9b95-8aeb444eddf3"
1010
* basedOn = Reference(ServiceRequest-Lab-Esempio)

0 commit comments

Comments
 (0)