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.

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

Feature/radiological diagnostic report #49

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 1 addition & 16 deletions input/fsh/Observation_ProcedureCategorisation.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@ Description: "Profiles the category of a BodyStructure resource in the context o
* focus 1..1 MS
* focus only Reference(BodyStructure)

// TNM Categories Valueset
ValueSet: VS_TNM_Category_Observation
Id: vs-tnm-category-observation
Title: "Valueset for Categories of a BodyStructure in the context of one TNM procedure"
Description: "This Valueset contains the coded for the different categories for BodyStructures in the context of TNM (Tumor|Node|Metastase)"
* ^url = "https://www.vision-zero-oncology.de/fhir/ValueSet/vs-tnm-category-observation"
* $LNC#21905-5 "Primary tumor.clinical [Class] Cancer"
* $LNC#21906-3 "Regional lymph nodes.clinical [Class] Cancer"
* $LNC#21907-1 "Distant metastases.clinical [Class] Cancer"

//TNM Example
Instance: example-tnm-category-observation
Expand Down Expand Up @@ -54,13 +45,6 @@ Description: "Profiles the category of a BodyStructure resource in the context o
* focus 1..1 MS
* focus only Reference(BodyStructure)

// RECIST Categories Valueset
ValueSet: VS_RECIST_Category_Observation
Id: vs-recsit-category-observation
Title: "Valueset for Categories of a BodyStructure in the context of one RECIST procedure"
Description: "TODO"
* ^url = "https://www.vision-zero-oncology.de/fhir/ValueSet/vs-recsit-category-observation"
* $SCT#103337004 "In partial remission" //TODO

//RECIST Example
Instance: example-recist-category-observation
Expand All @@ -75,3 +59,4 @@ Title: "Example of a RECIST Tumor Category Observation"
* focus = Reference(BodyStructure/exampleBodyStructure)



22 changes: 3 additions & 19 deletions input/fsh/RadiologicalDiagnosticReport.fsh
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
Alias: $LNC = http://loinc.org
Alias: $SCT = http://snomed.info/sct
Alias: $DSS = http://terminology.hl7.org/CodeSystem/v2-0074

//Profile for a Radiological Diagnostic Report
Profile: Radiological_Diagnostic_Report
Parent: DiagnosticReport
Expand All @@ -25,24 +21,12 @@ Description: "Profile for the base definition of all radiological diagnostic rep
* code.coding 1..*
* subject 1..1
* subject only Reference(Patient)
* extension 1..*
* extension 0..*
* extension contains Supporting_Info named supportingInfo 0..* MS
* extension[supportingInfo] ^definition = "Enables to reference a supporting info <Observation or Procedure>. It contains additional information not containt in results and was used/applied during the creation of the report e.g. intermediate Observation results like RECIST target sum or infiltrations used within TNM staging procedures."
* result 0..* MS
* imagingStudy 1..* MS
* imagingStudy 0..* MS
* specimen 0..0


//Supporting Info Extension. HL7 Extension for supporting info not used because of Reference restriction to Observation or Procedure
Extension: Supporting_Info
Id: supporting-info
Title: "Supporting Info"
Description: "Enables to reference a finding <Observation> the diagnostic report refers to"
* ^url = "https://www.vision-zero-oncology.de/fhir/StructureDefinition/supporting-info"
* value[x] 1..1
* value[x] only Reference(Observation or Procedure)


//Example of a Radiological Diagnostic Report
Instance: example-diagnostic-report
InstanceOf: radiological-diagnostic-report
Expand All @@ -57,4 +41,4 @@ Title: "Example Diagnostic Report"
* extension.url = "https://www.vision-zero-oncology.de/fhir/StructureDefinition/supportingInfo"
* extension.valueReference = Reference(Procedure/ExampleProcedure)
* result = Reference (ExampleResultObservation)
* imagingStudy = Reference (ExampleStudy)
* imagingStudy = Reference (ExampleStudy)
14 changes: 0 additions & 14 deletions input/fsh/RadiologicalProcedure.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,6 @@ Description: "This radiological procedure profile describes the radiological rea
* code 1..1
* code from VS_TNM_Radiological_Read_Procedures (required)

// TNM Procedures Valueset
ValueSet: VS_TNM_Radiological_Read_Procedures
Id: vs-tnm-radiological-read-procedure
Title: "Valueset for TNM Radiological Read Procedures"
Description: "This Valueset contains the snomed codes of the different TNM tumor staging systems"
* ^url = "https://www.vision-zero-oncology.de/fhir/ValueSet/vs-tnm-radiological-read-procedure"
* include codes from system $SCT where concept descendent-of #254293002

//TNM Example
Instance: example-radiological-tnm-read-procedure
Expand All @@ -56,13 +49,6 @@ Description: "This radiological procedure profile describes the radiological rea
* code 1..1
* code from VS_RECIST_Radiological_Read_Procedures (required) //TODO: Fixed Code or Value Set?

// RECIST Procedures Valueset
ValueSet: VS_RECIST_Radiological_Read_Procedures
Id: vs-recist-radiological-read-procedure
Title: "Valueset for RECIST Radiological Read Procedures"
Description: "TODO"
* ^url = "https://www.vision-zero-oncology.de/fhir/ValueSet/vs_recist_radiological_read_procedure"
* $SCT#103337004 "In partial remission" //TODO value set contains differern available RECIST versions (TODO start with current versions?)

