Feat/rerf v1

gdcdictionary/schemas/aliquot.yaml

@@ -3,9 +3,8 @@ $schema: "http://json-schema.org/draft-04/schema#"
 id: "aliquot"
 title: Aliquot
 type: object
-nodeTerms: null
 namespace: https://rerf.datacommons.org/
-category: biospecimen
+category: clinical
 program: '*'
 project: '*'
 description: A portion taken from a sample used for analysis, including analytes extracted
@@ -24,7 +23,7 @@ systemProperties:
 links:
   - name: samples
     backref: aliquots
-    label: derived_from
+    label: taken_from
     target_type: sample
     multiplicity: many_to_many
     required: true
@@ -33,6 +32,7 @@ required:
   - submitter_id
   - type
   - samples
+  - sysid
 
 uniqueKeys:
   - [id]
@@ -122,5 +122,9 @@ properties:
       and/or stored.
     type: number
 
+  sysid:
+    description: Unique subject identifier
+    type: integer
+
   samples:
     $ref: "_definitions.yaml#/to_many"

gdcdictionary/schemas/birth.yaml

@@ -3,12 +3,11 @@ $schema: "http://json-schema.org/draft-04/schema#"
 id: "birth"
 title: Births
 type: object
-nodeTerms: null
 namespace: https://rerf.datacommons.org/
 category: clinical
 program: '*'
 project: '*'
-description: Birth date data.
+description: Birth data from multiple sources
 additionalProperties: false
 submittable: true
 validators: null
@@ -32,6 +31,7 @@ required:
   - submitter_id
   - type
   - subjects
+  - sysid
 
 uniqueKeys:
   - [id]
@@ -41,29 +41,62 @@ properties:
 
   $ref: "_definitions.yaml#/ubiquitous_properties"
 
-  bdy:
-    description: Birth day. From RERF 'births' table.
-    type: integer
-
   birth_dt:
-    description: Birth date (DDmonYYYY, e.g., 21dec1912). From RERF 'births' table.
+    description: Date of birth
+    type: string
+    pattern: "^[0-9]{1,2}\\/[0-9]{1,2}\\/[0-9]{4}$"
+
+  birth_updt:
+    description: Last update of subject's birth records
     type: string
+    pattern: "^[0-9]{1,2}\\/[0-9]{1,2}\\/[0-9]{4}$"
 
-  bmo:
-    description: Birth month. From RERF 'births' table.
+  sysid:
+    description: Globally unique identifier for subject
     type: integer
 
-  byr:
-    description: Birth year. From RERF 'births' table.
+  birth_ind:
+    description: Indicator of quality of birth data (1 - best information)
+    enum:
+      - 0 - Not use
+      - 1 - use
+
+  birth_source:
+    description: Source of the information of subject's birth (ex. Birth certificate,
+      etc.)
+    enum:
+      - 60 - 1960 census
+      - AH - Adult Health Study
+      - BR - Birth record
+      - CN - Contact Card
+      - CR - Cross Index
+      - DE - Death Certification
+      - FU - Fuhyo
+      - G3 - Genetic study (GE-3)
+      - JS - Residence registry inquiry (regional cancer registry)
+      - KO - Koseki
+      - MC - Master File Code
+      - MF - Master File record
+      - MO - Mortality
+      - MQ - Master Sample Questionnaire
+      - OT - Other
+      - SK - Death certificate (regional cancer registry)
+      - TE - Hibakusha Techo
+      - TI - Tissue Registry Data Base
+      - TR - Tumor Registry Data Base
+      - YU - Mail Survey
+
+  birth_dt_year:
+    description: Year of birth
     type: integer
 
-  ind:
-    description: Birthdate information can come from multiple sources.  ind=1 indicates the "best" source of information. From RERF 'births' table.
+  birth_dt_month:
+    description: Month of birth
     type: integer
 
-  source:
-    description: Source (KO or MF).  The source of the birthdate information. From RERF 'births' table.
-    type: string
+  birth_dt_day:
+    description: Day of birth
+    type: integer
 
   subjects:
     $ref: "_definitions.yaml#/to_one"