Nur noch eine Aenderung von Gregor Abwarten

umg-minai · Aug 23, 2024 · d4fd4d6 · d4fd4d6
1 parent 7e31e52
commit d4fd4d6
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 38 deletions.
diff --git a/input/fsh/CLL/recommendation-CLL-3-11/Intervention-a.fsh b/input/fsh/CLL/recommendation-CLL-3-11/Intervention-a.fsh
@@ -119,11 +119,8 @@ Description: "Anamnese bei CLL Patienten"
 * status = #active
 * description = "Anamnese bei CLL Patienten"
 * code = $sct#84100007 "History taking"
-/* insert rs-timingCLL(1,4) */
-* extension[relativeTime].extension[contextCode].valueCodeableConcept = $loinc#63936-9 //TODO wieso funktioniert das so noch nicht?
-* extension[relativeTime].extension[offset].valueDuration = -4 'wk'
+* insert rs-timingCLL(4)
 
-/*
 Instance: PhysicalExaminationCLL
 InstanceOf: assessment-action    
 Usage: #definition
@@ -134,7 +131,7 @@ Description: "Körperliche Untersuchung bei CLL Patienten"
 * status = #active
 * description = "Körperliche Untersuchung bei CLL Patienten"
 * code = $sct#5880005 "Physical examination"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: ExaminationLymphaticNodesCLL
 InstanceOf: assessment-action    
@@ -146,7 +143,7 @@ Description: "vollständiger Erhebung des peripheren Lymphknotenstatus"
 * status = #active
 * description = "vollständiger Erhebung des peripheren Lymphknotenstatus"
 * code = $sct#284427004 "Examination of lymph nodes (procedure)"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: ExaminationSpleenSizeCLL
 InstanceOf: assessment-action  
@@ -158,7 +155,7 @@ Description: "Abschätzung der Milzgröße bei CLL"
 * status = #active
 * description = "Abschätzung der Milzgröße bei CLL"
 * code = $sct#47241002 "Palpation of spleen (procedure)"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: ExaminationLiverSizeCLL
 InstanceOf: assessment-action   
@@ -170,7 +167,7 @@ Description: "Abschätzung der Lebergröße bei CLL"
 * status = #active
 * description = "Abschätzung der Lebergröße bei CLL"
 * code = $sct#172488004 "Palpation of liver (procedure)"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: AbdomialUltrasonographyCLL
 InstanceOf: assessment-action   
@@ -182,7 +179,7 @@ Description: "Abdomensonographie bei CLL"
 * status = #active
 * description = "Abdomensonographie bei CLL"
 * code = $sct#45036003 "Ultrasonography of abdomen"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: AssessmentECOGScoreCLL
 InstanceOf: assessment-action    
@@ -194,7 +191,7 @@ Description: "Assesment of the ECOG Score CLL"
 * status = #active
 * description = "Assesment of the ECOG Score CLL"
 * code = $sct#423740007 "ECOG performance status"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: AssessmentKarnofskyIndexCLL
 InstanceOf: assessment-action    
@@ -206,7 +203,7 @@ Description: "Assesment Karnofsky-Index CLL"
 * status = #active
 * description = "Assesment Karnofsky-Index CLL"
 * code = $sct#273546003 "Karnofsky performance status"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: AssessmentComorbiditiesCLL
 InstanceOf: assessment-action   
@@ -218,7 +215,7 @@ Description: "Assesment Comorbidities CLL"
 * status = #active
 * description = "Assesment Comorbidities CLL"
 * code = $sct#398192003 "Co-morbid conditions (finding)"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: CompleteBloodCountAutomatedCLL
 InstanceOf: assessment-action   
@@ -230,7 +227,7 @@ Description: "Maschinelles Differentialblutbild CLL"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#9564003 "Complete blood count with white cell differential, automated"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: MicroscopyWhiteBloodCellCountCLL
 InstanceOf: assessment-action    
@@ -242,7 +239,7 @@ Description: "Mikroskopisches Differentialblutbild"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#35774004 "Complete blood count with white cell differential, manual (procedure)"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: ClinicalChemistryTestCLL
 InstanceOf: assessment-action
@@ -254,7 +251,7 @@ Description: "Klinische Chemie"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#275711006 "Serum chemistry test (procedure)"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: HIVSerologyCLL
 InstanceOf: assessment-action    
@@ -266,7 +263,7 @@ Description: "HIV Serologie"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#171121004 "Human immunodeficiency virus screening (procedure)"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: HBVSerologyCLL
 InstanceOf: assessment-action    
@@ -278,7 +275,7 @@ Description: "HBV Serologie"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#171122006 "Hepatitis B screening (procedure)"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: HCVSerologyCLL
 InstanceOf: assessment-action   
@@ -290,7 +287,7 @@ Description: "HCV Serologie"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#413107006 "Hepatitis C screening (procedure)"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: HEVSerologyCLL
 InstanceOf: assessment-action   
@@ -302,7 +299,7 @@ Description: "HEV Serologie"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#36446003 "Hepatitis E virus measurement (procedure)"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: BinetStagingCLL
 InstanceOf: assessment-action    
@@ -314,7 +311,7 @@ Description: "Bestimmung des aktuellen klinischen Stadiums (Binet Staging) CLL"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#1149099005 "Binet staging classification for chronic lymphocytic leukemia"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: PregnancyTestbHCGCLL
 InstanceOf: assessment-action   
@@ -326,7 +323,7 @@ Description: "Pregnancy Test betaHCG CLL"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#44789311 "Pregnancy test (beta human chorionic gonadotropin) (procedure)"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 
 
@@ -340,7 +337,7 @@ Description: "CMV IgG Antikörper Bestimmung"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#64681000237105 "CMV (cytomegalovirus) IgG antibody in serum qualitative result"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: CMVAntibodyIgMCLL
 InstanceOf: assessment-action   
@@ -352,7 +349,7 @@ Description: "CMV IgM Antikörper Bestimmung"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#62681000237103 "CMV (cytomegalovirus) IgM antibody in serum qualitative result"
-* insert rs-timingCLL(1,4)
+* insert rs-timingCLL(4)
 
 Instance: CMVPCRCLL
 InstanceOf: assessment-action   
@@ -367,5 +364,4 @@ Description: "CMV PCR Viruslast Bestimmung"
 * timingTiming.repeat
   * frequency = 1
   * period = 2 
-  * periodUnit = $ucum#wk "week" 
-*/
+  * periodUnit = $ucum#wk "week" 
diff --git a/input/fsh/CLL/recommendation-CLL-4-1/population-a.fsh b/input/fsh/CLL/recommendation-CLL-4-1/population-a.fsh
@@ -140,16 +140,14 @@ Description: "Population, bei der Binet A oder B sowie eine bestimmte klinische
         * definitionByTypeAndValue
           * type  = $sct#404684003 "Clinical finding (finding)"
           * valueCodeableConcept = $sct#30746006 "Lymphadenopathy"  
