Skip to content

Commit

Permalink
Refgactoring RelatedPerson
Browse files Browse the repository at this point in the history
  • Loading branch information
@simoneOnFhir
simoneOnFhir committed Nov 5, 2024
1 parent 6191081 commit 6c536d3
Show file tree
Hide file tree
Showing 18 changed files with 555 additions and 377 deletions.
44 changes: 22 additions & 22 deletions Resources/fsh-generated/fsh-index.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,56 +132,56 @@
"fshName": "composition-blutdruck",
"fshType": "Instance",
"fshFile": "ISiKBerichtSubSysteme.fsh",
"startLine": 189,
"endLine": 207
"startLine": 187,
"endLine": 205
},
{
"outputFile": "Condition-BehandlungsDiagnoseFreitext.json",
"fshName": "BehandlungsDiagnoseFreitext",
"fshType": "Instance",
"fshFile": "ISiKDiagnose.fsh",
"startLine": 205,
"endLine": 212
"startLine": 208,
"endLine": 215
},
{
"outputFile": "Condition-Example-condition-ausrufezeichen-primaer.json",
"fshName": "Example-condition-ausrufezeichen-primaer",
"fshType": "Instance",
"fshFile": "ISiKDiagnose.fsh",
"startLine": 137,
"endLine": 146
"startLine": 140,
"endLine": 149
},
{
"outputFile": "Condition-Example-condition-ausrufezeichen-sekundaer.json",
"fshName": "Example-condition-ausrufezeichen-sekundaer",
"fshType": "Instance",
"fshFile": "ISiKDiagnose.fsh",
"startLine": 148,
"endLine": 161
"startLine": 151,
"endLine": 164
},
{
"outputFile": "Condition-Example-condition-kreuz-stern-primaer.json",
"fshName": "Example-condition-kreuz-stern-primaer",
"fshType": "Instance",
"fshFile": "ISiKDiagnose.fsh",
"startLine": 163,
"endLine": 175
"startLine": 166,
"endLine": 178
},
{
"outputFile": "Condition-Example-condition-kreuz-stern-sekundaer.json",
"fshName": "Example-condition-kreuz-stern-sekundaer",
"fshType": "Instance",
"fshFile": "ISiKDiagnose.fsh",
"startLine": 177,
"endLine": 192
"startLine": 180,
"endLine": 195
},
{
"outputFile": "Condition-MittelgradigeIntelligenzminderung.json",
"fshName": "MittelgradigeIntelligenzminderung",
"fshType": "Instance",
"fshFile": "ISiKDiagnose.fsh",
"startLine": 194,
"endLine": 203
"startLine": 197,
"endLine": 206
},
{
"outputFile": "Coverage-CoverageGesetzlich.json",
Expand Down Expand Up @@ -380,16 +380,16 @@
"fshName": "Appendektomie",
"fshType": "Instance",
"fshFile": "ISiKProzedur.fsh",
"startLine": 106,
"endLine": 119
"startLine": 110,
"endLine": 123
},
{
"outputFile": "RelatedPerson-ISiKAngehoerigerMustermann.json",
"fshName": "ISiKAngehoerigerMustermann",
"fshType": "Instance",
"fshFile": "ISiKAngehoeriger.fsh",
"startLine": 49,
"endLine": 60
"startLine": 167,
"endLine": 178
},
{
"outputFile": "RelatedPerson-SZ1Mutter.json",
Expand Down Expand Up @@ -469,7 +469,7 @@
"fshType": "Profile",
"fshFile": "ISiKAngehoeriger.fsh",
"startLine": 1,
"endLine": 47
"endLine": 164
},
{
"outputFile": "StructureDefinition-ISiKBerichtBundle.json",
Expand All @@ -485,7 +485,7 @@
"fshType": "Profile",
"fshFile": "ISiKBerichtSubSysteme.fsh",
"startLine": 1,
"endLine": 187
"endLine": 185
},
{
"outputFile": "StructureDefinition-ISiKBinary.json",
Expand Down Expand Up @@ -517,7 +517,7 @@
"fshType": "Profile",
"fshFile": "ISiKDiagnose.fsh",
"startLine": 1,
"endLine": 135
"endLine": 138
},
{
"outputFile": "StructureDefinition-ISiKICD10GMCoding.json",
Expand Down Expand Up @@ -597,7 +597,7 @@
"fshType": "Profile",
"fshFile": "ISiKProzedur.fsh",
"startLine": 1,
"endLine": 104
"endLine": 108
},
{
"outputFile": "StructureDefinition-ISiKRaucherStatus.json",
Expand Down
26 changes: 13 additions & 13 deletions Resources/fsh-generated/fsh-index.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ CodeSystem-ISiKBehandlungsergebnisRehaCS.json ISiKBeh
CodeSystem-ISiKBesondereBehandlungsformRehaCS.json ISiKBesondereBehandlungsformReha CodeSystem CodeSystems.fsh 1 - 9
CodeSystem-ISiKEntlassformRehaCS.json ISiKEntlassformReha CodeSystem CodeSystems.fsh 20 - 40
CodeSystem-ISiKUnterbrechnungRehaCS.json ISiKUnterbrechnungReha CodeSystem CodeSystems.fsh 44 - 54
Composition-composition-blutdruck.json composition-blutdruck Instance ISiKBerichtSubSysteme.fsh 189 - 207
Condition-BehandlungsDiagnoseFreitext.json BehandlungsDiagnoseFreitext Instance ISiKDiagnose.fsh 205 - 212
Condition-Example-condition-ausrufezeichen-primaer.json Example-condition-ausrufezeichen-primaer Instance ISiKDiagnose.fsh 137 - 146
Condition-Example-condition-ausrufezeichen-sekundaer.json Example-condition-ausrufezeichen-sekundaer Instance ISiKDiagnose.fsh 148 - 161
Condition-Example-condition-kreuz-stern-primaer.json Example-condition-kreuz-stern-primaer Instance ISiKDiagnose.fsh 163 - 175
Condition-Example-condition-kreuz-stern-sekundaer.json Example-condition-kreuz-stern-sekundaer Instance ISiKDiagnose.fsh 177 - 192
Condition-MittelgradigeIntelligenzminderung.json MittelgradigeIntelligenzminderung Instance ISiKDiagnose.fsh 194 - 203
Composition-composition-blutdruck.json composition-blutdruck Instance ISiKBerichtSubSysteme.fsh 187 - 205
Condition-BehandlungsDiagnoseFreitext.json BehandlungsDiagnoseFreitext Instance ISiKDiagnose.fsh 208 - 215
Condition-Example-condition-ausrufezeichen-primaer.json Example-condition-ausrufezeichen-primaer Instance ISiKDiagnose.fsh 140 - 149
Condition-Example-condition-ausrufezeichen-sekundaer.json Example-condition-ausrufezeichen-sekundaer Instance ISiKDiagnose.fsh 151 - 164
Condition-Example-condition-kreuz-stern-primaer.json Example-condition-kreuz-stern-primaer Instance ISiKDiagnose.fsh 166 - 178
Condition-Example-condition-kreuz-stern-sekundaer.json Example-condition-kreuz-stern-sekundaer Instance ISiKDiagnose.fsh 180 - 195
Condition-MittelgradigeIntelligenzminderung.json MittelgradigeIntelligenzminderung Instance ISiKDiagnose.fsh 197 - 206
Coverage-CoverageGesetzlich.json CoverageGesetzlich Instance ISiKVersicherungsverhaeltnisGesetzlich.fsh 111 - 120
Coverage-CoveragePrivat.json CoveragePrivat Instance ISiKVersicherungsverhaeltnisSelbstzahler.fsh 77 - 83
Coverage-SZ1VersicherungGesetzlich.json SZ1VersicherungGesetzlich Instance Beispiel-Szenario-1.fsh 45 - 61
Expand All @@ -46,8 +46,8 @@ Patient-PatientinMusterfrau.json Patient
Patient-PatientinMusterfrauMinimal.json PatientinMusterfrauMinimal Instance ISiKBerichtBundle.fsh 41 - 53
Patient-SZ1Patient.json SZ1Patient Instance Beispiel-Szenario-1.fsh 9 - 25
Practitioner-PractitionerWalterArzt.json PractitionerWalterArzt Instance ISiKPersonImGesundheitsberuf.fsh 92 - 127
Procedure-Appendektomie.json Appendektomie Instance ISiKProzedur.fsh 106 - 119
RelatedPerson-ISiKAngehoerigerMustermann.json ISiKAngehoerigerMustermann Instance ISiKAngehoeriger.fsh 49 - 60
Procedure-Appendektomie.json Appendektomie Instance ISiKProzedur.fsh 110 - 123
RelatedPerson-ISiKAngehoerigerMustermann.json ISiKAngehoerigerMustermann Instance ISiKAngehoeriger.fsh 167 - 178
RelatedPerson-SZ1Mutter.json SZ1Mutter Instance Beispiel-Szenario-1.fsh 27 - 43
SearchParameter-Encounter-date-start.json Encounter-date-start Instance ISiKKontaktGesundheitseinrichtung.fsh 504 - 522
SearchParameter-Encounter-end-date.json Encounter-end-date Instance ISiKKontaktGesundheitseinrichtung.fsh 524 - 542
Expand All @@ -57,13 +57,13 @@ StructureDefinition-ISiKATCCoding.json ISiKATC
StructureDefinition-ISiKAbrechnungsfall.json ISiKAbrechnungsfall Profile ISiKAbrechnungsfall.fsh 1 - 106
StructureDefinition-ISiKAlkoholAbusus.json ISiKAlkoholAbusus Profile ISiKLebenszustandOberservations.fsh 91 - 101
StructureDefinition-ISiKAllergieUnvertraeglichkeit.json ISiKAllergieUnvertraeglichkeit Profile ISiKAllergieUnvertraeglichkeit.fsh 1 - 107
StructureDefinition-ISiKAngehoeriger.json ISiKAngehoeriger Profile ISiKAngehoeriger.fsh 1 - 47
StructureDefinition-ISiKAngehoeriger.json ISiKAngehoeriger Profile ISiKAngehoeriger.fsh 1 - 164
StructureDefinition-ISiKBerichtBundle.json ISiKBerichtBundle Profile ISiKBerichtBundle.fsh 1 - 22
StructureDefinition-ISiKBerichtSubSysteme.json ISiKBerichtSubSysteme Profile ISiKBerichtSubSysteme.fsh 1 - 187
StructureDefinition-ISiKBerichtSubSysteme.json ISiKBerichtSubSysteme Profile ISiKBerichtSubSysteme.fsh 1 - 185
StructureDefinition-ISiKBinary.json ISiKBinary Profile ISiKBinary.fsh 1 - 15
StructureDefinition-ISiKCodeSystem.json ISiKCodeSystem Profile ISiKCodeSystem.fsh 1 - 14
StructureDefinition-ISiKCoding.json ISiKCoding Profile ISiKDataTypeProfiles.fsh 1 - 9
StructureDefinition-ISiKDiagnose.json ISiKDiagnose Profile ISiKDiagnose.fsh 1 - 135
StructureDefinition-ISiKDiagnose.json ISiKDiagnose Profile ISiKDiagnose.fsh 1 - 138
StructureDefinition-ISiKICD10GMCoding.json ISiKICD10GMCoding Profile ISiKDataTypeProfiles.fsh 33 - 42
StructureDefinition-ISiKKontaktGesundheitseinrichtung.json ISiKKontaktGesundheitseinrichtung Profile ISiKKontaktGesundheitseinrichtung.fsh 1 - 396
StructureDefinition-ISiKLebensZustand.json ISiKLebensZustand Profile ISiKLebenszustandOberservations.fsh 1 - 35
Expand All @@ -73,7 +73,7 @@ StructureDefinition-ISiKOrganisationFachabteilung.json ISiKOrg
StructureDefinition-ISiKPZNCoding.json ISiKPZNCoding Profile ISiKDataTypeProfiles.fsh 64 - 72
StructureDefinition-ISiKPatient.json ISiKPatient Profile ISiKPatient.fsh 2 - 345
StructureDefinition-ISiKPersonImGesundheitsberuf.json ISiKPersonImGesundheitsberuf Profile ISiKPersonImGesundheitsberuf.fsh 1 - 88
StructureDefinition-ISiKProzedur.json ISiKProzedur Profile ISiKProzedur.fsh 1 - 104
StructureDefinition-ISiKProzedur.json ISiKProzedur Profile ISiKProzedur.fsh 1 - 108
StructureDefinition-ISiKRaucherStatus.json ISiKRaucherStatus Profile ISiKLebenszustandOberservations.fsh 117 - 127
StructureDefinition-ISiKSchwangerschaftErwarteterEntbindungstermin.json ISiKSchwangerschaftErwarteterEntbindungstermin Profile ISiKLebenszustandOberservations.fsh 69 - 77
StructureDefinition-ISiKSchwangerschaftsstatus.json ISiKSchwangerschaftsstatus Profile ISiKLebenszustandOberservations.fsh 39 - 53
Expand Down
34 changes: 17 additions & 17 deletions Resources/fsh-generated/resources/Account-AbrechnungsfallDRG.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,6 @@
"value": "0123456789"
}
],
"coverage": [
{
"extension": [
{
"url": "http://fhir.de/StructureDefinition/ExtensionAbrechnungsart",
"valueCoding": {
"code": "DRG",
"system": "http://fhir.de/CodeSystem/dkgev/Abrechnungsart",
"display": "Diagnosebezogene Fallgruppen"
}
}
],
"coverage": {
"reference": "Coverage/CoverageGesetzlich"
}
}
],
"extension": [
{
"url": "http://fhir.de/StructureDefinition/ExtensionAbrechnungsDiagnoseProzedur",
Expand Down Expand Up @@ -71,5 +54,22 @@
{
"reference": "Patient/PatientinMusterfrau"
}
],
"coverage": [
{
"extension": [
{
"url": "http://fhir.de/StructureDefinition/ExtensionAbrechnungsart",
"valueCoding": {
"code": "DRG",
"system": "http://fhir.de/CodeSystem/dkgev/Abrechnungsart",
"display": "Diagnosebezogene Fallgruppen"
}
}
],
"coverage": {
"reference": "Coverage/CoverageGesetzlich"
}
}
]
}
Loading

0 comments on commit 6c536d3

Please sign in to comment.