//RECIST Example
Instance: example-radiological-recist-read-procedure
Expand Down
8 changes: 8 additions & 0 deletions input/fsh/SupportingInfoExtension.fsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//Supporting Info Extension. HL7 Extension for supporting info not used because of Reference restriction to Observation or Procedure
Extension: Supporting_Info
Id: supportingInfo
Title: "Supporting Info"
Description: "Enables to reference a supporting info <Observation or Procedure>. It contains additional information not containt in results and was used/applied during the creation of the report e.g. intermediate Observation results like RECIST target sum or infiltrations used within TNM staging procedures."
* ^url = "https://www.vision-zero-oncology.de/fhir/StructureDefinition/supportingInfo"
* value[x] 1..1
* value[x] only Reference(Observation or Procedure)
5 changes: 4 additions & 1 deletion input/fsh/aliases.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Alias: $DSS = http://terminology.hl7.org/CodeSystem/v2-0074
// Core Extensions
// Alias: $WorkFlowEpisodeOfCare = http://hl7.org/fhir/StructureDefinition/workflow-episodeOfCare


//TNM related
Alias: $UICC-TNM = urn:oid:2.16.840.1.113883.15.16

Expand All @@ -40,10 +41,12 @@ Alias: $UICC-TNM = urn:oid:2.16.840.1.113883.15.16
// Alias: $Seitenlokalisation = http://fhir.de/StructureDefinition/seitenlokalisation
// Alias: $UICCCS = http://fhir.de/onkologie/CodeSystem/UICCCS
Alias: $ICD10SeitenlokalisationCS = https://fhir.kbv.de/CodeSystem/KBV_CS_SFHIR_ICD_SEITENLOKALISATION
Alias: $SupportingInfo = http://hl7.org/fhir/StructureDefinition/workflow-supportingInfo

// HL7 DE
Alias: $ICDO3T = http://fhir.de/onkologie/ValueSet/icd-o-3-topologie
Alias: $ICDO3M = http://fhir.de/onkologie/ValueSet/icd-o-3-morphologie
Alias: $DSS = http://terminology.hl7.org/CodeSystem/v2-0074

//ISIK
Alias: $IsikDiagnose = https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKDiagnose
Expand All @@ -57,4 +60,4 @@ Alias: $DiagnosesicherungVS = https://www.vision-zero-oncology.de/fhir/ValueSet/
Alias: $DiagnosesicherungCS = https://www.vision-zero-oncology.de/fhir/CodeSystem/cs-diagnosesicherung-icdo3
Alias: $RadReadProc = https://www.vision-zero-oncology.de/fhir/StructureDefinition/radiological-read-procedure
Alias: $RadTnmReadProc = https://www.vision-zero-oncology.de/fhir/StructureDefinition/radiological-tnm-read-procedure
Alias: $RadRecistReadProc = https://www.vision-zero-oncology.de/fhir/StructureDefinition/radiological-recist-read-procedure
Alias: $RadRecistReadProc = https://www.vision-zero-oncology.de/fhir/StructureDefinition/radiological-recist-read-procedure
37 changes: 37 additions & 0 deletions input/fsh/valueSets.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -434,3 +434,40 @@ Title: "ValueSet Tumor Size Units"
Description: "Acceptable units for measuring tumor size"
* $UCUM#mm "Millimeter"
* $UCUM#cm "Centimeter"


// TNM Procedures Valueset
ValueSet: VS_TNM_Radiological_Read_Procedures
Id: vs-tnm-radiological-read-procedure
Title: "Valueset for TNM Radiological Read Procedures"
Description: "This Valueset contains the snomed codes of the different TNM tumor staging systems"
* ^url = "https://www.vision-zero-oncology.de/fhir/ValueSet/vs-tnm-radiological-read-procedure"
* include codes from system $SCT where concept descendent-of #254293002


// RECIST Procedures Valueset
ValueSet: VS_RECIST_Radiological_Read_Procedures
Id: vs-recist-radiological-read-procedure
Title: "Valueset for RECIST Radiological Read Procedures"
Description: "TODO"
* ^url = "https://www.vision-zero-oncology.de/fhir/ValueSet/vs_recist_radiological_read_procedure"
* $SCT#103337004 "In partial remission" //TODO value set contains differern available RECIST versions (TODO start with current versions?)


// TNM Categories Valueset
ValueSet: VS_TNM_Category_Observation
Id: vs-tnm-category-observation
Title: "Valueset for Categories of a BodyStructure in the context of one TNM procedure"
Description: "This Valueset contains the coded for the different categories for BodyStructures in the context of TNM (Tumor|Node|Metastase)"
* ^url = "https://www.vision-zero-oncology.de/fhir/ValueSet/vs-tnm-category-observation"
* $LNC#21905-5 "Primary tumor.clinical [Class] Cancer"
* $LNC#21906-3 "Regional lymph nodes.clinical [Class] Cancer"
* $LNC#21907-1 "Distant metastases.clinical [Class] Cancer"

// RECIST Categories Valueset
ValueSet: VS_RECIST_Category_Observation
Id: vs-recsit-category-observation
Title: "Valueset for Categories of a BodyStructure in the context of one RECIST procedure"
Description: "TODO"
* ^url = "https://www.vision-zero-oncology.de/fhir/ValueSet/vs-recsit-category-observation"
* $SCT#103337004 "In partial remission" //TODO