-          //TODO: valueCodeableConcept.text - ist nicht definiert in FHIR.
-    /* characteristic[observation][+]  
+    * characteristic[observation][+]  
       * linkId = "CLL"
       * definitionByTypeAndValue
         * type = $loinc#26515-7 "Lymphocytes [#/volume] in Blood"
-        * valueCodeableConcept.text = "Zunahme mehr als 50 Prozent innerhalb von 2 Monaten, gemessen ab einer absoluten Lymphozytenzahl von mindestens 30.000/µl"
-    
+        * valueCodeableConcept = $cs-cll#ingrfiftyintwomo "Zunahme mehr als 50 Prozent innerhalb von 2 Monaten, gemessen ab einer absoluten Lymphozytenzahl von mindestens 30.000/µl"
     * characteristic[observation][+] 
       * linkId = "CLL"
       * definitionByTypeAndValue
         * type = $loinc#26515-7 "Lymphocytes [#/volume] in Blood"
-        * valueCodeableConcept.text = "Lymphozytenverdopplungszeit unter 6 Monaten, gemessen ab einer absoluten Lymphozytenzahl von mindestens 30.000/µl"
-        */
+        * valueCodeableConcept = $cs-cll#dopeunsixmo "Lymphozytenverdopplungszeit unter 6 Monaten, gemessen ab einer absoluten Lymphozytenzahl von mindestens 30.000/µl"
+
diff --git a/input/fsh/cs-cll.fsh b/input/fsh/cs-cll.fsh
@@ -1,5 +1,5 @@
 // the use of an alias is a workaround for an error otherwise thrown in sushi 3.0.0
-Alias: $cs-cll = https://www.netzwerk-universitaetsmedizin.de/fhir/codex-celida/CodeSystem/codex-celida //TODO - welche Adresse?
+Alias: $cs-cll = https://www.netzwerk-universitaetsmedizin.de/fhir/codex-celida/CodeSystem/codex-celida //TODO - welche Adresse? entweder Greifswald oder die CLLs haben eine Host URL
 
 CodeSystem: CLL_V2
 Id: cll-v2
@@ -11,4 +11,6 @@ Description: "Concepts required in recommendations that are not defined elsewher
 * #scllt    "Systemic CLL therapy"
 * #porecotr "Poor response to corticosteroid treatment"
 * #sycasp   "Symptom-causing splenomegaly"
-* #cllrete  "CLL Relapse therapy"
+* #cllrete  "CLL Relapse therapy"
+* #ingrfiftyintwomo "Zunahme mehr als 50 Prozent innerhalb von 2 Monaten, gemessen ab einer absoluten Lymphozytenzahl von mindestens 30.000/µl"
+* #dopeunsixmo "Lymphozytenverdopplungszeit unter 6 Monaten, gemessen ab einer absoluten Lymphozytenzahl von mindestens 30.000/µl"
diff --git a/input/fsh/rs-timingCLL.fsh b/input/fsh/rs-timingCLL.fsh
@@ -1,5 +1,5 @@
 // Author: Viktor Bublitz @bublitzv
-RuleSet: rs-timingCLL(count,period) //TODO ich hab das hier als Vorschlag, wenn inordnung: bei allen assessment actions umsetzen  :)
-/* .repeat.periodUnit = $ucum#wk "week" */
-* timing[extension].extension[relativeTime].extension[contextCode].valueCodeableConcept = $loinc#63936-9
-* timing.extension[relativeTime].extension[offset].valueDuration = -{period} 'wk'
+RuleSet: rs-timingCLL(period) //TODO ich hab das hier als Vorschlag, wenn inordnung: bei allen assessment actions umsetzen  :)
+* extension[relativeTime].extension[contextCode].valueCodeableConcept = $loinc#63936-9 //TODO wieso funktioniert das so noch nicht?!?
+* extension[relativeTime].extension[offset].valueRange.low = -{period} 'wk'
+* extension[relativeTime].extension[offset].valueRange.high = -0 'wk'
diff --git a/sushi-config.yaml b/sushi-config.yaml
@@ -16,7 +16,7 @@ instanceOptions:
 
 dependencies:
   de.netzwerk-universitaetsmedizin.ebm-cpg:  
-    version: 0.9.1
+    version: 1.0.0
 
 pages:
   index.md: