Merge pull request #25 from CBIIT/survival_node

Update c3dc-model.yml

model-desc/c3dc-model-props.yml

@@ -1332,58 +1332,6 @@ PropDefinitions:
     Type: integer
     Req: false
     Private: false  
-  #event
-  event_id:
-    Desc: A unique identifier for an event
-    Term:
-      - Origin: caDSR
-        Code: '2534569'
-        Value: Additional Finding Identifier
-    Type: string
-    Req: true
-    Private: false
-    Key: true
-  #event
-  event_category:
-    Desc: Event category
-    Term:
-      - Origin: caDSR
-        Code: '7197400'
-        Value: A grouping of topic-variable values based on sponsor defined characteristics.
-    Type:
-      value_type: list
-      Enum:
-        - "Adverse Event"
-        - "Last Known Disease Status"
-        - "Comorbidity"
-        - "Disease Event"
-        - "Disease Response"
-        - "Other"
-    Req: true
-    Private: false
-    Key: false
-  #event
-  event_detail:
-    Desc: Event details or values or results
-    Term:
-      - Origin: caDSR
-        Code: '6642370'
-        Value: Result or Finding Original Result
-    Type: string
-    Req: true
-    Private: false
-    Key: false
-  #event
-  age_at_event:
-    Desc: Participant age at event
-    Term:
-      - Origin: caDSR
-        Code: '6412753'
-        Value: Age
-    Type: string
-    Req: true
-    Private: false
-    Key: false
   #reference_file
   reference_file_id: 
     Desc: A unique identifier for a clinical measure file.
@@ -2311,3 +2259,78 @@ PropDefinitions:
     Type: string
     Req: true
     Private: false
+  survival_id:
+    Desc: A unique sequence of alphanumeric characters used to identify the survival event in the investigation or study.
+    Term:
+      - Origin: caDSR
+        Code: '14534325'
+        Value: CCDI Accession Number Identifier
+    Type: string
+    Req: true
+    Private: false
+    Key: true
+  last_known_survival_status:
+    Desc: Individual's vital status, indicating whether they are currently alive, deceased, or if their status remains unknown or unspecified.
+    Term:
+      - Origin: caDSR
+        Code: '2847330'
+        Value: Participant Vital Status Type
+    Type:
+      value_type: list
+      Enum:
+        - "Alive"
+        - "Dead"
+        - "Not Reported"
+        - "Unknown"
+    Req: true
+    Private: false
+  age_at_last_known_survival_status:
+    Desc: The age (in days) when the last known survival status of the subject was captured.
+    Term:
+      - Origin: caDSR
+        Code: '12305768'
+        Value: Subject Age at Last Known Survival Status Day Count
+    Type: integer
+    Req: true
+    Private: false
+  event_free_survival_status:
+    Desc: Identify the nature of the event that best characterizes the endpoint of the study.
+    Term:
+      - Origin: caDSR
+        Code: '3070936'
+        Value: Study End Point Event Type
+    Type:
+      value_type: list
+      Enum:
+        - "Censored"
+        - "Not Censored"
+        - "Not Reported"
+        - "Unknown"
+    Req: true
+    Private: false
+  age_at_event_free_survival_status:
+    Desc: Time from diagnosis to first event (or censoring), in days.
+    Term:
+      - Origin: caDSR
+        Code: '3229334'
+        Value: Study End Point Event Occurrence Day Count
+    Type: integer
+    Req: false
+    Private: false
+  first_event:
+    Desc: Identify the nature of the event that best characterizes the endpoint of the study.
+    Term:
+      - Origin: caDSR
+        Code: '3070936'
+        Value: Study End Point Event Type
+    Type:
+      value_type: list
+      Enum:
+        - "Progression"
+        - "Relapse"
+        - "Second Malignant Neoplasm"
+        - "Death"
+        - "Not Reported"
+        - "Unknown"
+    Req: true
+    Private: false

model-desc/c3dc-model.yml

@@ -14,12 +14,6 @@ Nodes:
       - tumor_stage_clinical_t
       - tumor_stage_clinical_n
       - tumor_stage_clinical_m
-  event:
-    Props:
-      - event_id
-      - event_category
-      - event_detail
-      - age_at_event
   participant:
     Props:
       - participant_id
@@ -58,6 +52,14 @@ Nodes:
       - consent
       - consent_number
       - external_url
+  survival:
+    Props:
+      - survival_id
+      - last_known_survival_status
+      - age_at_last_known_survival_status
+      - event_free_survival_status
+      - age_at_event_free_survival_status
+      - first_event
   reference_file: 
     Props:
       - reference_file_id