diff --git a/.github/workflows/container-tefca-viewer.yaml b/.github/workflows/ci.yaml similarity index 67% rename from .github/workflows/container-tefca-viewer.yaml rename to .github/workflows/ci.yaml index e3a828816..39dbf3233 100644 --- a/.github/workflows/container-tefca-viewer.yaml +++ b/.github/workflows/ci.yaml @@ -1,4 +1,4 @@ -name: Test tefca-viewer Container +name: CI on: pull_request: @@ -10,8 +10,6 @@ on: push: branches: - main - paths-ignore: - - pyproject.toml workflow_dispatch: concurrency: @@ -19,22 +17,20 @@ concurrency: cancel-in-progress: true env: - TEST_RUNNER_PYTHON_VERSION: 3.10.12 - CONTAINER: tefca-viewer NODE_VERSION: 18 # Adjust the Node.js version as needed jobs: - javascript-linting: + lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Lint javascript for ${{env.CONTAINER}} - working-directory: ./containers/${{env.CONTAINER}} + - name: Run linting + working-directory: ./query-connector run: | npm ci npm run lint - test-node-containers: + unit-tests: runs-on: ubuntu-latest steps: - name: Checkout code @@ -44,13 +40,13 @@ jobs: with: node-version: ${{env.NODE_VERSION}} - name: Install dependencies - working-directory: ./containers/${{env.CONTAINER}} # Navigate to your Node.js app directory + working-directory: ./query-connector run: npm install - name: Run tests - working-directory: ./containers/${{env.CONTAINER}} # Navigate to your Node.js app directory + working-directory: ./query-connector run: npm test - playwright-tests: + end-to-end-tests: timeout-minutes: 10 runs-on: ubuntu-latest steps: @@ -61,16 +57,16 @@ jobs: with: node-version: ${{env.NODE_VERSION}} - name: Install dependencies - working-directory: ./containers/${{env.CONTAINER}} + working-directory: ./query-connector run: npm ci - name: Install Playwright Browsers - working-directory: ./containers/${{env.CONTAINER}} + working-directory: ./query-connector run: npx playwright install --with-deps - name: Build Query Connector - working-directory: ./containers/${{env.CONTAINER}} + working-directory: ./query-connector run: docker compose build --no-cache - name: Run Query Connector - working-directory: ./containers/${{env.CONTAINER}} + working-directory: ./query-connector run: docker compose up -d - name: Poll until Query Connector is ready run: | @@ -79,10 +75,10 @@ jobs: sleep 5 done - name: Playwright Tests - working-directory: ./containers/${{env.CONTAINER}} + working-directory: ./query-connector run: npx playwright test e2e --reporter=list --config playwright.config.ts - uses: actions/upload-artifact@v4 if: ${{ !cancelled() }} with: name: test-results - path: ./containers/${{env.CONTAINER}}/test-results/ + path: ./query-connector/test-results/ diff --git a/.github/workflows/linting-python.yaml b/.github/workflows/linting-python.yaml deleted file mode 100644 index 22683adfc..000000000 --- a/.github/workflows/linting-python.yaml +++ /dev/null @@ -1,31 +0,0 @@ -name: Python Linting - -on: - workflow_call: - inputs: - python_runner_version: - default: 3.11 - required: true - type: number - -jobs: - python-linting: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Setup python ${{inputs.python_runner_version}} - uses: actions/setup-python@v5 - with: - python-version: ${{inputs.python_runner_version}} - cache: pip - - name: Install dependencies - run: | - pip install -U pip - pip install ruff==0.4.3 - - name: Run linter (ruff) - run: | - ruff check --output-format=github . - - name: Run formatter (ruff) - run: | - ruff format --check diff --git a/.github/workflows/listContainers.yaml b/.github/workflows/listContainers.yaml deleted file mode 100644 index 1fcc61914..000000000 --- a/.github/workflows/listContainers.yaml +++ /dev/null @@ -1,61 +0,0 @@ -name: "List Containers" - -on: - workflow_call: - outputs: - all-containers: - value: ${{ jobs.list-containers.outputs.container-dirs }} - python-containers: - value: ${{ jobs.list-python-containers.outputs.python-containers }} - integration-dirs: - value: ${{ jobs.list-integration-test-directories.outputs.integration-dirs }} - -jobs: - list-containers: - runs-on: ubuntu-latest - outputs: - container-dirs: ${{ steps.generate-list.outputs.containers }} - steps: - - name: Check Out Changes - uses: actions/checkout@v4 - - name: Install dependencies - run: | - sudo apt-get install jq - - id: generate-list - name: Generate list of directories within containers/ - working-directory: ./containers - run: | - ls -d * | jq -R -s -c 'split("\n")[:-1]' - echo "containers=$(ls -d */ | cut -f1 -d'/' | jq -R -s -c 'split("\n")[:-1] ')" >> $GITHUB_OUTPUT - list-python-containers: - runs-on: ubuntu-latest - outputs: - python-containers: ${{steps.generate-python-list.outputs.python_containers}} - steps: - - name: Check Out Changes - uses: actions/checkout@v4 - - name: Install dependencies - run: | - sudo apt-get install jq - - id: generate-python-list - name: Generate list of python-specific directories within containers/ - working-directory: ./containers - # find all subdirectories with a requirements.txt file at the base (the python containers) - run: | - find . -maxdepth 2 -type f -name "requirements.txt" -exec dirname {} \; | sort -u | xargs -n 1 basename | jq -R -s -c 'split("\n")[:-1] ' - echo "python_containers=$(find . -maxdepth 2 -type f -name "requirements.txt" -exec dirname {} \; | sort -u | xargs -n 1 basename | jq -R -s -c 'split("\n")[:-1] ')" >> $GITHUB_OUTPUT - list-integration-test-directories: - runs-on: ubuntu-latest - outputs: - integration-dirs: ${{steps.generate-integration-list.outputs.containers_to_test}} - steps: - - name: Check Out Changes - uses: actions/checkout@v4 - - name: Install dependencies - run: | - sudo apt-get install jq - - id: generate-integration-list - name: Generate list of integration test directories within containers/ - working-directory: ./containers - run: | - echo "containers_to_test=$(find . -name "integration" -type d | cut -d "/" -f2 | jq -R -s -c 'split("\n")[:-1] | map(select(. != "ecr-viewer"))' )" >> $GITHUB_OUTPUT diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 09c7de833..1d2fd173e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,38 +1,16 @@ repos: - - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.9 - hooks: - # Run the linter. - - id: ruff - args: [--fix] - # Run the formatter. - - id: ruff-format - repo: https://github.com/pre-commit/pre-commit-hooks rev: v5.0.0 hooks: - id: pretty-format-json + name: Pretty Format JSON args: [--autofix, --no-sort-keys] - repo: https://github.com/pre-commit/mirrors-eslint rev: "v9.12.0" hooks: - id: eslint - name: ESLint for ECR Viewer - files: ^containers/ecr-viewer/.*\.[jt]sx?$ # *.js, *.jsx, *.ts and *.tsx in containers/ecr-viewer - types: [file] - additional_dependencies: - - eslint@8.56.0 - - eslint-config-next - - eslint-config-prettier - - "@typescript-eslint/parser" - - "@typescript-eslint/eslint-plugin" - - typescript - - "@next/eslint-plugin-next" - - eslint-plugin-unused-imports - - eslint-plugin-jsdoc - args: ["--config=./containers/ecr-viewer/.eslintrc.json", "--fix"] - - id: eslint - name: ESLint for TEFCA Viewer - files: ^containers/tefca-viewer/.*\.[jt]sx?$ # *.js, *.jsx, *.ts and *.tsx + name: ESLint + files: ^query-connector/.*\.[jt]sx?$ # *.js, *.jsx, *.ts and *.tsx types: [file] additional_dependencies: - eslint@8.56.0 @@ -44,24 +22,13 @@ repos: - "@next/eslint-plugin-next" - eslint-plugin-unused-imports - eslint-plugin-jsdoc - args: ["--config=./containers/tefca-viewer/.eslintrc.json", "--fix"] + args: ["--config=./query-connector/.eslintrc.json", "--fix"] - repo: https://github.com/pre-commit/mirrors-prettier rev: v4.0.0-alpha.8 hooks: - id: prettier + name: Prettier types_or: [css, javascript, tsx, ts, yaml] - - repo: local - hooks: - # run `terraform fmt` if tf files are modified and terraform is installed - # when terraform is not installed, this check will succeed even if tf files - # would not pass the format check - - id: terraform-fmt - name: terraform-fmt - entry: bash -c 'if command -v terraform >/dev/null 2>&1; then terraform fmt -recursive -check operations; else exit 0; fi' - language: system - types: - - terraform - pass_filenames: false ci: autofix_commit_msg: | [pre-commit.ci] auto fixes from pre-commit hooks @@ -69,5 +36,5 @@ ci: autoupdate_branch: "" autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate" autoupdate_schedule: weekly - skip: [pretty-format-json, terraform-fmt] + skip: [pretty-format-json] submodules: false diff --git a/query-connector/flyway/sql/V01_05__insert_nbs_hardcoded_values.sql b/query-connector/flyway/sql/V01_05__insert_nbs_hardcoded_values.sql new file mode 100644 index 000000000..926908bff --- /dev/null +++ b/query-connector/flyway/sql/V01_05__insert_nbs_hardcoded_values.sql @@ -0,0 +1,409 @@ +-- Insert hardcoded values for Newborn Screening panel from CPHI +INSERT INTO valuesets VALUES('16_20241015','16','20241015','Newborn Screening Metabolic Disorder Confirmatory Labs','Center for Public Health Innovation','lrtc'); + +-- Add Newborn Screening Metabolic Disorder Confirmatory Labs concepts +INSERT INTO concepts VALUES('1_46252-3','46252-3','http://loinc.org','Acylcarnitine pattern [Interpretation] in Serum or Plasma','462523','2024-10'); +INSERT INTO concepts VALUES('1_30191-1','30191-1','http://loinc.org','Acetylcarnitine (C2) [Moles/volume] in Seerum or Plasma','301911','2024-10'); +INSERT INTO concepts VALUES('1_30551-6','30551-6','http://loinc.org','Propionylcarnitine (C3) [Moles/volume] inn Serum or Plasma','305516','2024-10'); +INSERT INTO concepts VALUES('1_51413-3','51413-3','http://loinc.org','Butyrylcarnitine+Isobutyrylcarnitine (C4)) [Moles/volume] in Serum or Plasma','514133','2024-10'); +INSERT INTO concepts VALUES('1_30531-8','30531-8','http://loinc.org','Isovalerylcarnitine+Methylbutyrylcarnitinne (C5) [Moles/volume] in Serum or Plasma','305318','2024-10'); +INSERT INTO concepts VALUES('1_30349-5','30349-5','http://loinc.org','Glutarylcarnitine (C5-DC) [Moles/volume] in Serum or Plasma','303495','2024-10'); +INSERT INTO concepts VALUES('1_39001-3','39001-3','http://loinc.org','3-Hydroxyisovalerylcarnitine (C5-OH) [Moles/volume] in Serum or Plasma','390013','2024-10'); +INSERT INTO concepts VALUES('1_30358-6','30358-6','http://loinc.org','Hexanoylcarnitine (C6) [Moles/volume] in Serum or Plasma','303586','2024-10'); +INSERT INTO concepts VALUES('1_30540-9','30540-9','http://loinc.org','Octanoylcarnitine (C8) [Moles/volume] in Serum or Plasma','305409','2024-10'); +INSERT INTO concepts VALUES('1_30541-7','30541-7','http://loinc.org','Octenoylcarnitine (C8:1) [Moles/volume] iin Serum or Plasma','305417','2024-10'); +INSERT INTO concepts VALUES('1_30327-1','30327-1','http://loinc.org','Decanoylcarnitine (C10) [Moles/volume] inn Serum or Plasma','303271','2024-10'); +INSERT INTO concepts VALUES('1_30328-9','30328-9','http://loinc.org','Decenoylcarnitine (C10:1) [Moles/volume] in Serum or Plasma','303289','2024-10'); +INSERT INTO concepts VALUES('1_30331-3','30331-3','http://loinc.org','Dodecanoylcarnitine (C12) [Moles/volume] in Serum or Plasma','303313','2024-10'); +INSERT INTO concepts VALUES('1_30332-1','30332-1','http://loinc.org','Dodecenoylcarnitine (C12:1) [Moles/volumee] in Serum or Plasma','303321','2024-10'); +INSERT INTO concepts VALUES('1_30233-1','30233-1','http://loinc.org','3-Hydroxydodecanoylcarnitine (C12-OH) [Moles/volume] in Serum or Plasma','302331','2024-10'); +INSERT INTO concepts VALUES('1_30564-9','30564-9','http://loinc.org','Tetradecadienoylcarnitine (C14:2) [Moles/volume] in Serum or Plasma','305649','2024-10'); +INSERT INTO concepts VALUES('1_30565-6','30565-6','http://loinc.org','Tetradecanoylcarnitine (C14) [Moles/volumme] in Serum or Plasma','305656','2024-10'); +INSERT INTO concepts VALUES('1_30566-4','30566-4','http://loinc.org','Tetradecenoylcarnitine (C14:1) [Moles/vollume] in Serum or Plasma','305664','2024-10'); +INSERT INTO concepts VALUES('1_30190-3','30190-3','http://loinc.org','3-Hydroxytetradecenoylcarnitine (C14:1-OH) [Moles/volume] in Serum or Plasma','301903','2024-10'); +INSERT INTO concepts VALUES('1_30238-0','30238-0','http://loinc.org','3-Hydroxytetradecanoylcarnitine (C14-OH) [Moles/volume] in Serum or Plasma','302380','2024-10'); +INSERT INTO concepts VALUES('1_30356-0','30356-0','http://loinc.org','Palmitoylcarnitine (C16) [Moles/volume] iin Serum or Plasma','303560','2024-10'); +INSERT INTO concepts VALUES('1_30357-8','30357-8','http://loinc.org','Palmitoleylcarnitine (C16:1) [Moles/volumme] in Serum or Plasma','303578','2024-10'); +INSERT INTO concepts VALUES('1_30235-6','30235-6','http://loinc.org','3-Hydroxypalmitoleylcarnitine (C16:1-OH) [Moles/volume] in Serum or Plasma','302356','2024-10'); +INSERT INTO concepts VALUES('1_30234-9','30234-9','http://loinc.org','3-Hydroxypalmitoylcarnitine (C16-OH) [Moles/volume] in Serum or Plasma','302349','2024-10'); +INSERT INTO concepts VALUES('1_30560-7','30560-7','http://loinc.org','Stearoylcarnitine (C18) [Moles/volume] inn Serum or Plasma','305607','2024-10'); +INSERT INTO concepts VALUES('1_35656-8','35656-8','http://loinc.org','3-Hydroxystearoylcarnitine (C18-OH) [Moles/volume] in Serum or Plasma','356568','2024-10'); +INSERT INTO concepts VALUES('1_30542-5','30542-5','http://loinc.org','Oleoylcarnitine (C18:1) [Moles/volume] inn Serum or Plasma','305425','2024-10'); +INSERT INTO concepts VALUES('1_30312-3','30312-3','http://loinc.org','3-Hydroxyoleoylcarnitine (C18:1-OH) [Moles/volume] in Serum or Plasma','303123','2024-10'); +INSERT INTO concepts VALUES('1_30534-2','30534-2','http://loinc.org','Linoleoylcarnitine (C18:2) [Moles/volume]] in Serum or Plasma','305342','2024-10'); +INSERT INTO concepts VALUES('1_30237-2','30237-2','http://loinc.org','3-Hydroxylinoleoylcarnitine (C18:2-OH) [Moles/volume] in Serum or Plasma','302372','2024-10'); +INSERT INTO concepts VALUES('1_53718-3','53718-3','http://loinc.org','Acylglycines [Interpretation] in Urine Narrative','537183','2024-10'); +INSERT INTO concepts VALUES('1_2161-8','2161-8','http://loinc.org','Creatinine [Mass/volume] in Urine','21618','2024-10'); +INSERT INTO concepts VALUES('1_24442-6','24442-6','http://loinc.org','Propionylglycine/Creatinine [Molar ratio]] in Urine','244426','2024-10'); +INSERT INTO concepts VALUES('1_24437-6','24437-6','http://loinc.org','Butyrylglycine/Creatinine [Molar ratio] iin Urine','244376','2024-10'); +INSERT INTO concepts VALUES('1_24438-4','24438-4','http://loinc.org','Hexanoylglycine/Creatinine [Molar ratio] in Urine','244384','2024-10'); +INSERT INTO concepts VALUES('1_24439-2','24439-2','http://loinc.org','Isobutyrylglycine/Creatinine [Molar ratioo] in Urine','244392','2024-10'); +INSERT INTO concepts VALUES('1_24440-0','24440-0','http://loinc.org','Isovalerylglycine/Creatinine [Molar ratioo] in Urine','244400','2024-10'); +INSERT INTO concepts VALUES('1_24435-0','24435-0','http://loinc.org','2-Methylbutyrylglycine/Creatinine [Molar ratio] in Urine','244350','2024-10'); +INSERT INTO concepts VALUES('1_24441-8','24441-8','http://loinc.org','Phenylpropionylglycine/Creatinine [Molar ratio] in Urine','244418','2024-10'); +INSERT INTO concepts VALUES('1_24443-4','24443-4','http://loinc.org','Suberylglycine/Creatinine [Molar ratio] iin Urine','244434','2024-10'); +INSERT INTO concepts VALUES('1_24436-8','24436-8','http://loinc.org','3-Methylcrotonylglycine/Creatinine [Molarr ratio] in Urine','244368','2024-10'); +INSERT INTO concepts VALUES('1_24444-2','24444-2','http://loinc.org','Tiglylglycine/Creatinine [Molar ratio] inn Urine','244442','2024-10'); +INSERT INTO concepts VALUES('1_14286-9','14286-9','http://loinc.org','Carnitine free (C0) [Moles/volume] in Serrum or Plasma','142869','2024-10'); +INSERT INTO concepts VALUES('1_14288-5','14288-5','http://loinc.org','Carnitine [Moles/volume] in Serum or Plassma','142885','2024-10'); +INSERT INTO concepts VALUES('1_19074-4','19074-4','http://loinc.org','Carnitine esters [Moles/volume] in Serum or Plasma','190744','2024-10'); +INSERT INTO concepts VALUES('1_40869-0','40869-0','http://loinc.org','Carnitine esters/Carnitine.free (C0) [Mollar ratio] in Serum or Plasma','408690','2024-10'); +INSERT INTO concepts VALUES('1_17866-5','17866-5','http://loinc.org','Carnitine/Creatinine [Ratio] in Urine','1178665','2024-10'); +INSERT INTO concepts VALUES('1_17867-3','17867-3','http://loinc.org','Carnitine free (C0)/Creatinine [Ratio] inn Urine','178673','2024-10'); +INSERT INTO concepts VALUES('1_28589-0','28589-0','http://loinc.org','Carnitine esters/Creatinine [Ratio] in Urrine','285890','2024-10'); +INSERT INTO concepts VALUES('1_54442-9','54442-9','http://loinc.org','Carnitine esters/Carnitine.free (C0) [Mollar ratio] in Urine','544429','2024-10'); +INSERT INTO concepts VALUES('1_79291-1','79291-1','http://loinc.org','Creatine and guanidinoacetate pattern [Interpretation] in Serum or Plasma Narrative','792911','2024-10'); +INSERT INTO concepts VALUES('1_15045-8','15045-8','http://loinc.org','Creatine [Moles/volume] in Serum or Plasma','150458','2024-10'); +INSERT INTO concepts VALUES('1_33244-5','33244-5','http://loinc.org','Guanidinoacetate [Moles/volume] in Serum or Plasma','332445','2024-10'); +INSERT INTO concepts VALUES('1_79292-9','79292-9','http://loinc.org','Creatine, guanidinoacetate and creatinine pattern [Interpretation] in Urine Narrative','792929','2024-10'); +INSERT INTO concepts VALUES('1_14683-7','14683-7','http://loinc.org','Creatinine [Moles/volume] in Urine','1468837','2024-10'); +INSERT INTO concepts VALUES('1_34275-8','34275-8','http://loinc.org','Creatine/Creatinine [Molar ratio] in Urinne','342758','2024-10'); +INSERT INTO concepts VALUES('1_34155-2','34155-2','http://loinc.org','Guanidinoacetate/Creatinine [Molar ratio]] in Urine','341552','2024-10'); +INSERT INTO concepts VALUES('1_13500-4','13500-4','http://loinc.org','Amino acid pattern [Interpretation] in Serum or Plasma','135004','2024-10'); +INSERT INTO concepts VALUES('1_26604-9','26604-9','http://loinc.org','Beta alanine [Moles/volume] in Serum or PPlasma','266049','2024-10'); +INSERT INTO concepts VALUES('1_20636-7','20636-7','http://loinc.org','Alanine [Moles/volume] in Serum or Plasma','206367','2024-10'); +INSERT INTO concepts VALUES('1_22670-4','22670-4','http://loinc.org','Alloisoleucine [Moles/volume] in Serum orr Plasma','226704','2024-10'); +INSERT INTO concepts VALUES('1_26600-7','26600-7','http://loinc.org','Alpha aminoadipate [Moles/volume] in Seruum or Plasma','266007','2024-10'); +INSERT INTO concepts VALUES('1_26609-8','26609-8','http://loinc.org','Gamma aminobutyrate [Moles/volume] in Serrum or Plasma','266098','2024-10'); +INSERT INTO concepts VALUES('1_26605-6','26605-6','http://loinc.org','Beta aminoisobutyrate [Moles/volume] in SSerum or Plasma','266056','2024-10'); +INSERT INTO concepts VALUES('1_20634-2','20634-2','http://loinc.org','Alpha aminobutyrate [Moles/volume] in Serrum or Plasma','206342','2024-10'); +INSERT INTO concepts VALUES('1_26599-1','26599-1','http://loinc.org','Anserine [Moles/volume] in Serum or Plasma','265991','2024-10'); +INSERT INTO concepts VALUES('1_20637-5','20637-5','http://loinc.org','Arginine [Moles/volume] in Serum or Plasma','206375','2024-10'); +INSERT INTO concepts VALUES('1_32227-1','32227-1','http://loinc.org','Argininosuccinate [Moles/volume] in Serumm or Plasma','322271','2024-10'); +INSERT INTO concepts VALUES('1_20638-3','20638-3','http://loinc.org','Asparagine [Moles/volume] in Serum or Plasma','206383','2024-10'); +INSERT INTO concepts VALUES('1_20639-1','20639-1','http://loinc.org','Aspartate [Moles/volume] in Serum or Plassma','206391','2024-10'); +INSERT INTO concepts VALUES('1_20640-9','20640-9','http://loinc.org','Citrulline [Moles/volume] in Serum or Plasma','206409','2024-10'); +INSERT INTO concepts VALUES('1_26607-2','26607-2','http://loinc.org','Cystathionine [Moles/volume] in Serum or Plasma','266072','2024-10'); +INSERT INTO concepts VALUES('1_22672-0','22672-0','http://loinc.org','Cystine [Moles/volume] in Serum or Plasma','226720','2024-10'); +INSERT INTO concepts VALUES('1_26608-0','26608-0','http://loinc.org','Ethanolamine [Moles/volume] in Serum or PPlasma','266080','2024-10'); +INSERT INTO concepts VALUES('1_20642-5','20642-5','http://loinc.org','Glutamate [Moles/volume] in Serum or Plassma','206425','2024-10'); +INSERT INTO concepts VALUES('1_20643-3','20643-3','http://loinc.org','Glutamine [Moles/volume] in Serum or Plassma','206433','2024-10'); +INSERT INTO concepts VALUES('1_20644-1','20644-1','http://loinc.org','Glycine [Moles/volume] in Serum or Plasma','206441','2024-10'); +INSERT INTO concepts VALUES('1_20645-8','20645-8','http://loinc.org','Histidine [Moles/volume] in Serum or Plassma','206458','2024-10'); +INSERT INTO concepts VALUES('1_55876-7','55876-7','http://loinc.org','Homocitrulline [Moles/volume] in Serum orr Plasma','558767','2024-10'); +INSERT INTO concepts VALUES('1_20646-6','20646-6','http://loinc.org','Homocystine [Moles/volume] in Serum or Pllasma','206466','2024-10'); +INSERT INTO concepts VALUES('1_26610-6','26610-6','http://loinc.org','Hydroxylysine [Moles/volume] in Serum or Plasma','266106','2024-10'); +INSERT INTO concepts VALUES('1_20647-4','20647-4','http://loinc.org','Hydroxyproline [Moles/volume] in Serum orr Plasma','206474','2024-10'); +INSERT INTO concepts VALUES('1_20648-2','20648-2','http://loinc.org','Isoleucine [Moles/volume] in Serum or Plasma','206482','2024-10'); +INSERT INTO concepts VALUES('1_20649-0','20649-0','http://loinc.org','Leucine [Moles/volume] in Serum or Plasma','206490','2024-10'); +INSERT INTO concepts VALUES('1_20650-8','20650-8','http://loinc.org','Lysine [Moles/volume] in Serum or Plasma','206508','2024-10'); +INSERT INTO concepts VALUES('1_20651-6','20651-6','http://loinc.org','Methionine [Moles/volume] in Serum or Plasma','206516','2024-10'); +INSERT INTO concepts VALUES('1_20652-4','20652-4','http://loinc.org','Ornithine [Moles/volume] in Serum or Plassma','206524','2024-10'); +INSERT INTO concepts VALUES('1_14875-9','14875-9','http://loinc.org','Phenylalanine [Moles/volume] in Serum or Plasma','148759','2024-10'); +INSERT INTO concepts VALUES('1_20655-7','20655-7','http://loinc.org','Proline [Moles/volume] in Serum or Plasma','206557','2024-10'); +INSERT INTO concepts VALUES('1_26613-0','26613-0','http://loinc.org','Sarcosine [Moles/volume] in Serum or Plassma','266130','2024-10'); +INSERT INTO concepts VALUES('1_20656-5','20656-5','http://loinc.org','Serine [Moles/volume] in Serum or Plasma','206565','2024-10'); +INSERT INTO concepts VALUES('1_20657-3','20657-3','http://loinc.org','Taurine [Moles/volume] in Serum or Plasma','206573','2024-10'); +INSERT INTO concepts VALUES('1_20658-1','20658-1','http://loinc.org','Threonine [Moles/volume] in Serum or Plassma','206581','2024-10'); +INSERT INTO concepts VALUES('1_20659-9','20659-9','http://loinc.org','Tryptophan [Moles/volume] in Serum or Plasma','206599','2024-10'); +INSERT INTO concepts VALUES('1_20660-7','20660-7','http://loinc.org','Tyrosine [Moles/volume] in Serum or Plasma','206607','2024-10'); +INSERT INTO concepts VALUES('1_20661-5','20661-5','http://loinc.org','Valine [Moles/volume] in Serum or Plasma','206615','2024-10'); +INSERT INTO concepts VALUES('1_49248-8','49248-8','http://loinc.org','Amino acid pattern [Interpretation] in Urine Narrative','492488','2024-10'); +INSERT INTO concepts VALUES('1_28588-2','28588-2','http://loinc.org','Beta alanine/Creatinine [Ratio] in Urine','285882','2024-10'); +INSERT INTO concepts VALUES('1_30068-1','30068-1','http://loinc.org','Alanine/Creatinine [Ratio] in Urine','3000681','2024-10'); +INSERT INTO concepts VALUES('1_28598-1','28598-1','http://loinc.org','Alpha aminoadipate/Creatinine [Ratio] in Urine','285981','2024-10'); +INSERT INTO concepts VALUES('1_28590-8','28590-8','http://loinc.org','Alpha aminobutyrate/Creatinine [Ratio] inn Urine','285908','2024-10'); +INSERT INTO concepts VALUES('1_28596-5','28596-5','http://loinc.org','Anserine/Creatinine [Ratio] in Urine','2885965','2024-10'); +INSERT INTO concepts VALUES('1_30062-4','30062-4','http://loinc.org','Arginine/Creatinine [Ratio] in Urine','3000624','2024-10'); +INSERT INTO concepts VALUES('1_32229-7','32229-7','http://loinc.org','Argininosuccinate/Creatinine [Ratio] in UUrine','322297','2024-10'); +INSERT INTO concepts VALUES('1_28603-9','28603-9','http://loinc.org','Asparagine/Creatinine [Ratio] in Urine','286039','2024-10'); +INSERT INTO concepts VALUES('1_30061-6','30061-6','http://loinc.org','Aspartate/Creatinine [Ratio] in Urine','3300616','2024-10'); +INSERT INTO concepts VALUES('1_28602-1','28602-1','http://loinc.org','Beta aminoisobutyrate/Creatinine [Ratio] in Urine','286021','2024-10'); +INSERT INTO concepts VALUES('1_30161-4','30161-4','http://loinc.org','Citrulline/Creatinine [Ratio] in Urine','301614','2024-10'); +INSERT INTO concepts VALUES('1_28599-9','28599-9','http://loinc.org','Cystathionine/Creatinine [Ratio] in Urinee','285999','2024-10'); +INSERT INTO concepts VALUES('1_30065-7','30065-7','http://loinc.org','Cystine/Creatinine [Ratio] in Urine','3000657','2024-10'); +INSERT INTO concepts VALUES('1_28605-4','28605-4','http://loinc.org','Ethanolamine/Creatinine [Ratio] in Urine','286054','2024-10'); +INSERT INTO concepts VALUES('1_28593-2','28593-2','http://loinc.org','Gamma aminobutyrate/Creatinine [Ratio] inn Urine','285932','2024-10'); +INSERT INTO concepts VALUES('1_30059-0','30059-0','http://loinc.org','Glutamate/Creatinine [Ratio] in Urine','3300590','2024-10'); +INSERT INTO concepts VALUES('1_30056-6','30056-6','http://loinc.org','Glutamine/Creatinine [Ratio] in Urine','3300566','2024-10'); +INSERT INTO concepts VALUES('1_30066-5','30066-5','http://loinc.org','Glycine/Creatinine [Ratio] in Urine','3000665','2024-10'); +INSERT INTO concepts VALUES('1_30047-5','30047-5','http://loinc.org','Histidine/Creatinine [Ratio] in Urine','3300475','2024-10'); +INSERT INTO concepts VALUES('1_32248-7','32248-7','http://loinc.org','Homocitrulline/Creatinine [Ratio] in Urinne','322487','2024-10'); +INSERT INTO concepts VALUES('1_30050-9','30050-9','http://loinc.org','Hydroxylysine/Creatinine [Ratio] in Urinee','300509','2024-10'); +INSERT INTO concepts VALUES('1_28601-3','28601-3','http://loinc.org','Hydroxyproline/Creatinine [Ratio] in Urinne','286013','2024-10'); +INSERT INTO concepts VALUES('1_30052-5','30052-5','http://loinc.org','Isoleucine/Creatinine [Ratio] in Urine','300525','2024-10'); +INSERT INTO concepts VALUES('1_30053-3','30053-3','http://loinc.org','Leucine/Creatinine [Ratio] in Urine','3000533','2024-10'); +INSERT INTO concepts VALUES('1_30048-3','30048-3','http://loinc.org','Lysine/Creatinine [Ratio] in Urine','3004483','2024-10'); +INSERT INTO concepts VALUES('1_30063-2','30063-2','http://loinc.org','Methionine/Creatinine [Ratio] in Urine','300632','2024-10'); +INSERT INTO concepts VALUES('1_30049-1','30049-1','http://loinc.org','Ornithine/Creatinine [Ratio] in Urine','3300491','2024-10'); +INSERT INTO concepts VALUES('1_30055-8','30055-8','http://loinc.org','Phenylalanine/Creatinine [Ratio] in Urinee','300558','2024-10'); +INSERT INTO concepts VALUES('1_30067-3','30067-3','http://loinc.org','Proline/Creatinine [Ratio] in Urine','3000673','2024-10'); +INSERT INTO concepts VALUES('1_28610-4','28610-4','http://loinc.org','Sarcosine/Creatinine [Ratio] in Urine','2286104','2024-10'); +INSERT INTO concepts VALUES('1_30058-2','30058-2','http://loinc.org','Serine/Creatinine [Ratio] in Urine','3005582','2024-10'); +INSERT INTO concepts VALUES('1_28595-7','28595-7','http://loinc.org','Taurine/Creatinine [Ratio] in Urine','2855957','2024-10'); +INSERT INTO concepts VALUES('1_30057-4','30057-4','http://loinc.org','Threonine/Creatinine [Ratio] in Urine','3300574','2024-10'); +INSERT INTO concepts VALUES('1_28608-8','28608-8','http://loinc.org','Tryptophan/Creatinine [Ratio] in Urine','286088','2024-10'); +INSERT INTO concepts VALUES('1_30054-1','30054-1','http://loinc.org','Tyrosine/Creatinine [Ratio] in Urine','3000541','2024-10'); +INSERT INTO concepts VALUES('1_30064-0','30064-0','http://loinc.org','Valine/Creatinine [Ratio] in Urine','3006640','2024-10'); +INSERT INTO concepts VALUES('1_33477-1','33477-1','http://loinc.org','Organic acids pattern [Interpretation] in Urine','334771','2024-10'); +INSERT INTO concepts VALUES('1_25112-4','25112-4','http://loinc.org','Lactate/Creatinine [Molar ratio] in Urinee','251124','2024-10'); +INSERT INTO concepts VALUES('1_25132-2','25132-2','http://loinc.org','Pyruvate/Creatinine [Molar ratio] in Urinne','251322','2024-10'); +INSERT INTO concepts VALUES('1_25136-3','25136-3','http://loinc.org','Succinate/Creatinine [Molar ratio] in Uriine','251363','2024-10'); +INSERT INTO concepts VALUES('1_29507-1','29507-1','http://loinc.org','Alpha ketoglutarate/Creatinine [Molar rattio] in Urine','295071','2024-10'); +INSERT INTO concepts VALUES('1_25101-7','25101-7','http://loinc.org','Fumarate/Creatinine [Molar ratio] in Urinne','251017','2024-10'); +INSERT INTO concepts VALUES('1_25116-5','25116-5','http://loinc.org','Methylmalonate/Creatinine [Molar ratio] iin Urine','251165','2024-10'); +INSERT INTO concepts VALUES('1_29509-7','29509-7','http://loinc.org','Beta hydroxybutyrate/Creatinine [Molar raatio] in Urine','295097','2024-10'); +INSERT INTO concepts VALUES('1_29524-6','29524-6','http://loinc.org','Acetoacetate/Creatinine [Molar ratio] in Urine','295246','2024-10'); +INSERT INTO concepts VALUES('1_25083-7','25083-7','http://loinc.org','2-Oxo,3-Methylvalerate/Creatinine [Molar ratio] in Urine','250837','2024-10'); +INSERT INTO concepts VALUES('1_25084-5','25084-5','http://loinc.org','2-Oxoisocaproate/Creatinine [Molar ratio]] in Urine','250845','2024-10'); +INSERT INTO concepts VALUES('1_25085-2','25085-2','http://loinc.org','2-Oxoisovalerate/Creatinine [Molar ratio]] in Urine','250852','2024-10'); +INSERT INTO concepts VALUES('1_25099-3','25099-3','http://loinc.org','Ethylmalonate/Creatinine [Molar ratio] inn Urine','250993','2024-10'); +INSERT INTO concepts VALUES('1_29859-6','29859-6','http://loinc.org','Adipate/Creatinine [Molar ratio] in Urinee','298596','2024-10'); +INSERT INTO concepts VALUES('1_25135-5','25135-5','http://loinc.org','Suberate/Creatinine [Molar ratio] in Urinne','251355','2024-10'); +INSERT INTO concepts VALUES('1_25134-8','25134-8','http://loinc.org','Sebacate (C8)/Creatinine [Molar ratio] inn Urine','251348','2024-10'); +INSERT INTO concepts VALUES('1_25088-6','25088-6','http://loinc.org','4-Hydroxyphenylacetate/Creatinine [Molar ratio] in Urine','250886','2024-10'); +INSERT INTO concepts VALUES('1_25089-4','25089-4','http://loinc.org','4-Hydroxyphenyllactate/Creatinine [Molar ratio] in Urine','250894','2024-10'); +INSERT INTO concepts VALUES('1_29519-6','29519-6','http://loinc.org','4-Hydroxyphenylpyruvate/Creatinine [Molarr ratio] in Urine','295196','2024-10'); +INSERT INTO concepts VALUES('1_25137-1','25137-1','http://loinc.org','Succinylacetone/Creatinine [Molar ratio] in Urine','251371','2024-10'); +INSERT INTO concepts VALUES('1_1982-8','1982-8','http://loinc.org','Biotinidase [Enzymatic activity/volume] in Serum or Plasma','19828','2024-10'); +INSERT INTO concepts VALUES('1_54457-7','54457-7','http://loinc.org','Biotinidase [Enzymatic activity/volume] iin Serum or Plasma from Normal control','544577','2024-10'); +INSERT INTO concepts VALUES('1_3024-7','3024-7','http://loinc.org','Thyroxine (T4) free [Mass/volume] in Serum or Plasma','30247','2024-10'); +INSERT INTO concepts VALUES('1_3016-3','3016-3','http://loinc.org','Thyrotropin [Units/volume] in Serum or Plassma','30163','2024-10'); +INSERT INTO concepts VALUES('1_1668-3','1668-3','http://loinc.org','17-Hydroxyprogesterone [Mass/volume] in Serrum or Plasma','16683','2024-10'); +INSERT INTO concepts VALUES('1_2077-6','2077-6','http://loinc.org','Chloride [Moles/volume] in Sweat','20776','2024-10'); +INSERT INTO concepts VALUES('1_2954-6','2954-6','http://loinc.org','Sodium [Moles/volume] in Sweat','29546','2024-10'); +INSERT INTO concepts VALUES('1_42940-7','42940-7','http://loinc.org','GALT gene allele 1 [Presence] in Blood by Molecular genetics method','429407','2024-10'); +INSERT INTO concepts VALUES('1_42941-5','42941-5','http://loinc.org','GALT gene allele 2 [Presence] in Blood by Molecular genetics method','429415','2024-10'); +INSERT INTO concepts VALUES('1_10970-2','10970-2','http://loinc.org','Galactose 1 phosphate uridyl transferase [Enzymatic activity/volume] in Blood','109702','2024-10'); +INSERT INTO concepts VALUES('1_2312-7','2312-7','http://loinc.org','Galactose 1 phosphate [Mass/volume] in Red Blood Cells','23127','2024-10'); +INSERT INTO concepts VALUES('1_33360-9','33360-9','http://loinc.org','Galactose 1 phosphate [Mass/mass] in Red Blood Cells','333609','2024-10'); +INSERT INTO concepts VALUES('1_38485-9','38485-9','http://loinc.org','Galactose 1 phosphate [Moles/mass] in Redd Blood Cells','384859','2024-10'); +INSERT INTO concepts VALUES('1_48767-8','48767-8','http://loinc.org','Annotation comment [Interpretation] Narrative','487678','2024-10'); +INSERT INTO concepts VALUES('1_33617-2','33617-2','http://loinc.org','HLA-DR+ cells [#/volume] in Blood','336172','2024-10'); +INSERT INTO concepts VALUES('1_15195-1','15195-1','http://loinc.org','CD3-CD19+ cells [#/volume] in Blood','151951','2024-10'); +INSERT INTO concepts VALUES('1_32519-1','32519-1','http://loinc.org','CD3-CD16+CD56+ (Natural killer) cells/1 100 cells in Unspecified specimen','325191','2024-10'); +INSERT INTO concepts VALUES('1_20604-5','20604-5','http://loinc.org','CD3-CD16+CD56+ (Natural killer) cells [# #/volume] in Unspecified specimen','206045','2024-10'); +INSERT INTO concepts VALUES('1_34475-4','34475-4','http://loinc.org','CD4+CD45RO+ cells [#/volume] in Blood','344754','2024-10'); +INSERT INTO concepts VALUES('1_41994-5','41994-5','http://loinc.org','CD4+CD45RO+ cells/100 cells in Blood','419945','2024-10'); +INSERT INTO concepts VALUES('1_26759-1','26759-1','http://loinc.org','CD4+CD45RA+ cells [#/volume] in Blood', '267591','2024-10'); +INSERT INTO concepts VALUES('1_17157-9','17157-9','http://loinc.org','CD45RA cells/100 cells in Blood','171579','2024-10'); +INSERT INTO concepts VALUES('1_31113-4','31113-4','http://loinc.org','HLA-DR+ cells/100 cells in Blood','311134','2024-10'); +INSERT INTO concepts VALUES('1_8122-4','8122-4','http://loinc.org','CD3 cells [#/volume] in Blood','81224','20224-10'); +INSERT INTO concepts VALUES('1_20599-7','20599-7','http://loinc.org','CD3 cells/100 cells in Unspecified specimen','205997','2024-10'); +INSERT INTO concepts VALUES('1_24467-3','24467-3','http://loinc.org','CD3+CD4+ (T4 helper) cells [#/volume] i in Blood','244673','2024-10'); +INSERT INTO concepts VALUES('1_14135-8','14135-8','http://loinc.org','CD3+CD8+ (T8 suppressor cells) cells [#/ /volume] in Blood','141358','2024-10'); +INSERT INTO concepts VALUES('1_8123-2','8123-2','http://loinc.org','CD3+CD4+ (T4 helper) cells/100 cells in B Blood','81232','2024-10'); +INSERT INTO concepts VALUES('1_32518-3','32518-3','http://loinc.org','CD3+CD8+ (T8 suppressor cells) cells/10 00 cells in Unspecified specimen','325183','2024-10'); +INSERT INTO concepts VALUES('1_20593-0','20593-0','http://loinc.org','CD19 cells/100 cells in Unspecified specimen','205930','2024-10'); +INSERT INTO concepts VALUES('1_54218-3','54218-3','http://loinc.org','CD3+CD4+ (T4 helper) cells/CD3+CD8+ ((T8 suppressor cells) cells [# Ratio] in Blood','542183','2024-10'); +INSERT INTO concepts VALUES('1_8118-2','8118-2','http://loinc.org','CD2 cells/100 cells in Blood','81182','20244-10'); +INSERT INTO concepts VALUES('1_9557-0','9557-0','http://loinc.org','CD2 cells [#/volume] in Blood','95570','20224-10'); +INSERT INTO concepts VALUES('1_49857-6','49857-6','http://loinc.org','SMN1 gene+SMN2 gene targeted mutation anaalysis in Blood or Tissue by Molecular genetics method Narrative','498576','2024-10'); +INSERT INTO concepts VALUES('1_35462-1','35462-1','http://loinc.org','SMN1 gene targeted mutation analysis in Blood or Tissue by Molecular genetics method Narrative','354621','2024-10'); +INSERT INTO concepts VALUES('1_54449-4','54449-4','http://loinc.org','SMN2 gene targeted mutation analysis in Blood or Tissue by Molecular genetics method Narrative','544494','2024-10'); + +-- Add Newborn Screening Metabolic Disorder Confirmatory Labs as valueset belonging to Newborn Screening condition +INSERT INTO condition_to_valueset VALUES('1529','1','16_20241015','Center for Public Health Innovation'); + +-- Add Newborn Screening Metabolic Disorder Confirmatory Labs valueset to concept mappings +INSERT INTO valueset_to_concept VALUES('45318','16_20241015','1_46252-3'); +INSERT INTO valueset_to_concept VALUES('45319','16_20241015','1_30191-1'); +INSERT INTO valueset_to_concept VALUES('45320','16_20241015','1_30551-6'); +INSERT INTO valueset_to_concept VALUES('45321','16_20241015','1_51413-3'); +INSERT INTO valueset_to_concept VALUES('45322','16_20241015','1_30531-8'); +INSERT INTO valueset_to_concept VALUES('45323','16_20241015','1_30349-5'); +INSERT INTO valueset_to_concept VALUES('45324','16_20241015','1_39001-3'); +INSERT INTO valueset_to_concept VALUES('45325','16_20241015','1_30358-6'); +INSERT INTO valueset_to_concept VALUES('45326','16_20241015','1_30540-9'); +INSERT INTO valueset_to_concept VALUES('45327','16_20241015','1_30541-7'); +INSERT INTO valueset_to_concept VALUES('45328','16_20241015','1_30327-1'); +INSERT INTO valueset_to_concept VALUES('45329','16_20241015','1_30328-9'); +INSERT INTO valueset_to_concept VALUES('45330','16_20241015','1_30331-3'); +INSERT INTO valueset_to_concept VALUES('45331','16_20241015','1_30332-1'); +INSERT INTO valueset_to_concept VALUES('45332','16_20241015','1_30233-1'); +INSERT INTO valueset_to_concept VALUES('45333','16_20241015','1_30564-9'); +INSERT INTO valueset_to_concept VALUES('45334','16_20241015','1_30565-6'); +INSERT INTO valueset_to_concept VALUES('45335','16_20241015','1_30566-4'); +INSERT INTO valueset_to_concept VALUES('45336','16_20241015','1_30190-3'); +INSERT INTO valueset_to_concept VALUES('45337','16_20241015','1_30238-0'); +INSERT INTO valueset_to_concept VALUES('45338','16_20241015','1_30356-0'); +INSERT INTO valueset_to_concept VALUES('45339','16_20241015','1_30357-8'); +INSERT INTO valueset_to_concept VALUES('45340','16_20241015','1_30235-6'); +INSERT INTO valueset_to_concept VALUES('45341','16_20241015','1_30234-9'); +INSERT INTO valueset_to_concept VALUES('45342','16_20241015','1_30560-7'); +INSERT INTO valueset_to_concept VALUES('45343','16_20241015','1_35656-8'); +INSERT INTO valueset_to_concept VALUES('45344','16_20241015','1_30542-5'); +INSERT INTO valueset_to_concept VALUES('45345','16_20241015','1_30312-3'); +INSERT INTO valueset_to_concept VALUES('45346','16_20241015','1_30534-2'); +INSERT INTO valueset_to_concept VALUES('45347','16_20241015','1_30237-2'); +INSERT INTO valueset_to_concept VALUES('45348','16_20241015','1_53718-3'); +INSERT INTO valueset_to_concept VALUES('45349','16_20241015','1_2161-8'); +INSERT INTO valueset_to_concept VALUES('45350','16_20241015','1_24442-6'); +INSERT INTO valueset_to_concept VALUES('45351','16_20241015','1_24437-6'); +INSERT INTO valueset_to_concept VALUES('45352','16_20241015','1_24438-4'); +INSERT INTO valueset_to_concept VALUES('45353','16_20241015','1_24439-2'); +INSERT INTO valueset_to_concept VALUES('45354','16_20241015','1_24440-0'); +INSERT INTO valueset_to_concept VALUES('45355','16_20241015','1_24435-0'); +INSERT INTO valueset_to_concept VALUES('45356','16_20241015','1_24441-8'); +INSERT INTO valueset_to_concept VALUES('45357','16_20241015','1_24443-4'); +INSERT INTO valueset_to_concept VALUES('45358','16_20241015','1_24436-8'); +INSERT INTO valueset_to_concept VALUES('45359','16_20241015','1_24444-2'); +INSERT INTO valueset_to_concept VALUES('45360','16_20241015','1_14286-9'); +INSERT INTO valueset_to_concept VALUES('45361','16_20241015','1_14288-5'); +INSERT INTO valueset_to_concept VALUES('45362','16_20241015','1_19074-4'); +INSERT INTO valueset_to_concept VALUES('45363','16_20241015','1_40869-0'); +INSERT INTO valueset_to_concept VALUES('45364','16_20241015','1_17866-5'); +INSERT INTO valueset_to_concept VALUES('45365','16_20241015','1_17867-3'); +INSERT INTO valueset_to_concept VALUES('45366','16_20241015','1_28589-0'); +INSERT INTO valueset_to_concept VALUES('45367','16_20241015','1_54442-9'); +INSERT INTO valueset_to_concept VALUES('45368','16_20241015','1_79291-1'); +INSERT INTO valueset_to_concept VALUES('45369','16_20241015','1_15045-8'); +INSERT INTO valueset_to_concept VALUES('45370','16_20241015','1_33244-5'); +INSERT INTO valueset_to_concept VALUES('45371','16_20241015','1_79292-9'); +INSERT INTO valueset_to_concept VALUES('45372','16_20241015','1_14683-7'); +INSERT INTO valueset_to_concept VALUES('45373','16_20241015','1_34275-8'); +INSERT INTO valueset_to_concept VALUES('45374','16_20241015','1_34155-2'); +INSERT INTO valueset_to_concept VALUES('45375','16_20241015','1_13500-4'); +INSERT INTO valueset_to_concept VALUES('45376','16_20241015','1_26604-9'); +INSERT INTO valueset_to_concept VALUES('45377','16_20241015','1_20636-7'); +INSERT INTO valueset_to_concept VALUES('45378','16_20241015','1_22670-4'); +INSERT INTO valueset_to_concept VALUES('45379','16_20241015','1_26600-7'); +INSERT INTO valueset_to_concept VALUES('45380','16_20241015','1_26609-8'); +INSERT INTO valueset_to_concept VALUES('45381','16_20241015','1_26605-6'); +INSERT INTO valueset_to_concept VALUES('45382','16_20241015','1_20634-2'); +INSERT INTO valueset_to_concept VALUES('45383','16_20241015','1_26599-1'); +INSERT INTO valueset_to_concept VALUES('45384','16_20241015','1_20637-5'); +INSERT INTO valueset_to_concept VALUES('45385','16_20241015','1_32227-1'); +INSERT INTO valueset_to_concept VALUES('45386','16_20241015','1_20638-3'); +INSERT INTO valueset_to_concept VALUES('45387','16_20241015','1_20639-1'); +INSERT INTO valueset_to_concept VALUES('45388','16_20241015','1_20640-9'); +INSERT INTO valueset_to_concept VALUES('45389','16_20241015','1_26607-2'); +INSERT INTO valueset_to_concept VALUES('45390','16_20241015','1_22672-0'); +INSERT INTO valueset_to_concept VALUES('45391','16_20241015','1_26608-0'); +INSERT INTO valueset_to_concept VALUES('45392','16_20241015','1_20642-5'); +INSERT INTO valueset_to_concept VALUES('45393','16_20241015','1_20643-3'); +INSERT INTO valueset_to_concept VALUES('45394','16_20241015','1_20644-1'); +INSERT INTO valueset_to_concept VALUES('45395','16_20241015','1_20645-8'); +INSERT INTO valueset_to_concept VALUES('45396','16_20241015','1_55876-7'); +INSERT INTO valueset_to_concept VALUES('45397','16_20241015','1_20646-6'); +INSERT INTO valueset_to_concept VALUES('45398','16_20241015','1_26610-6'); +INSERT INTO valueset_to_concept VALUES('45399','16_20241015','1_20647-4'); +INSERT INTO valueset_to_concept VALUES('45400','16_20241015','1_20648-2'); +INSERT INTO valueset_to_concept VALUES('45401','16_20241015','1_20649-0'); +INSERT INTO valueset_to_concept VALUES('45402','16_20241015','1_20650-8'); +INSERT INTO valueset_to_concept VALUES('45403','16_20241015','1_20651-6'); +INSERT INTO valueset_to_concept VALUES('45404','16_20241015','1_20652-4'); +INSERT INTO valueset_to_concept VALUES('45405','16_20241015','1_14875-9'); +INSERT INTO valueset_to_concept VALUES('45406','16_20241015','1_20655-7'); +INSERT INTO valueset_to_concept VALUES('45407','16_20241015','1_26613-0'); +INSERT INTO valueset_to_concept VALUES('45408','16_20241015','1_20656-5'); +INSERT INTO valueset_to_concept VALUES('45409','16_20241015','1_20657-3'); +INSERT INTO valueset_to_concept VALUES('45410','16_20241015','1_20658-1'); +INSERT INTO valueset_to_concept VALUES('45411','16_20241015','1_20659-9'); +INSERT INTO valueset_to_concept VALUES('45412','16_20241015','1_20660-7'); +INSERT INTO valueset_to_concept VALUES('45413','16_20241015','1_20661-5'); +INSERT INTO valueset_to_concept VALUES('45414','16_20241015','1_49248-8'); +INSERT INTO valueset_to_concept VALUES('45415','16_20241015','1_28588-2'); +INSERT INTO valueset_to_concept VALUES('45416','16_20241015','1_30068-1'); +INSERT INTO valueset_to_concept VALUES('45417','16_20241015','1_28598-1'); +INSERT INTO valueset_to_concept VALUES('45418','16_20241015','1_28590-8'); +INSERT INTO valueset_to_concept VALUES('45419','16_20241015','1_28596-5'); +INSERT INTO valueset_to_concept VALUES('45420','16_20241015','1_30062-4'); +INSERT INTO valueset_to_concept VALUES('45421','16_20241015','1_32229-7'); +INSERT INTO valueset_to_concept VALUES('45422','16_20241015','1_28603-9'); +INSERT INTO valueset_to_concept VALUES('45423','16_20241015','1_30061-6'); +INSERT INTO valueset_to_concept VALUES('45424','16_20241015','1_28602-1'); +INSERT INTO valueset_to_concept VALUES('45425','16_20241015','1_30161-4'); +INSERT INTO valueset_to_concept VALUES('45426','16_20241015','1_28599-9'); +INSERT INTO valueset_to_concept VALUES('45427','16_20241015','1_30065-7'); +INSERT INTO valueset_to_concept VALUES('45428','16_20241015','1_28605-4'); +INSERT INTO valueset_to_concept VALUES('45429','16_20241015','1_28593-2'); +INSERT INTO valueset_to_concept VALUES('45430','16_20241015','1_30059-0'); +INSERT INTO valueset_to_concept VALUES('45431','16_20241015','1_30056-6'); +INSERT INTO valueset_to_concept VALUES('45432','16_20241015','1_30066-5'); +INSERT INTO valueset_to_concept VALUES('45433','16_20241015','1_30047-5'); +INSERT INTO valueset_to_concept VALUES('45434','16_20241015','1_32248-7'); +INSERT INTO valueset_to_concept VALUES('45435','16_20241015','1_30050-9'); +INSERT INTO valueset_to_concept VALUES('45436','16_20241015','1_28601-3'); +INSERT INTO valueset_to_concept VALUES('45437','16_20241015','1_30052-5'); +INSERT INTO valueset_to_concept VALUES('45438','16_20241015','1_30053-3'); +INSERT INTO valueset_to_concept VALUES('45439','16_20241015','1_30048-3'); +INSERT INTO valueset_to_concept VALUES('45440','16_20241015','1_30063-2'); +INSERT INTO valueset_to_concept VALUES('45441','16_20241015','1_30049-1'); +INSERT INTO valueset_to_concept VALUES('45442','16_20241015','1_30055-8'); +INSERT INTO valueset_to_concept VALUES('45443','16_20241015','1_30067-3'); +INSERT INTO valueset_to_concept VALUES('45444','16_20241015','1_28610-4'); +INSERT INTO valueset_to_concept VALUES('45445','16_20241015','1_30058-2'); +INSERT INTO valueset_to_concept VALUES('45446','16_20241015','1_28595-7'); +INSERT INTO valueset_to_concept VALUES('45447','16_20241015','1_30057-4'); +INSERT INTO valueset_to_concept VALUES('45448','16_20241015','1_28608-8'); +INSERT INTO valueset_to_concept VALUES('45449','16_20241015','1_30054-1'); +INSERT INTO valueset_to_concept VALUES('45450','16_20241015','1_30064-0'); +INSERT INTO valueset_to_concept VALUES('45451','16_20241015','1_33477-1'); +INSERT INTO valueset_to_concept VALUES('45452','16_20241015','1_25112-4'); +INSERT INTO valueset_to_concept VALUES('45453','16_20241015','1_25132-2'); +INSERT INTO valueset_to_concept VALUES('45454','16_20241015','1_25136-3'); +INSERT INTO valueset_to_concept VALUES('45455','16_20241015','1_29507-1'); +INSERT INTO valueset_to_concept VALUES('45456','16_20241015','1_25101-7'); +INSERT INTO valueset_to_concept VALUES('45457','16_20241015','1_25116-5'); +INSERT INTO valueset_to_concept VALUES('45458','16_20241015','1_29509-7'); +INSERT INTO valueset_to_concept VALUES('45459','16_20241015','1_29524-6'); +INSERT INTO valueset_to_concept VALUES('45460','16_20241015','1_25083-7'); +INSERT INTO valueset_to_concept VALUES('45461','16_20241015','1_25084-5'); +INSERT INTO valueset_to_concept VALUES('45462','16_20241015','1_25085-2'); +INSERT INTO valueset_to_concept VALUES('45463','16_20241015','1_25099-3'); +INSERT INTO valueset_to_concept VALUES('45464','16_20241015','1_29859-6'); +INSERT INTO valueset_to_concept VALUES('45465','16_20241015','1_25135-5'); +INSERT INTO valueset_to_concept VALUES('45466','16_20241015','1_25134-8'); +INSERT INTO valueset_to_concept VALUES('45467','16_20241015','1_25088-6'); +INSERT INTO valueset_to_concept VALUES('45468','16_20241015','1_25089-4'); +INSERT INTO valueset_to_concept VALUES('45469','16_20241015','1_29519-6'); +INSERT INTO valueset_to_concept VALUES('45470','16_20241015','1_25137-1'); +INSERT INTO valueset_to_concept VALUES('45471','16_20241015','1_1982-8'); +INSERT INTO valueset_to_concept VALUES('45472','16_20241015','1_54457-7'); +INSERT INTO valueset_to_concept VALUES('45473','16_20241015','1_3024-7'); +INSERT INTO valueset_to_concept VALUES('45474','16_20241015','1_3016-3'); +INSERT INTO valueset_to_concept VALUES('45475','16_20241015','1_1668-3'); +INSERT INTO valueset_to_concept VALUES('45476','16_20241015','1_2077-6'); +INSERT INTO valueset_to_concept VALUES('45477','16_20241015','1_2954-6'); +INSERT INTO valueset_to_concept VALUES('45478','16_20241015','1_42940-7'); +INSERT INTO valueset_to_concept VALUES('45479','16_20241015','1_42941-5'); +INSERT INTO valueset_to_concept VALUES('45480','16_20241015','1_10970-2'); +INSERT INTO valueset_to_concept VALUES('45481','16_20241015','1_2312-7'); +INSERT INTO valueset_to_concept VALUES('45482','16_20241015','1_33360-9'); +INSERT INTO valueset_to_concept VALUES('45483','16_20241015','1_38485-9'); +INSERT INTO valueset_to_concept VALUES('45484','16_20241015','1_48767-8'); +INSERT INTO valueset_to_concept VALUES('45485','16_20241015','1_33617-2'); +INSERT INTO valueset_to_concept VALUES('45486','16_20241015','1_15195-1'); +INSERT INTO valueset_to_concept VALUES('45487','16_20241015','1_32519-1'); +INSERT INTO valueset_to_concept VALUES('45488','16_20241015','1_20604-5'); +INSERT INTO valueset_to_concept VALUES('45489','16_20241015','1_34475-4'); +INSERT INTO valueset_to_concept VALUES('45490','16_20241015','1_41994-5'); +INSERT INTO valueset_to_concept VALUES('45491','16_20241015','1_26759-1'); +INSERT INTO valueset_to_concept VALUES('45492','16_20241015','1_17157-9'); +INSERT INTO valueset_to_concept VALUES('45493','16_20241015','1_31113-4'); +INSERT INTO valueset_to_concept VALUES('45494','16_20241015','1_8122-4'); +INSERT INTO valueset_to_concept VALUES('45495','16_20241015','1_20599-7'); +INSERT INTO valueset_to_concept VALUES('45496','16_20241015','1_24467-3'); +INSERT INTO valueset_to_concept VALUES('45497','16_20241015','1_14135-8'); +INSERT INTO valueset_to_concept VALUES('45498','16_20241015','1_8123-2'); +INSERT INTO valueset_to_concept VALUES('45499','16_20241015','1_32518-3'); +INSERT INTO valueset_to_concept VALUES('45500','16_20241015','1_20593-0'); +INSERT INTO valueset_to_concept VALUES('45501','16_20241015','1_54218-3'); +INSERT INTO valueset_to_concept VALUES('45502','16_20241015','1_8118-2'); +INSERT INTO valueset_to_concept VALUES('45503','16_20241015','1_9557-0'); +INSERT INTO valueset_to_concept VALUES('45504','16_20241015','1_49857-6'); +INSERT INTO valueset_to_concept VALUES('45505','16_20241015','1_35462-1'); +INSERT INTO valueset_to_concept VALUES('45506','16_20241015','1_54449-4'); + +-- Insert relevant query data +-- Map the new valueset to the Newborn Screening query & get the newly created id +WITH inserted AS ( + INSERT INTO query_to_valueset (id, query_id, valueset_id, valueset_oid) + VALUES ( + uuid_generate_v4(), + (SELECT id FROM query WHERE query_name = 'Newborn Screening'), + '16_20241015', + '16' + ) + RETURNING id +) +-- Insert the concepts from the valueset into the query_included_concepts table +INSERT INTO query_included_concepts (id, query_by_valueset_id, concept_id, include) +SELECT + uuid_generate_v4(), + (SELECT id FROM inserted), + concept_id, + true +FROM valueset_to_concept +WHERE valueset_id = '16_20241015'; diff --git a/query-connector/package-lock.json b/query-connector/package-lock.json index 423e18962..20e6cac43 100644 --- a/query-connector/package-lock.json +++ b/query-connector/package-lock.json @@ -20,7 +20,7 @@ "html-react-parser": "^5.1.4", "jose": "5.2.2", "js-yaml": "4.1.0", - "next": "14.2.4", + "next": "14.2.10", "node-fetch": "^2.7.0", "pg": "^8.12.0", "pg-promise": "^11.5.4", @@ -2854,9 +2854,9 @@ } }, "node_modules/@next/env": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.4.tgz", - "integrity": "sha512-3EtkY5VDkuV2+lNmKlbkibIJxcO4oIHEhBWne6PaAp+76J9KoSsGvNikp6ivzAT8dhhBMYrm6op2pS1ApG0Hzg==" + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.10.tgz", + "integrity": "sha512-dZIu93Bf5LUtluBXIv4woQw2cZVZ2DJTjax5/5DOs3lzEOeKLy7GxRSr4caK9/SCPdaW6bCgpye6+n4Dh9oJPw==" }, "node_modules/@next/eslint-plugin-next": { "version": "14.2.15", @@ -2869,9 +2869,9 @@ } }, "node_modules/@next/swc-darwin-arm64": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.4.tgz", - "integrity": "sha512-AH3mO4JlFUqsYcwFUHb1wAKlebHU/Hv2u2kb1pAuRanDZ7pD/A/KPD98RHZmwsJpdHQwfEc/06mgpSzwrJYnNg==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.10.tgz", + "integrity": "sha512-V3z10NV+cvMAfxQUMhKgfQnPbjw+Ew3cnr64b0lr8MDiBJs3eLnM6RpGC46nhfMZsiXgQngCJKWGTC/yDcgrDQ==", "cpu": [ "arm64" ], @@ -2884,9 +2884,9 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.4.tgz", - "integrity": "sha512-QVadW73sWIO6E2VroyUjuAxhWLZWEpiFqHdZdoQ/AMpN9YWGuHV8t2rChr0ahy+irKX5mlDU7OY68k3n4tAZTg==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.10.tgz", + "integrity": "sha512-Y0TC+FXbFUQ2MQgimJ/7Ina2mXIKhE7F+GUe1SgnzRmwFY3hX2z8nyVCxE82I2RicspdkZnSWMn4oTjIKz4uzA==", "cpu": [ "x64" ], @@ -2899,9 +2899,9 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.4.tgz", - "integrity": "sha512-KT6GUrb3oyCfcfJ+WliXuJnD6pCpZiosx2X3k66HLR+DMoilRb76LpWPGb4tZprawTtcnyrv75ElD6VncVamUQ==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.10.tgz", + "integrity": "sha512-ZfQ7yOy5zyskSj9rFpa0Yd7gkrBnJTkYVSya95hX3zeBG9E55Z6OTNPn1j2BTFWvOVVj65C3T+qsjOyVI9DQpA==", "cpu": [ "arm64" ], @@ -2914,9 +2914,9 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.4.tgz", - "integrity": "sha512-Alv8/XGSs/ytwQcbCHwze1HmiIkIVhDHYLjczSVrf0Wi2MvKn/blt7+S6FJitj3yTlMwMxII1gIJ9WepI4aZ/A==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.10.tgz", + "integrity": "sha512-n2i5o3y2jpBfXFRxDREr342BGIQCJbdAUi/K4q6Env3aSx8erM9VuKXHw5KNROK9ejFSPf0LhoSkU/ZiNdacpQ==", "cpu": [ "arm64" ], @@ -2929,9 +2929,9 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.4.tgz", - "integrity": "sha512-ze0ShQDBPCqxLImzw4sCdfnB3lRmN3qGMB2GWDRlq5Wqy4G36pxtNOo2usu/Nm9+V2Rh/QQnrRc2l94kYFXO6Q==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.10.tgz", + "integrity": "sha512-GXvajAWh2woTT0GKEDlkVhFNxhJS/XdDmrVHrPOA83pLzlGPQnixqxD8u3bBB9oATBKB//5e4vpACnx5Vaxdqg==", "cpu": [ "x64" ], @@ -2944,9 +2944,9 @@ } }, "node_modules/@next/swc-linux-x64-musl": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.4.tgz", - "integrity": "sha512-8dwC0UJoc6fC7PX70csdaznVMNr16hQrTDAMPvLPloazlcaWfdPogq+UpZX6Drqb1OBlwowz8iG7WR0Tzk/diQ==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.10.tgz", + "integrity": "sha512-opFFN5B0SnO+HTz4Wq4HaylXGFV+iHrVxd3YvREUX9K+xfc4ePbRrxqOuPOFjtSuiVouwe6uLeDtabjEIbkmDA==", "cpu": [ "x64" ], @@ -2959,9 +2959,9 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.4.tgz", - "integrity": "sha512-jxyg67NbEWkDyvM+O8UDbPAyYRZqGLQDTPwvrBBeOSyVWW/jFQkQKQ70JDqDSYg1ZDdl+E3nkbFbq8xM8E9x8A==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.10.tgz", + "integrity": "sha512-9NUzZuR8WiXTvv+EiU/MXdcQ1XUvFixbLIMNQiVHuzs7ZIFrJDLJDaOF1KaqttoTujpcxljM/RNAOmw1GhPPQQ==", "cpu": [ "arm64" ], @@ -2974,9 +2974,9 @@ } }, "node_modules/@next/swc-win32-ia32-msvc": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.4.tgz", - "integrity": "sha512-twrmN753hjXRdcrZmZttb/m5xaCBFa48Dt3FbeEItpJArxriYDunWxJn+QFXdJ3hPkm4u7CKxncVvnmgQMY1ag==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.10.tgz", + "integrity": "sha512-fr3aEbSd1GeW3YUMBkWAu4hcdjZ6g4NBl1uku4gAn661tcxd1bHs1THWYzdsbTRLcCKLjrDZlNp6j2HTfrw+Bg==", "cpu": [ "ia32" ], @@ -2989,9 +2989,9 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.4.tgz", - "integrity": "sha512-tkLrjBzqFTP8DVrAAQmZelEahfR9OxWpFR++vAI9FBhCiIxtwHwBHC23SBHCTURBtwB4kc/x44imVOnkKGNVGg==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.10.tgz", + "integrity": "sha512-UjeVoRGKNL2zfbcQ6fscmgjBAS/inHBh63mjIlfPg/NG8Yn2ztqylXt5qilYb6hoHIwaU2ogHknHWWmahJjgZQ==", "cpu": [ "x64" ], @@ -11871,11 +11871,11 @@ "license": "MIT" }, "node_modules/next": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/next/-/next-14.2.4.tgz", - "integrity": "sha512-R8/V7vugY+822rsQGQCjoLhMuC9oFj9SOi4Cl4b2wjDrseD0LRZ10W7R6Czo4w9ZznVSshKjuIomsRjvm9EKJQ==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/next/-/next-14.2.10.tgz", + "integrity": "sha512-sDDExXnh33cY3RkS9JuFEKaS4HmlWmDKP1VJioucCG6z5KuA008DPsDZOzi8UfqEk3Ii+2NCQSJrfbEWtZZfww==", "dependencies": { - "@next/env": "14.2.4", + "@next/env": "14.2.10", "@swc/helpers": "0.5.5", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", @@ -11890,15 +11890,15 @@ "node": ">=18.17.0" }, "optionalDependencies": { - "@next/swc-darwin-arm64": "14.2.4", - "@next/swc-darwin-x64": "14.2.4", - "@next/swc-linux-arm64-gnu": "14.2.4", - "@next/swc-linux-arm64-musl": "14.2.4", - "@next/swc-linux-x64-gnu": "14.2.4", - "@next/swc-linux-x64-musl": "14.2.4", - "@next/swc-win32-arm64-msvc": "14.2.4", - "@next/swc-win32-ia32-msvc": "14.2.4", - "@next/swc-win32-x64-msvc": "14.2.4" + "@next/swc-darwin-arm64": "14.2.10", + "@next/swc-darwin-x64": "14.2.10", + "@next/swc-linux-arm64-gnu": "14.2.10", + "@next/swc-linux-arm64-musl": "14.2.10", + "@next/swc-linux-x64-gnu": "14.2.10", + "@next/swc-linux-x64-musl": "14.2.10", + "@next/swc-win32-arm64-msvc": "14.2.10", + "@next/swc-win32-ia32-msvc": "14.2.10", + "@next/swc-win32-x64-msvc": "14.2.10" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", diff --git a/query-connector/package.json b/query-connector/package.json index 6beee41b9..78b102990 100644 --- a/query-connector/package.json +++ b/query-connector/package.json @@ -34,7 +34,7 @@ "html-react-parser": "^5.1.4", "jose": "5.2.2", "js-yaml": "4.1.0", - "next": "14.2.4", + "next": "14.2.10", "node-fetch": "^2.7.0", "pg": "^8.12.0", "pg-promise": "^11.5.4", diff --git a/secret.out b/secret.out deleted file mode 100644 index e69de29bb..000000000