From 6bef6cb7ca60054a36824d255a1606ad15a643a2 Mon Sep 17 00:00:00 2001 From: Justin Dorsheimer <66982778+jdorsheimer@users.noreply.github.com> Date: Fri, 10 Jan 2025 10:54:58 -0700 Subject: [PATCH 1/2] Fixed linking of subject to study and updated namespace to PDP production url --- gdcdictionary/schemas/aligned_reads_file.yaml | 2 +- .../schemas/aligned_reads_index_file.yaml | 2 +- gdcdictionary/schemas/aliquot.yaml | 2 +- gdcdictionary/schemas/clinical_file.yaml | 2 +- gdcdictionary/schemas/condition.yaml | 28 +++++++++---------- .../schemas/core_metadata_collection.yaml | 2 +- gdcdictionary/schemas/dataset.yaml | 2 +- gdcdictionary/schemas/device_exposure.yaml | 4 +-- gdcdictionary/schemas/drug_exposure.yaml | 7 ++--- gdcdictionary/schemas/exposure.yaml | 2 +- gdcdictionary/schemas/image_annotation.yaml | 2 +- gdcdictionary/schemas/image_file.yaml | 2 +- gdcdictionary/schemas/imaging_series.yaml | 6 +--- gdcdictionary/schemas/imaging_study.yaml | 6 ++-- gdcdictionary/schemas/measurement.yaml | 18 ++++++------ gdcdictionary/schemas/metabolomic.yaml | 2 +- gdcdictionary/schemas/observation.yaml | 18 ++++++------ gdcdictionary/schemas/payer_plan_period.yaml | 9 ++---- gdcdictionary/schemas/procedure.yaml | 9 +++--- gdcdictionary/schemas/read_group.yaml | 2 +- gdcdictionary/schemas/sample.yaml | 8 +++--- gdcdictionary/schemas/study.yaml | 2 +- gdcdictionary/schemas/subject.yaml | 6 +++- .../schemas/unaligned_reads_file.yaml | 2 +- gdcdictionary/schemas/variant_call_file.yaml | 2 +- gdcdictionary/schemas/visit.yaml | 10 +++---- 26 files changed, 75 insertions(+), 82 deletions(-) diff --git a/gdcdictionary/schemas/aligned_reads_file.yaml b/gdcdictionary/schemas/aligned_reads_file.yaml index 1974d58..8c254ce 100644 --- a/gdcdictionary/schemas/aligned_reads_file.yaml +++ b/gdcdictionary/schemas/aligned_reads_file.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "aligned_reads_file" title: Aligned Reads File type: object -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: data_file program: '*' project: '*' diff --git a/gdcdictionary/schemas/aligned_reads_index_file.yaml b/gdcdictionary/schemas/aligned_reads_index_file.yaml index 8c03d0a..9f47690 100644 --- a/gdcdictionary/schemas/aligned_reads_index_file.yaml +++ b/gdcdictionary/schemas/aligned_reads_index_file.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "aligned_reads_index_file" title: Aligned Reads Index File type: object -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: data_file program: '*' project: '*' diff --git a/gdcdictionary/schemas/aliquot.yaml b/gdcdictionary/schemas/aliquot.yaml index 440b065..a4714c2 100644 --- a/gdcdictionary/schemas/aliquot.yaml +++ b/gdcdictionary/schemas/aliquot.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "aliquot" title: Aliquot type: object -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: biospecimen program: '*' project: '*' diff --git a/gdcdictionary/schemas/clinical_file.yaml b/gdcdictionary/schemas/clinical_file.yaml index 8bfa79b..5d3cca5 100644 --- a/gdcdictionary/schemas/clinical_file.yaml +++ b/gdcdictionary/schemas/clinical_file.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "clinical_file" title: Clinical File type: object -namespace: https://data.midrc.org +namespace: https://prometheus.data-commons.org/ category: data_file program: '*' project: '*' diff --git a/gdcdictionary/schemas/condition.yaml b/gdcdictionary/schemas/condition.yaml index 4e0347f..b7db8f5 100644 --- a/gdcdictionary/schemas/condition.yaml +++ b/gdcdictionary/schemas/condition.yaml @@ -4,7 +4,7 @@ id: "condition" title: Condition type: object nodeTerms: null -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: clinical program: '*' project: '*' @@ -70,16 +70,16 @@ properties: description: The code for a specific codition, assigned by the code system. type: string - condition_concept_id: - description: The CONDITION_CONCEPT_ID field is recommended for primary use in analyses, and must be used for network studies. This is the standard concept mapped from the source value which represents a condition The CONCEPT_ID that the CONDITION_SOURCE_VALUE maps to. Only records whose source values map to concepts with a domain of “Condition” should go in this table. Accepted Concepts. + condition_concept_id: + description: The CONDITION_CONCEPT_ID field is recommended for primary use in analyses, and must be used for network studies. This is the standard concept mapped from the source value which represents a condition The CONCEPT_ID that the CONDITION_SOURCE_VALUE maps to. Only records whose source values map to concepts with a domain of “Condition” should go in this table. Accepted Concepts. type: string - condition_source_concept_id: - description: This is the concept representing the condition source value and may not necessarily be standard. This field is discouraged from use in analysis because it is not required to contain Standard Concepts that are used across the OHDSI community, and should only be used when Standard Concepts do not adequately represent the source detail for the Condition necessary for a given analytic use case. Consider using CONDITION_CONCEPT_ID instead to enable standardized analytics that can be consistent across the network. If the CONDITION_SOURCE_VALUE is coded in the source data using an OMOP supported vocabulary put the concept id representing the source value here. + condition_source_concept_id: + description: This is the concept representing the condition source value and may not necessarily be standard. This field is discouraged from use in analysis because it is not required to contain Standard Concepts that are used across the OHDSI community, and should only be used when Standard Concepts do not adequately represent the source detail for the Condition necessary for a given analytic use case. Consider using CONDITION_CONCEPT_ID instead to enable standardized analytics that can be consistent across the network. If the CONDITION_SOURCE_VALUE is coded in the source data using an OMOP supported vocabulary put the concept id representing the source value here. type: string - condition_source_value: - description: This field houses the verbatim value from the source data representing the condition that occurred. For example, this could be an ICD10 or Read code. This code is mapped to a Standard Condition Concept in the Standardized Vocabularies and the original code is stored here for reference. + condition_source_value: + description: This field houses the verbatim value from the source data representing the condition that occurred. For example, this could be an ICD10 or Read code. This code is mapped to a Standard Condition Concept in the Standardized Vocabularies and the original code is stored here for reference. type: string condition_code_system: @@ -110,19 +110,19 @@ properties: description: The number of days from the index date to the date the subject was diagnosed with or began experiencing the condition. type: integer - provider_id: + provider_id: description: The provider associated with condition record, e.g. the provider who made the diagnosis or the provider who recorded the symptom. The ETL may need to make a choice as to which PROVIDER_ID to put here. Based on what is available this may or may not be different than the provider associated with the overall VISIT_OCCURRENCE record, for example the admitting vs attending physician on an EHR record. type: string site_id: - description: The site ID. + description: The site ID. type: string - stop_reason: + stop_reason: description: The Stop Reason indicates why a Condition is no longer valid with respect to the purpose within the source data. Note that a Stop Reason does not necessarily imply that the condition is no longer occurring. This information is often not populated in source data and it is a valid etl choice to leave it blank if the information does not exist. type: string - visit_id: + visit_id: description: The visit ID. type: string @@ -272,7 +272,7 @@ properties: description: > age at measurement of cac_score (years) (HARMONIZED) type: number - + age_at_carotid_plaque: ### From BioData Catalyst "medical_history" node description: > age at measurement of carotid_plaque (years) (HARMONIZED) @@ -541,8 +541,8 @@ properties: description: > An indicator of whether a subject had a venous thromboembolism (VTE)event prior to the start of the medical review process (includingself-reported events). (HARMONIZED) type: boolean - - + + unit_vte_followup_start_age: ### From BioData Catalyst "medical_history" node description: > harmonization unit for vte_followup_start_age (A "harmonization unit" is a defined group of subjects whose phenotypes can be similarly processed.) (HARMONIZED) diff --git a/gdcdictionary/schemas/core_metadata_collection.yaml b/gdcdictionary/schemas/core_metadata_collection.yaml index 0bd2f31..dae56d4 100755 --- a/gdcdictionary/schemas/core_metadata_collection.yaml +++ b/gdcdictionary/schemas/core_metadata_collection.yaml @@ -4,7 +4,7 @@ id: "core_metadata_collection" title: Core Metadata Collection type: object nodeTerms: null -namespace: https://data.midrc.org +namespace: https://prometheus.data-commons.org/ category: administrative program: '*' project: '*' diff --git a/gdcdictionary/schemas/dataset.yaml b/gdcdictionary/schemas/dataset.yaml index 237b770..595ec96 100644 --- a/gdcdictionary/schemas/dataset.yaml +++ b/gdcdictionary/schemas/dataset.yaml @@ -4,7 +4,7 @@ id: "dataset" title: Dataset type: object nodeTerms: null -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: administrative program: '*' project: '*' diff --git a/gdcdictionary/schemas/device_exposure.yaml b/gdcdictionary/schemas/device_exposure.yaml index 4ae3f3d..e3bea83 100644 --- a/gdcdictionary/schemas/device_exposure.yaml +++ b/gdcdictionary/schemas/device_exposure.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "device_exposure" title: Device Exposure type: object -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: clinical program: '*' project: '*' @@ -74,7 +74,7 @@ properties: type: string site_id: - description: The site ID. + description: The site ID. type: string unique_device_id: diff --git a/gdcdictionary/schemas/drug_exposure.yaml b/gdcdictionary/schemas/drug_exposure.yaml index feb5603..2f5fcde 100644 --- a/gdcdictionary/schemas/drug_exposure.yaml +++ b/gdcdictionary/schemas/drug_exposure.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "drug_exposure" title: Drug Exposure type: object -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: clinical program: '*' project: '*' @@ -110,7 +110,7 @@ properties: quantity: description: The quantity of drug as recorded in the original prescription or dispensing record. type: number - + refills: description: The number of refills after the initial prescription. The initial prescription is not counted, values start with 0. type: integer @@ -177,11 +177,10 @@ properties: # unit_fasting_lipids: # description: Harmonization unit for fasting_lipids. A "harmonization unit" is a defined group of subjects whose phenotypes can be similarly processed. # type: string - + # unit_lipid_lowering_medication: # description: Harmonization unit for unit_lipid1c. A "harmonization unit" is a defined group of subjects whose phenotypes can be similarly processed. # type: string subjects: $ref: "_definitions.yaml#/to_one" - diff --git a/gdcdictionary/schemas/exposure.yaml b/gdcdictionary/schemas/exposure.yaml index 267bedf..2dea7aa 100644 --- a/gdcdictionary/schemas/exposure.yaml +++ b/gdcdictionary/schemas/exposure.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "exposure" title: Exposure type: object -namespace: http://dcp.bionimbus.org/ +namespace: https://prometheus.data-commons.org/ category: clinical program: '*' project: '*' diff --git a/gdcdictionary/schemas/image_annotation.yaml b/gdcdictionary/schemas/image_annotation.yaml index c48141c..6b91dd7 100644 --- a/gdcdictionary/schemas/image_annotation.yaml +++ b/gdcdictionary/schemas/image_annotation.yaml @@ -4,7 +4,7 @@ id: "image_annotation" title: Image Annotation type: object nodeTerms: null -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: data_file program: '*' project: '*' diff --git a/gdcdictionary/schemas/image_file.yaml b/gdcdictionary/schemas/image_file.yaml index 8ae51b5..739ed94 100644 --- a/gdcdictionary/schemas/image_file.yaml +++ b/gdcdictionary/schemas/image_file.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "image_file" title: Image File type: object -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: data_file program: '*' project: '*' diff --git a/gdcdictionary/schemas/imaging_series.yaml b/gdcdictionary/schemas/imaging_series.yaml index 2a90617..d4199e9 100644 --- a/gdcdictionary/schemas/imaging_series.yaml +++ b/gdcdictionary/schemas/imaging_series.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "imaging_series" title: Imaging Series type: object -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: medical_imaging program: '*' project: '*' @@ -167,7 +167,3 @@ properties: datasets: description: The submitter_id or id of the dataset this imaging_series belongs to, i.e., a link to a record in the parent node. $ref: "_definitions.yaml#/to_many" - - - - diff --git a/gdcdictionary/schemas/imaging_study.yaml b/gdcdictionary/schemas/imaging_study.yaml index eb25a36..f0b8f78 100644 --- a/gdcdictionary/schemas/imaging_study.yaml +++ b/gdcdictionary/schemas/imaging_study.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "imaging_study" title: Imaging Study type: object -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: medical_imaging program: '*' project: '*' @@ -85,7 +85,7 @@ properties: type: string PatientSex: # use subject.gender as source of truth, but this can store DICOM value - description: (0010,0040) the patient's sex; the biologic character or quality that distinguishes male and female from one another as expressed by analysis of the person's gonadal, morphologic (internal and external), chromosomal, and hormonal characteristics + description: (0010,0040) the patient's sex; the biologic character or quality that distinguishes male and female from one another as expressed by analysis of the person's gonadal, morphologic (internal and external), chromosomal, and hormonal characteristics type: string StudyDescription: @@ -102,4 +102,4 @@ properties: datasets: description: The submitter_id or id of the dataset this subject belongs to, i.e., a link to a record in the parent node. - $ref: "_definitions.yaml#/to_many" \ No newline at end of file + $ref: "_definitions.yaml#/to_many" diff --git a/gdcdictionary/schemas/measurement.yaml b/gdcdictionary/schemas/measurement.yaml index fec4a56..e962efe 100644 --- a/gdcdictionary/schemas/measurement.yaml +++ b/gdcdictionary/schemas/measurement.yaml @@ -4,7 +4,7 @@ id: "measurement" title: Measurement type: object nodeTerms: null -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: clinical program: '*' project: '*' @@ -78,7 +78,7 @@ properties: type: string site_id: - description: The care site ID. + description: The care site ID. type: string unit_concept_id: @@ -119,7 +119,7 @@ properties: description: > Resting systolic blood pressure from the upper arm in a clinical setting. (mmHg) type: number - + age_at_bp_systolic: # from BDC "blood_pressure_test" node description: > age at measurement of bp_systolic (years) @@ -192,7 +192,7 @@ properties: description: > age at measurement of hemoglobin_mcnc_bld. (years) (HARMONIZED) type: number - + age_at_hematocrit_vfr_bld: ### From BDC "lab_result" node description: > Measurement of hematocrit, the fraction of volume (vfr) of blood (bld) that is composed of red blood cells. (years) (HARMONIZED) @@ -332,7 +332,7 @@ properties: description: > Count by volume, or number concentration (ncnc), of platelets in the blood (bld). (thousands / microliter) (HARMONIZED) type: number - + pmv_entvol_bld: ### From BDC "lab_result" node description: > Measurement of the mean volume (entvol) of platelets in the blood (bld), known as mean platelet volume (MPV or PMV). (fL = femtoliter) (HARMONIZED) @@ -432,10 +432,10 @@ properties: description: > harmonization unit for rbc_ncnc_bld (A "harmonization unit" is a defined group of subjects whose phenotypes can be similarly processed.) (HARMONIZED) type: string - + unit_rdw_ratio_rbc: ### From BDC "lab_result" node description: > - harmonization unit for rdw_ratio_rbc (A "harmonization unit" is a defined group of subjects whose phenotypes can be similarly processed.) (HARMONIZED) + harmonization unit for rdw_ratio_rbc (A "harmonization unit" is a defined group of subjects whose phenotypes can be similarly processed.) (HARMONIZED) type: string unit_total_cholesterol: ### From BDC "lab_result" node @@ -543,7 +543,7 @@ properties: description: > Indicate the composition or type of biological sample used for the test (e.g., blood, urine, solid tissue, saliva, etc.) type: string - + test_type: ### From BloodPAC "diagnostic_test" node description: > The general type or category of the laboratory or diagnostic test. @@ -558,5 +558,3 @@ properties: description: > The numerical value representing the laboratory or diagnostic test measurement of the 'analyte_name'; also indicate the 'test_units'. type: number - - diff --git a/gdcdictionary/schemas/metabolomic.yaml b/gdcdictionary/schemas/metabolomic.yaml index 9c3a5dd..d12b977 100644 --- a/gdcdictionary/schemas/metabolomic.yaml +++ b/gdcdictionary/schemas/metabolomic.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "metabolomic" title: Metabolomic type: object -namespace: https://dcp.bionimbus.org/ +namespace: https://prometheus.data-commons.org/ category: biospecimen program: '*' project: '*' diff --git a/gdcdictionary/schemas/observation.yaml b/gdcdictionary/schemas/observation.yaml index 3ef62ec..fa51594 100644 --- a/gdcdictionary/schemas/observation.yaml +++ b/gdcdictionary/schemas/observation.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "observation" title: Observation type: object -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: clinical program: '*' project: '*' @@ -62,15 +62,15 @@ properties: observation_source_concept_id: description: This is the concept representing the OBSERVATION_SOURCE_VALUE and may not necessarily be standard. This field is discouraged from use in analysis because it is not required to contain Standard Concepts that are used across the OHDSI community, and should only be used when Standard Concepts do not adequately represent the source detail for the Observation necessary for a given analytic use case. Consider using OBSERVATION_CONCEPT_ID instead to enable standardized analytics that can be consistent across the network. If the OBSERVATION_SOURCE_VALUE is coded in the source data using an OMOP supported vocabulary put the concept id representing the source value here. type: string - + observation_source_value: description: This field houses the verbatim value from the source data representing the Observation that occurred. For example, this could be an ICD10 or Read code. This code is mapped to a Standard Concept in the Standardized Vocabularies and the original code is stored here for reference. type: string - + observation_type_concept_id: description: This field can be used to determine the provenance of the Observation record, as in whether the measurement was from an EHR system, insurance claim, registry, or other sources. Choose the OBSERVATION_TYPE_CONCEPT_ID that best represents the provenance of the record, for example whether it came from an EHR record or billing claim. Accepted Concepts. A more detailed explanation of each Type Concept can be found on the OMOP vocabulary wiki. type: string - + provider_id: description: The provider associated with the observation record, e.g. the provider who ordered the test or the provider who recorded the result. The ETL may need to make a choice as to which PROVIDER_ID to put here. Based on what is available this may or may not be different than the provider associated with the overall VISIT_OCCURRENCE record. For example the admitting vs attending physician on an EHR record. type: string @@ -78,13 +78,13 @@ properties: qualifier_concept_id: description: This field contains all attributes specifying the clinical fact further, such as as degrees, severities, drug-drug interaction alerts etc. Use your best judgement as to what Concepts to use here and if they are necessary to accurately represent the clinical record. There is no restriction on the domain of these Concepts, they just need to be Standard. type: string - + qualifier_source_value: description: This field houses the verbatim value from the source data representing the qualifier of the Observation that occurred. This code is mapped to a Standard Condition Concept in the Standardized Vocabularies and the original code is stored here for reference. type: string site_id: - description: The care site ID. + description: The care site ID. type: string unit_concept_id: @@ -102,12 +102,12 @@ properties: value_as_number: description: This is the numerical value of the Result of the Observation, if applicable and available. It is not expected that all Observations will have numeric results, rather, this field is here to house values should they exist. type: number - + value_as_string: description: This is the textual, categorical value of the Result of the Observation, if applicable and available. type: string - value_source_value: + value_source_value: description: This field houses the verbatim result value of the Observation from the source data. Do not get confused with the Observation_source_value which captures source value of the observation mapped to observation_concept_id. This field is the observation result value from the source. If the observation_source_value was a question, for example, or an observation that requires a result then this field is the answer/ result from the source data. Store the verbatim value that represents the result of the observation_source_value. type: string @@ -256,7 +256,7 @@ properties: disease_response: ### From BloodPAC "followup" node description: "The observed improvement achieved at a certain point in time during a patient's treatment protocol." type: string - + ecog_performance_status: ### From BloodPAC "followup" node description: "The ECOG functional performance status of the patient/participant." enum: diff --git a/gdcdictionary/schemas/payer_plan_period.yaml b/gdcdictionary/schemas/payer_plan_period.yaml index 397ab80..e0057f2 100644 --- a/gdcdictionary/schemas/payer_plan_period.yaml +++ b/gdcdictionary/schemas/payer_plan_period.yaml @@ -4,7 +4,7 @@ id: "payer_plan_period" title: Payer Plan Period type: object nodeTerms: null -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: clinical program: '*' project: '*' @@ -59,7 +59,7 @@ properties: payer_plan_period_id: description: A unique identifier for each unique combination of a Person, Payer, Plan, and Period of time. type: string - + payer_source_concept_id: description: If the source data codes the Payer in an OMOP supported vocabulary store the concept_id here. type: string @@ -81,7 +81,7 @@ properties: type: string site_id: - description: The care site ID. + description: The care site ID. type: string sponsor_concept_id: @@ -115,6 +115,3 @@ properties: subjects: description: The submitter_id or id of the subject this payer_plan_period describes, i.e., a link to a record in the parent node. $ref: "_definitions.yaml#/to_one" - - - diff --git a/gdcdictionary/schemas/procedure.yaml b/gdcdictionary/schemas/procedure.yaml index 8a872cc..36a89f0 100644 --- a/gdcdictionary/schemas/procedure.yaml +++ b/gdcdictionary/schemas/procedure.yaml @@ -4,7 +4,7 @@ id: "procedure" title: Procedure type: object nodeTerms: null -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: clinical program: '*' project: '*' @@ -56,11 +56,11 @@ properties: days_to_procedure_start: description: The number of days between the subject's index date and the start date of the procedure. - type: integer + type: integer days_to_procedure_end: description: The number of days between the subject's index date and the end date of the procedure. - type: integer + type: integer modifier_concept_id: description: The modifiers are intended to give additional information about the procedure but as of now the vocabulary is under review. It is up to the ETL to choose how to map modifiers if they exist in source data. These concepts are typically distinguished by 'Modifier' concept classes (e.g., 'CPT4 Modifier' as part of the 'CPT4' vocabulary). If there is more than one modifier on a record, one should be chosen that pertains to the procedure rather than provider. Accepted Concepts. @@ -103,7 +103,7 @@ properties: type: string site_id: - description: The care site ID. + description: The care site ID. type: string visit_id: @@ -117,4 +117,3 @@ properties: subjects: description: The submitter_id or id of the subject to which this procedure is related, i.e., a link to a record in the parent node. $ref: "_definitions.yaml#/to_one" - diff --git a/gdcdictionary/schemas/read_group.yaml b/gdcdictionary/schemas/read_group.yaml index 3d5a2d8..2062549 100644 --- a/gdcdictionary/schemas/read_group.yaml +++ b/gdcdictionary/schemas/read_group.yaml @@ -4,7 +4,7 @@ id: "read_group" title: Read Group type: object description: "Sequencing reads from one lane of an NGS experiment." -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: biospecimen validators: null project: '*' diff --git a/gdcdictionary/schemas/sample.yaml b/gdcdictionary/schemas/sample.yaml index e544751..a1416f5 100644 --- a/gdcdictionary/schemas/sample.yaml +++ b/gdcdictionary/schemas/sample.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "sample" title: Sample type: object -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: biospecimen program: '*' project: '*' @@ -65,8 +65,8 @@ properties: collection_site: description: > - Code for BSS collection site. Indicates the site that enrolled the donor, - brain subregions may have more than one site. + Code for BSS collection site. Indicates the site that enrolled the donor, + brain subregions may have more than one site. type: string current_weight: @@ -113,4 +113,4 @@ properties: $ref: "_definitions.yaml#/to_one" datasets: - $ref: "_definitions.yaml#/to_one" \ No newline at end of file + $ref: "_definitions.yaml#/to_one" diff --git a/gdcdictionary/schemas/study.yaml b/gdcdictionary/schemas/study.yaml index 547aea8..e87c76a 100644 --- a/gdcdictionary/schemas/study.yaml +++ b/gdcdictionary/schemas/study.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "study" title: Study type: object -namespace: https://dcp.bionimbus.org/ +namespace: https://prometheus.data-commons.org/ category: administrative program: '*' project: '*' diff --git a/gdcdictionary/schemas/subject.yaml b/gdcdictionary/schemas/subject.yaml index fba6a32..aaf7639 100755 --- a/gdcdictionary/schemas/subject.yaml +++ b/gdcdictionary/schemas/subject.yaml @@ -4,7 +4,7 @@ id: "subject" title: Subject type: object nodeTerms: null -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: administrative program: '*' project: '*' @@ -145,3 +145,7 @@ properties: datasets: description: The submitter_id or id of the dataset this subject belongs to, i.e., a link to a record in the parent node. $ref: "_definitions.yaml#/to_many" + + studies: + description: The submitter_id or id of the study this subject belongs to, i.e., a link to a record in the parent node. + $ref: "_definitions.yaml#/to_many" diff --git a/gdcdictionary/schemas/unaligned_reads_file.yaml b/gdcdictionary/schemas/unaligned_reads_file.yaml index fbc27d4..9d71a57 100644 --- a/gdcdictionary/schemas/unaligned_reads_file.yaml +++ b/gdcdictionary/schemas/unaligned_reads_file.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "unaligned_reads_file" title: Unaligned Reads File type: object -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: data_file program: '*' project: '*' diff --git a/gdcdictionary/schemas/variant_call_file.yaml b/gdcdictionary/schemas/variant_call_file.yaml index b6ae246..3ac7845 100644 --- a/gdcdictionary/schemas/variant_call_file.yaml +++ b/gdcdictionary/schemas/variant_call_file.yaml @@ -3,7 +3,7 @@ $schema: "http://json-schema.org/draft-04/schema#" id: "variant_call_file" title: Variant Call File type: object -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: data_file program: '*' project: '*' diff --git a/gdcdictionary/schemas/visit.yaml b/gdcdictionary/schemas/visit.yaml index 0d30154..7ea0338 100644 --- a/gdcdictionary/schemas/visit.yaml +++ b/gdcdictionary/schemas/visit.yaml @@ -4,7 +4,7 @@ id: "visit" title: Visit type: object nodeTerms: null -namespace: https://imaging-hub.data-commons.org +namespace: https://prometheus.data-commons.org/ category: clinical program: '*' project: '*' @@ -53,10 +53,10 @@ properties: type: integer days_to_icu_discharge: description: The number of days between the subject's index date and the date of the patient's ICU discharge.. - type: integer + type: integer discharge_type: description: The status or destination of the patient at the time of discharge. - type: string + type: string ## OMOP props admitted_from_concept_id: @@ -92,11 +92,11 @@ properties: type: string site_id: - description: The care site ID. + description: The care site ID. type: string visit_concept_id: - description: This field contains a concept id representing the kind of visit, like inpatient or outpatient. All concepts in this field should be standard and belong to the Visit domain. Populate this field based on the kind of visit that took place for the person. For example this could be “Inpatient Visit”, “Outpatient Visit”, “Ambulatory Visit”, etc. This table will contain standard concepts in the Visit domain. These concepts are arranged in a hierarchical structure to facilitate cohort definitions by rolling up to generally familiar Visits adopted in most healthcare systems worldwide. + description: This field contains a concept id representing the kind of visit, like inpatient or outpatient. All concepts in this field should be standard and belong to the Visit domain. Populate this field based on the kind of visit that took place for the person. For example this could be “Inpatient Visit”, “Outpatient Visit”, “Ambulatory Visit”, etc. This table will contain standard concepts in the Visit domain. These concepts are arranged in a hierarchical structure to facilitate cohort definitions by rolling up to generally familiar Visits adopted in most healthcare systems worldwide. type: string visit_source_concept_id: From 92213966d649095de57110577aa659250f2fdbd0 Mon Sep 17 00:00:00 2001 From: Justin Dorsheimer <66982778+jdorsheimer@users.noreply.github.com> Date: Fri, 10 Jan 2025 11:17:55 -0700 Subject: [PATCH 2/2] Update subject.yaml --- gdcdictionary/schemas/subject.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gdcdictionary/schemas/subject.yaml b/gdcdictionary/schemas/subject.yaml index aaf7639..3b71858 100755 --- a/gdcdictionary/schemas/subject.yaml +++ b/gdcdictionary/schemas/subject.yaml @@ -142,10 +142,6 @@ properties: description: The three-digit United States zip code of residence for any population greater than 20,000. For zip codes where the three digit number represents a population less than 20,000 "000" will be provided. type: string - datasets: - description: The submitter_id or id of the dataset this subject belongs to, i.e., a link to a record in the parent node. - $ref: "_definitions.yaml#/to_many" - studies: description: The submitter_id or id of the study this subject belongs to, i.e., a link to a record in the parent node. $ref: "_definitions.yaml#/to_many"