feat: unified observation, removed lab value

input/fsh/eligibility-criteria/aliases-criteria-categories.fsh

@@ -6,7 +6,6 @@ Alias: $vs-episode-of-care-type = vs-episode-of-care-type
 Alias: $vs-radiologic-finding-sct = vs-radiologic-finding-sct
 Alias: $vs-ventilation-observable-loinc = https://medizininformatik-initiative.de/fhir/ext/modul-icu/ValueSet/Code-Observation-Beatmung-LOINC
 Alias: $vs-ventilation-observable-sct = vs-ventilation-observable-sct
-Alias: $vs-laboratory-observation-loinc = vs-laboratory-observations
 Alias: $vs-procedures-sct = http://hl7.org/fhir/ValueSet/procedure-code
 Alias: $vs-devices = http://hl7.org/fhir/ValueSet/device-type
 

input/fsh/eligibility-criteria/p-eligibility-criteria.fsh

@@ -24,7 +24,6 @@ RuleSet: characteristic-definition
   allergy 0..* and
   radiologyFinding 0..* and
   episodeOfCare 0..* and
-  laboratory 0..* and
   ventilationObservableSCT 0..* and
   ventilationObservableLOINC 0..* and
   procedure 0..* and
@@ -49,9 +48,6 @@ RuleSet: characteristic-definition
   * type = $loinc#78030-4 "Episode of care Type"
   //* value[x] only CodeableConcept // 22-07-22 @glichtner: removed due to sushi error
   * valueCodeableConcept from $vs-episode-of-care-type (required)
-* characteristic[laboratory].definitionByTypeAndValue
-  * type from $vs-laboratory-observation-loinc (required)
-  //* value[x] only Range or Quantity // 22-07-22 @glichtner: removed due to sushi error
 * characteristic[ventilationObservableSCT].definitionByTypeAndValue
   * type from $vs-ventilation-observable-sct (required)
   //* value[x] only Range or Quantity // 22-07-22 @glichtner: removed due to sushi error
@@ -70,5 +66,5 @@ RuleSet: characteristic-definition
   //* value[x] only CodeableConcept // 22-07-22 @glichtner: removed due to sushi error
   * valueCodeableConcept from $vs-devices (required)
 * characteristic[observation].definitionByTypeAndValue
-  * type from vs-observations-sct (required)
+  * type from vs-observations (required)
   //* value[x] only Range or Quantity // 22-07-22 @glichtner: removed due to sushi error

input/fsh/eligibility-criteria/vs-laboratory-observations.fsh → input/fsh/eligibility-criteria/vs-observation.fsh

@@ -1,10 +1,11 @@
 // Author: Gregor Lichtner, @glichtner
-ValueSet: LaboratoryObservations
-Id: vs-laboratory-observations
-Title: "Laboratory Observations"
-Description: "Most important"
-* insert metadata(2022-11-29, #draft, 0.1.0)
+ValueSet: Observations
+Id: vs-observations
+Title: "Observations"
+Description: "Observations are measurements of a patient's state of health. They are typically made by a healthcare professional, but can also be self-reported by the patient."
+* insert metadata(2024-05-14, #draft, 0.1.1)
 * insert cpg-computable-valueset
+* include codes from system $sct where concept is-a #363787002 "Observable entity (observable entity)"
 // compare http://hl7.org/fhir/loinc.html#props
 // CLASSTYPE: 1=Laboratory class; 2=Clinical class; 3=Claims attachments; 4=Surveys
 // ORDER_OBS: Provides users with an idea of the intended use of the term by categorizing it as an order only, observation only, or both

input/includes/categories-population.md

@@ -14,7 +14,7 @@ The categories are defined as slices of the `characteristic` element in the resp
 | Allergy | allergy | SCT [609328004 "Allergic disposition (finding)](https://browser.ihtsdotools.org/?perspective=full&conceptId1=609328004&edition=MAIN/2022-04-30&release=&languages=en)" | SCT *is-a* [609328004 "Allergic disposition (finding)](https://browser.ihtsdotools.org/?perspective=full&conceptId1=609328004&edition=MAIN/2022-04-30&release=&languages=en)" | ❌ |
 | Radiology Finding | radiologyFinding | SCT [118247008 "Radiologic finding (finding)](https://browser.ihtsdotools.org/?perspective=full&conceptId1=118247008&edition=MAIN/2022-04-30&release=&languages=en)" | SCT *is-a* [118247008 "Radiologic finding (finding)](https://browser.ihtsdotools.org/?perspective=full&conceptId1=118247008&edition=MAIN/2022-04-30&release=&languages=en)" | ❌ |
 | Episode of Care | episodeOfCare | LOINC [78030-4 "Episode of care Type](https://loinc.org/78030-4/)" | from `<http://fhir.de/CodeSystem/kontaktart-de>` | ❌ |
-| Lab Value | laboratory | from <http://loinc.org/vs/top-2000-lab-observations-si> | ❌ | ✔️ |
+| Observation / Lab Value | observation | SCT *is-a* `363787002 "Observable entity (observable entity)` or LOINC Laboratory Class | ❌ | ✔️ |
 | Ventilation | ventilationObservableSNOMED | from vs-ventilation-observable-sct (preferred)SCT *is-a* [364698001 "Ventilator observable (observable entity)"](https://browser.ihtsdotools.org/?perspective=full&conceptId1=364698001&edition=MAIN/2022-04-30&release=&languages=en) | ❌ | ✔️ |
 | Ventilation | ventilationObservableLOINC | from [MII\_Code\_Observation\_Beatmung\_LOINC](https://simplifier.net/medizininformatikinitiative-modul-intensivmedizin/valueset-code-observation-beatmung-loinc) | ❌ | ✔️ |
 | Procedure | procedure | SCT [71388002 "Procedure (procedure)](https://browser.ihtsdotools.org/?perspective=full&conceptId1=71388002&edition=MAIN/2022-05-31&release=&languages=en)" | from `<http://hl7.org/fhir/ValueSet/procedure-code>` | ❌ |