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

fix: numeric indexing #323

Closed
wants to merge 1 commit into from
Closed

fix: numeric indexing #323

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
36 changes: 18 additions & 18 deletions Resources/input/fsh/ISiKBerichtBundle.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,29 @@ InstanceOf: ISiKBerichtBundle
Usage: #example
Title: "Bundle-Beispiel-Blutdruck"
Description: "Beispiel für ein Bundle mit Composition Blutdruck, das folgende User Story repräsentiert: Die Patientin von Musterfrau war vom 3. bis 5. Mai 2022 als stationärer Fall anlässlich einer geplanten Operation im Krankenhaus. Dabei wurde am 3. Mai der Blutdruck gemessen und das Ergebnis in einem Peripheriesystem vermerkt. Das Peripheriesystem sendet das Messergebnis an das KIS, so dass das KIS dieses in die Gesamtdokumentation zur Patientin aufnehmen kann."
* identifier[0].type = $v2-0203#FILL
* identifier[=].system = "https://fhir.krankenhaus.example/sid/subsystem-a/berichtbundlenummer"
* identifier[=].value = "0123456789"
* identifier[Bericht_Bundle_Nummer].type = $v2-0203#FILL
* identifier[Bericht_Bundle_Nummer].system = "https://fhir.krankenhaus.example/sid/subsystem-a/berichtbundlenummer"
* identifier[Bericht_Bundle_Nummer].value = "0123456789"
* timestamp = "2022-05-03T17:57:34+01:00"
* entry[0].resource = composition-blutdruck
* entry[=].fullUrl = "urn:uuid:74b471ba-6fc9-11ed-a1eb-0242ac120002"
* entry[+].resource = PatientinMusterfrauMinimal
* entry[=].fullUrl = "urn:uuid:3bada18a-6fd2-11ed-a1eb-0242ac112345"
* entry[+].resource = FachabteilungskontaktMinimal
* entry[=].fullUrl = "urn:uuid:74b46c1a-6fc9-11ed-a1eb-0242ac198765"
* entry[Composition_Blutdruck].resource = composition-blutdruck
* entry[Composition_Blutdruck].fullUrl = "urn:uuid:74b471ba-6fc9-11ed-a1eb-0242ac120002"
* entry[Patient].resource = PatientinMusterfrauMinimal
* entry[Patient].fullUrl = "urn:uuid:3bada18a-6fd2-11ed-a1eb-0242ac112345"
* entry[Kontakt].resource = FachabteilungskontaktMinimal
* entry[Kontakt].fullUrl = "urn:uuid:74b46c1a-6fc9-11ed-a1eb-0242ac198765"


Instance: PatientinMusterfrauMinimal
InstanceOf: Patient
Usage: #example
Description: "Minimalbeispiel für Patientin Musterfrau "
* identifier[0].type = $v2-0203#MR
* identifier[=].system = "https://fhir.krankenhaus.example/sid/PID"
* identifier[=].value = "TestPID"
* name[0].use = #official
* name[=].family = "Fürstin von Musterfrau"
* name[=].given = "Erika"
* name[=].prefix = "Dr."
* identifier[Patientennummer].type = $v2-0203#MR
* identifier[Patientennummer].system = "https://fhir.krankenhaus.example/sid/PID"
* identifier[Patientennummer].value = "TestPID"
* name[Name].use = #official
* name[Name].family = "Fürstin von Musterfrau"
* name[Name].given = "Erika"
* name[Name].prefix = "Dr."
* gender = #female
* birthDate = "1964-08-12"

Expand All @@ -60,8 +60,8 @@ Usage: #example
* identifier.value = "0123456789"
* status = #unknown
* class = $v3-ActCode#IMP
* type[0] = $Kontaktart-de#operation
* type[+] = $Kontaktebene#abteilungskontakt
* type[Kontaktart] = $Kontaktart-de#operation
* type[Kontaktebene] = $Kontaktebene#abteilungskontakt
* serviceType = $FachabteilungsschluesselCS#0100
* subject.reference = "urn:uuid:3bada18a-6fd2-11ed-a1eb-0242ac112345"
* period.start = "2022-05-03"
Expand Down
12 changes: 6 additions & 6 deletions Resources/input/fsh/ISiKBerichtSubSysteme.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ Instance: composition-blutdruck
InstanceOf: ISiKBerichtSubSysteme
Usage: #example
* text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"> <p> Familienname:Fürstin von Musterfrau</p> <p> Geburtsdatum:1964-08-12</p> <p> PID:TestPID</p> <p> Bericht-Status:final</p> <p> Bericht-Typ:Berichtzusammenfassung / Document Summary</p> <p> Datum:03.05.2022</p> <p> Titel:Blutdruckmessung vom 3.5.2022</p> <p> Autor:Gerät XY, Fa. Z, Modell T</p></div>"
* identifier[0].type = $v2-0203#FILL
* identifier[=].system = "https://fhir.krankenhaus.example/sid/system-a/berichtnummer"
* identifier[=].value = "0123456789"
* identifier[Berichtnummer].type = $v2-0203#FILL
* identifier[Berichtnummer].system = "https://fhir.krankenhaus.example/sid/system-a/berichtnummer"
* identifier[Berichtnummer].value = "0123456789"
* status = #final
* type = $loinc#55112-7
* subject.reference = "urn:uuid:3bada18a-6fd2-11ed-a1eb-0242ac112345"
Expand All @@ -78,9 +78,9 @@ Usage: #example
* author.type = "Device"
* author.display = "Gerät XY, Fa. Z, Modell T"
* title = "Blutdruckmessung vom 3.5.2022"
* section[0].title = "Messung"
* section[=].text.status = #generated
* section[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><table><tr><td><b> Systolisch</b></td><td><b> Diastolisch</b></td><td><b> Einheit</b></td><td><b> Uhrzeit</b></td></tr><tr><td> \r\n\t\t\t\t\t\t\t140\r\n\t\t\t\t\t\t</td><td> \r\n\t\t\t\t\t\t\t110\r\n\t\t\t\t\t\t</td><td> \r\n\t\t\t\t\t\t\tmmHG\r\n\t\t\t\t\t\t</td><td> \r\n\t\t\t\t\t\t\t17:15h\r\n\t\t\t\t\t\t</td></tr></table></div>"
* section[Messung].title = "Messung"
* section[Messung].text.status = #generated
* section[Messung].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><table><tr><td><b> Systolisch</b></td><td><b> Diastolisch</b></td><td><b> Einheit</b></td><td><b> Uhrzeit</b></td></tr><tr><td> \r\n\t\t\t\t\t\t\t140\r\n\t\t\t\t\t\t</td><td> \r\n\t\t\t\t\t\t\t110\r\n\t\t\t\t\t\t</td><td> \r\n\t\t\t\t\t\t\tmmHG\r\n\t\t\t\t\t\t</td><td> \r\n\t\t\t\t\t\t\t17:15h\r\n\t\t\t\t\t\t</td></tr></table></div>"

Invariant: kdl-1
Description: "KDL-Code ungültig"
Expand Down
6 changes: 3 additions & 3 deletions Resources/input/fsh/ISiKCodeSystem.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ Usage: #example
* name = "TestKatalog"
* status = #active
* content = #complete
* concept[0].code = #test
* concept[0].display = "Test"
* concept[0].definition = "Dies ist ein Test-Code"
* concept[Test_Code].code = #test
* concept[Test_Code].display = "Test"
* concept[Test_Code].definition = "Dies ist ein Test-Code"
56 changes: 28 additions & 28 deletions Resources/input/fsh/ISiKKontaktGesundheitseinrichtung.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,12 @@ Instance: Fachabteilungskontakt
InstanceOf: ISiKKontaktGesundheitseinrichtung
Usage: #example
* extension.url = "http://fhir.de/StructureDefinition/Aufnahmegrund"
* extension.extension[0].url = "ErsteUndZweiteStelle"
* extension.extension[=].valueCoding = $AufnahmegrundErsteUndZweiteStelle#01 "Krankenhausbehandlung, vollstationär"
* extension.extension[+].url = "DritteStelle"
* extension.extension[=].valueCoding = $AufnahmegrundDritteStelle#0 "Anderes"
* extension.extension[+].url = "VierteStelle"
* extension.extension[=].valueCoding = $AufnahmegrundVierteStelle#1 "Normalfall"
* extension.extension[Aufnahmegrund_Erste_Zweite].url = "ErsteUndZweiteStelle"
* extension.extension[Aufnahmegrund_Erste_Zweite].valueCoding = $AufnahmegrundErsteUndZweiteStelle#01 "Krankenhausbehandlung, vollstationär"
* extension.extension[Aufnahmegrund_Dritte].url = "DritteStelle"
* extension.extension[Aufnahmegrund_Dritte].valueCoding = $AufnahmegrundDritteStelle#0 "Anderes"
* extension.extension[Aufnahmegrund_Vierte].url = "VierteStelle"
* extension.extension[Aufnahmegrund_Vierte].valueCoding = $AufnahmegrundVierteStelle#1 "Normalfall"
* identifier.type = $v2-0203#VN
* identifier.system = "https://test.krankenhaus.de/fhir/sid/besuchsnummer"
* identifier.value = "0123456789"
Expand All @@ -157,10 +157,10 @@ Usage: #example
* account.identifier.value = "XZY"
* hospitalization.admitSource = $Aufnahmeanlass#E
* hospitalization.dischargeDisposition.extension.url = "http://fhir.de/StructureDefinition/Entlassungsgrund"
* hospitalization.dischargeDisposition.extension.extension[0].url = "ErsteUndZweiteStelle"
* hospitalization.dischargeDisposition.extension.extension[=].valueCoding = $EntlassungsgrundErsteUndZweiteStelle#01 "Behandlung regulär beendet"
* hospitalization.dischargeDisposition.extension.extension[+].url = "DritteStelle"
* hospitalization.dischargeDisposition.extension.extension[=].valueCoding = $EntlassungsgrundDritteStelle#1 "arbeitsfähig entlassen"
* hospitalization.dischargeDisposition.extension.extension[Entlassungsstelle_Erste_Zweite].url = "ErsteUndZweiteStelle"
* hospitalization.dischargeDisposition.extension.extension[Entlassungsstelle_Erste_Zweite].valueCoding = $EntlassungsgrundErsteUndZweiteStelle#01 "Behandlung regulär beendet"
* hospitalization.dischargeDisposition.extension.extension[Entlassungsstelle_Dritte].url = "DritteStelle"
* hospitalization.dischargeDisposition.extension.extension[Entlassungsstelle_Dritte].valueCoding = $EntlassungsgrundDritteStelle#1 "arbeitsfähig entlassen"
* location.physicalType = $LocationPhysicalType#bd "Bed"
* location.location.identifier.system = "https://test.krankenhaus.de/fhir/sid/locationid"
* location.location.identifier.value = "123"
Expand Down Expand Up @@ -220,15 +220,15 @@ Usage: #definition
* base = #Encounter
* type = #date
* expression = "Encounter.period.start"
* comparator[0] = #eq
* comparator[+] = #ne
* comparator[+] = #gt
* comparator[+] = #ge
* comparator[+] = #lt
* comparator[+] = #le
* comparator[+] = #sa
* comparator[+] = #eb
* comparator[+] = #ap
* comparator[EQ] = #eq
* comparator[NE] = #ne
* comparator[GT] = #gt
* comparator[GE] = #ge
* comparator[LT] = #lt
* comparator[LE] = #le
* comparator[SA] = #sa
* comparator[EB] = #eb
* comparator[AP] = #ap

Instance: Encounter-end-date
InstanceOf: SearchParameter
Expand All @@ -240,12 +240,12 @@ Usage: #definition
* base = #Encounter
* type = #date
* expression = "Encounter.period.end"
* comparator[0] = #eq
* comparator[+] = #ne
* comparator[+] = #gt
* comparator[+] = #ge
* comparator[+] = #lt
* comparator[+] = #le
* comparator[+] = #sa
* comparator[+] = #eb
* comparator[+] = #ap
* comparator[EQ] = #eq
* comparator[NE] = #ne
* comparator[GT] = #gt
* comparator[GE] = #ge
* comparator[LT] = #lt
* comparator[LE] = #le
* comparator[SA] = #sa
* comparator[EB] = #eb
* comparator[AP] = #ap
46 changes: 23 additions & 23 deletions Resources/input/fsh/ISiKPatient.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,12 @@ Usage: #example
* active = true
* name[Name]
* family = "Fürstin von Musterfrau"
* extension[0].url = "http://fhir.de/StructureDefinition/humanname-namenszusatz"
* extension[=].valueString = "Fürstin"
* extension[+].url = "http://hl7.org/fhir/StructureDefinition/humanname-own-name"
* extension[=].valueString = "Musterfrau"
* extension[+].url = "http://hl7.org/fhir/StructureDefinition/humanname-own-prefix"
* extension[=].valueString = "von"
* extension[Namenszusatz].url = "http://fhir.de/StructureDefinition/humanname-namenszusatz"
* extension[Namenszusatz].valueString = "Fürstin"
* extension[Nachname].url = "http://hl7.org/fhir/StructureDefinition/humanname-own-name"
* extension[Nachname].valueString = "Musterfrau"
* extension[Name_Praefix].url = "http://hl7.org/fhir/StructureDefinition/humanname-own-prefix"
* extension[Name_Praefix].valueString = "von"
* given = "Erika"
* prefix = "Dr."
* extension.url = "http://hl7.org/fhir/StructureDefinition/iso21090-EN-qualifier"
Expand All @@ -139,25 +139,25 @@ Usage: #example
* extension.valueString = "Gabler"
* gender = #female
* birthDate = "1964-08-12"
* address[0].type = #both
* address[=].line[0] = "Musterweg 2"
* address[=].line[+] = "3. Etage"
* address[=].line[0].extension[0].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName"
* address[=].line[=].extension[=].valueString = "Musterweg"
* address[=].line[=].extension[+].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
* address[=].line[=].extension[=].valueString = "2"
* address[=].line[+].extension.url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-additionalLocator"
* address[=].line[=].extension.valueString = "3. Etage"
* address[=].city = "Musterhausen"
* address[=].postalCode = "98764"
* address[=].country = "DE"
* address[+].type = #postal
* address[=].line = "Postfach 8 15"
* address[Adresse].type = #both
* address[Adresse].line[Strassenanschrift] = "Musterweg 2"
* address[Adresse].line[Etage] = "3. Etage"
* address[Adresse].line[Anschrift].extension[Strassenname].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName"
* address[Adresse].line[Anschrift].extension[Strassenname].valueString = "Musterweg"
* address[Adresse].line[Anschrift].extension[Hausnummer].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
* address[Adresse].line[Anschrift].extension[Hausnummer].valueString = "2"
* address[Adresse].line[Ortsangabe_Zusatz].extension.url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-additionalLocator"
* address[Adresse].line[Ortsangabe_Zusatz].extension.valueString = "3. Etage"
* address[Adresse].city = "Musterhausen"
* address[Adresse].postalCode = "98764"
* address[Adresse].country = "DE"
* address[Postfach].type = #postal
* address[Postfach].line = "Postfach 8 15"
* extension.url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-postBox"
* extension.valueString = "Postfach 8 15"
* address[=].city = "Musterhausen"
* address[=].postalCode = "98764"
* address[=].country = "DE"
* address[Postfach].city = "Musterhausen"
* address[Postfach].postalCode = "98764"
* address[Postfach].country = "DE"


Invariant: isik-pat-1
Expand Down
20 changes: 10 additions & 10 deletions Resources/input/fsh/ISiKPersonImGesundheitsberuf.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ Instance: PractitionerWalterArzt
InstanceOf: ISiKPersonImGesundheitsberuf
Usage: #example
* meta.source = "http://krankenhaus.de"
* identifier[0].type = $v2-0203#LANR
* identifier[=].system = "https://fhir.kbv.de/NamingSystem/KBV_NS_Base_ANR"
* identifier[=].value = "123456789"
* identifier[+].type = $v2-0203#DN
* identifier[=].system = "http://fhir.de/sid/bundesaerztekammer/efn"
* identifier[=].value = "123456789123456"
* identifier[ArztnummerKBV].type = $v2-0203#LANR
* identifier[ArztnummerKBV].system = "https://fhir.kbv.de/NamingSystem/KBV_NS_Base_ANR"
* identifier[ArztnummerKBV].value = "123456789"
* identifier[ArztnummerBAEK].type = $v2-0203#DN
* identifier[ArztnummerBAEK].system = "http://fhir.de/sid/bundesaerztekammer/efn"
* identifier[ArztnummerBAEK].value = "123456789123456"
* active = true
* name[Name]
* text = "Walter Arzt"
Expand All @@ -113,10 +113,10 @@ Usage: #example
* extension.valueString = "Gross"
* address.type = #both
* address.line = "Schmiedegasse 16"
* extension[0].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
* extension[=].valueString = "16"
* extension[+].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName"
* extension[=].valueString = "Schmiedegasse"
* extension[Hausnummer].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-houseNumber"
* extension[Hausnummer].valueString = "16"
* extension[Strassenname].url = "http://hl7.org/fhir/StructureDefinition/iso21090-ADXP-streetName"
* extension[Strassenname].valueString = "Schmiedegasse"
* address.city = "Potsdam"
* address.postalCode = "14469"
* address.country = "DE"
Expand Down
6 changes: 3 additions & 3 deletions Resources/input/fsh/ISiKProzedur.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ Usage: #example
* extension.valueDateTime = "2020-04-23"
* status = #completed
* category = $sct#387713003 "Surgical procedure (procedure)"
* code.coding[0] = $sct#80146002 "Excision of appendix (procedure)"
* code.coding[+].version = "2020"
* code.coding[=] = $ops#5-470 "Appendektomie"
* code.coding[ProzedurSNOMED] = $sct#80146002 "Excision of appendix (procedure)"
* code.coding[ProzedurOPS].version = "2020"
* code.coding[ProzedurOPS] = $ops#5-470 "Appendektomie"
* code.text = "Entfernung des Blinddarms"
* subject = Reference(PatientinMusterfrau)
* performedDateTime = "2020-04-23"
Expand Down
Loading