fix(sr): dcm4chee requires the patient name for an SR to match what is in the original study (#3739)

This commit is contained in:
Joe Boccanfuso 2023-10-24 13:06:12 -04:00 committed by GitHub
parent 3bbbcea0d7
commit d98439fe7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 37 additions and 12 deletions

View File

@ -36,7 +36,7 @@
"@ohif/extension-cornerstone": "3.8.0-beta.4", "@ohif/extension-cornerstone": "3.8.0-beta.4",
"@ohif/extension-measurement-tracking": "3.8.0-beta.4", "@ohif/extension-measurement-tracking": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4", "@ohif/ui": "3.8.0-beta.4",
"dcmjs": "^0.29.5", "dcmjs": "^0.29.11",
"dicom-parser": "^1.8.9", "dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",

View File

@ -360,7 +360,7 @@ function OHIFCornerstoneSRViewport(props) {
patientSex: PatientSex || '', patientSex: PatientSex || '',
patientAge: PatientAge || '', patientAge: PatientAge || '',
MRN: PatientID || '', MRN: PatientID || '',
thickness: SliceThickness ? `${SliceThickness.toFixed(2)}mm` : '', thickness: SliceThickness ? `${parseFloat(SliceThickness).toFixed(2)}mm` : '',
spacing: spacing:
SpacingBetweenSlices !== undefined ? `${SpacingBetweenSlices.toFixed(2)}mm` : '', SpacingBetweenSlices !== undefined ? `${SpacingBetweenSlices.toFixed(2)}mm` : '',
scanner: ManufacturerModelName || '', scanner: ManufacturerModelName || '',

View File

@ -39,7 +39,7 @@
"@cornerstonejs/dicom-image-loader": "^1.20.3", "@cornerstonejs/dicom-image-loader": "^1.20.3",
"@ohif/core": "3.8.0-beta.4", "@ohif/core": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4", "@ohif/ui": "3.8.0-beta.4",
"dcmjs": "^0.29.6", "dcmjs": "^0.29.11",
"dicom-parser": "^1.8.21", "dicom-parser": "^1.8.21",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",

View File

@ -32,7 +32,7 @@
"peerDependencies": { "peerDependencies": {
"@ohif/core": "3.8.0-beta.4", "@ohif/core": "3.8.0-beta.4",
"@ohif/i18n": "3.8.0-beta.4", "@ohif/i18n": "3.8.0-beta.4",
"dcmjs": "^0.29.5", "dcmjs": "^0.29.11",
"dicomweb-client": "^0.10.2", "dicomweb-client": "^0.10.2",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react": "^17.0.2", "react": "^17.0.2",

View File

@ -30,7 +30,7 @@
"peerDependencies": { "peerDependencies": {
"@ohif/core": "3.8.0-beta.4", "@ohif/core": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4", "@ohif/ui": "3.8.0-beta.4",
"dcmjs": "^0.29.5", "dcmjs": "^0.29.11",
"dicom-parser": "^1.8.9", "dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",

View File

@ -30,7 +30,7 @@
"peerDependencies": { "peerDependencies": {
"@ohif/core": "3.8.0-beta.4", "@ohif/core": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4", "@ohif/ui": "3.8.0-beta.4",
"dcmjs": "^0.29.5", "dcmjs": "^0.29.11",
"dicom-parser": "^1.8.9", "dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",

View File

@ -36,7 +36,7 @@
"@ohif/extension-cornerstone-dicom-sr": "3.8.0-beta.4", "@ohif/extension-cornerstone-dicom-sr": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4", "@ohif/ui": "3.8.0-beta.4",
"classnames": "^2.3.2", "classnames": "^2.3.2",
"dcmjs": "^0.29.5", "dcmjs": "^0.29.11",
"lodash.debounce": "^4.17.21", "lodash.debounce": "^4.17.21",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react": "^17.0.2", "react": "^17.0.2",

View File

@ -30,7 +30,7 @@
"peerDependencies": { "peerDependencies": {
"@ohif/core": "3.8.0-beta.4", "@ohif/core": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4", "@ohif/ui": "3.8.0-beta.4",
"dcmjs": "0.29.4", "dcmjs": "0.29.11",
"dicom-parser": "^1.8.9", "dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",

View File

@ -30,7 +30,7 @@
"peerDependencies": { "peerDependencies": {
"@ohif/core": "3.8.0-beta.4", "@ohif/core": "3.8.0-beta.4",
"@ohif/ui": "3.8.0-beta.4", "@ohif/ui": "3.8.0-beta.4",
"dcmjs": "^0.29.5", "dcmjs": "^0.29.11",
"dicom-parser": "^1.8.9", "dicom-parser": "^1.8.9",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",

View File

@ -72,7 +72,7 @@
"classnames": "^2.3.2", "classnames": "^2.3.2",
"core-js": "^3.16.1", "core-js": "^3.16.1",
"cornerstone-math": "^0.1.9", "cornerstone-math": "^0.1.9",
"dcmjs": "^0.29.5", "dcmjs": "^0.29.11",
"detect-gpu": "^4.0.16", "detect-gpu": "^4.0.16",
"dicom-parser": "^1.8.9", "dicom-parser": "^1.8.9",
"dotenv-webpack": "^1.7.0", "dotenv-webpack": "^1.7.0",

View File

@ -42,7 +42,7 @@
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.20.13", "@babel/runtime": "^7.20.13",
"dcmjs": "^0.29.5", "dcmjs": "^0.29.11",
"dicomweb-client": "^0.10.2", "dicomweb-client": "^0.10.2",
"gl-matrix": "^3.4.3", "gl-matrix": "^3.4.3",
"isomorphic-base64": "^1.0.2", "isomorphic-base64": "^1.0.2",

View File

@ -154,6 +154,18 @@ Your public folder should look like this:
![](../../assets/img/dicom-json-public.png) ![](../../assets/img/dicom-json-public.png)
:::tip
It is important to URL encode the `url` query parameter especially if the `url`
parameter itself also contains query parameters. So for example,
`http://localhost:3000/viewer/dicomjson?url=http://localhost:3000/LIDC-IDRI-0001.json?key0=val0&key1=val1`
should be...
`http://localhost:3000/viewer/dicomjson?url=http://localhost:3000/LIDC-IDRI-0001.json?key0=val0%26key1=val1`
Notice the ampersand (`&`) is encoded as `%26`.
:::
:::note :::note
When hosting the DICOM JSON files, it is important to be aware that certain providers When hosting the DICOM JSON files, it is important to be aware that certain providers

View File

@ -8436,7 +8436,20 @@ dcmjs@^0.27:
loglevelnext "^3.0.1" loglevelnext "^3.0.1"
ndarray "^1.0.19" ndarray "^1.0.19"
dcmjs@^0.29.5, dcmjs@^0.29.8: dcmjs@^0.29.11:
version "0.29.11"
resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.29.11.tgz#82e19d7c5212218c3225f8022ce97b0102ed3cc8"
integrity sha512-B5fO5D+USzfnuUG7ephnaKMluqBOP4qcckV2LgROXvn0hmWc53Gs2YzlokjcYcDeBAXNfssOOhDekUc+AduwkQ==
dependencies:
"@babel/runtime-corejs3" "^7.22.5"
adm-zip "^0.5.10"
gl-matrix "^3.1.0"
lodash.clonedeep "^4.5.0"
loglevelnext "^3.0.1"
ndarray "^1.0.19"
pako "^2.0.4"
dcmjs@^0.29.8:
version "0.29.8" version "0.29.8"
resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.29.8.tgz#3daa5224f8e75b2e5b069590bef26a272741fa44" resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.29.8.tgz#3daa5224f8e75b2e5b069590bef26a272741fa44"
integrity sha512-Y0/KZAmT1siVo7eH3KK4ZflEbNi61soUpD0N7lsXMVVJQ6IZkHlaSzb9DtqnEpMs7RJDfvZGr1uXpv1vBBIypQ== integrity sha512-Y0/KZAmT1siVo7eH3KK4ZflEbNi61soUpD0N7lsXMVVJQ6IZkHlaSzb9DtqnEpMs7RJDfvZGr1uXpv1vBBIypQ==