Mercurial > hg > orthanc-tests
changeset 698:7282c2df963d
tests for new DICOMWeb JSON DS handling
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Wed, 25 Sep 2024 19:37:06 +0200 |
| parents | b2c3ba1adf55 |
| children | e3d41c4168c3 8561d9c88d1a |
| files | Database/DummyCT.json Database/HierarchicalAnonymization/StructuredReports/IM0.json Database/MarekLatin2.json Plugins/DicomWeb/Run.py Tests/Tests.py |
| diffstat | 5 files changed, 1158 insertions(+), 1598 deletions(-) [+] |
line wrap: on
line diff
--- a/Database/DummyCT.json Mon Sep 23 15:40:57 2024 +0200 +++ b/Database/DummyCT.json Wed Sep 25 19:37:06 2024 +0200 @@ -1,616 +1,423 @@ { - "00080005": { - "Value": [ - "ISO_IR 100" - ], - "vr": "CS" - }, - "00080008": { - "Value": [ - "ORIGINAL", - "PRIMARY", - "OTHER" - ], - "vr": "CS" - }, - "00080012": { - "Value": [ - "20070101" - ], - "vr": "DA" - }, - "00080013": { - "Value": [ - "120000.000000" - ], - "vr": "TM" - }, - "00080016": { - "Value": [ - "1.2.840.10008.5.1.4.1.1.4" - ], - "vr": "UI" - }, - "00080018": { - "Value": [ - "1.2.840.113619.2.176.2025.1499492.7040.1171286242.109" - ], - "vr": "UI" - }, - "00080020": { - "Value": [ - "20070101" - ], - "vr": "DA" - }, - "00080021": { - "Value": [ - "20070101" - ], - "vr": "DA" - }, - "00080022": { - "Value": [ - "20070101" - ], - "vr": "DA" - }, - "00080023": { - "Value": [ - "20070101" - ], - "vr": "DA" - }, - "0008002A": { - "Value": [ - "20070101120000" - ], - "vr": "DT" - }, - "00080030": { - "Value": [ - "120000.000000" - ], - "vr": "TM" - }, - "00080031": { - "Value": [ - "120000.000000" - ], - "vr": "TM" - }, - "00080032": { - "Value": [ - "120000.000000" - ], - "vr": "TM" - }, - "00080033": { - "Value": [ - "120000.000000" - ], - "vr": "TM" - }, - "00080060": { - "Value": [ - "MR" - ], - "vr": "CS" - }, - "00080070": { - "Value": [ - "GE MEDICAL SYSTEMS" - ], - "vr": "LO" - }, - "00080080": { - "Value": [ - "0ECJ52puWpVIjTuhnBA0um" - ], - "vr": "LO" - }, - "00080090": { - "Value": [ - { - "Alphabetic": "1" - } - ], - "vr": "PN" - }, - "00081010": { - "Value": [ - "TWINOW" - ], - "vr": "SH" - }, - "00081030": { - "Value": [ - "Knee (R)" - ], - "vr": "LO" - }, - "0008103E": { - "Value": [ - "AX. FSE PD" - ], - "vr": "LO" - }, - "00081060": { - "Value": [ - { - "Alphabetic": "ajb" - } - ], - "vr": "PN" - }, - "00081070": { - "Value": [ - { - "Alphabetic": "ca" - } - ], - "vr": "PN" - }, - "00081090": { - "Value": [ - "SIGNA EXCITE" - ], - "vr": "LO" - }, - "00081140": { - "Value": [ - { - "00081150": { - "Value": [ - "1.2.840.10008.5.1.4.1.1.4" - ], - "vr": "UI" - }, - "00081155": { - "Value": [ - "1.2.840.113619.2.176.2025.1499492.7040.1171286241.719" - ], - "vr": "UI" - } - }, - { - "00081150": { - "Value": [ - "1.2.840.10008.5.1.4.1.1.4" - ], - "vr": "UI" - }, - "00081155": { - "Value": [ - "1.2.840.113619.2.176.2025.1499492.7040.1171286241.726" - ], - "vr": "UI" - } - } - ], - "vr": "SQ" - }, - "00082111": { - "Value": [ - "Lossless JPEG compression, selection value 1, point transform 0, compression ratio 2.1453 [Lossless JPEG compression, selection value 1, point transform 0, compression ratio 2.1453]" - ], - "vr": "ST" - }, - "00089215": { - "Value": [ - { - "00080100": { - "Value": [ - "121327" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "DCM" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Full fidelity image, uncompressed or lossless compressed" - ], - "vr": "LO" - } - } - ], - "vr": "SQ" - }, - "00100010": { - "Value": [ - { - "Alphabetic": "KNIX" - } - ], - "vr": "PN" - }, - "00100020": { - "Value": [ - "ozp00SjY2xG" - ], - "vr": "LO" - }, - "00101010": { - "Value": [ - "000Y" - ], - "vr": "AS" - }, - "00101030": { - "Value": [ - 0 - ], - "vr": "DS" - }, - "00180020": { - "Value": [ - "SE" - ], - "vr": "CS" - }, - "00180021": { - "Value": [ - "SK", - "OSP" - ], - "vr": "CS" - }, - "00180022": { - "Value": [ - "SAT_GEMS", - "NPW", - "TRF_GEMS", - "FILTERED_GEMS", - "FS" - ], - "vr": "CS" - }, - "00180023": { - "Value": [ - "2D" - ], - "vr": "CS" - }, - "00180025": { - "Value": [ - "N" - ], - "vr": "CS" - }, - "00180050": { - "Value": [ - 4 - ], - "vr": "DS" - }, - "00180080": { - "Value": [ - 2800 - ], - "vr": "DS" - }, - "00180081": { - "Value": [ - 27.524 - ], - "vr": "DS" - }, - "00180082": { - "Value": [ - 0 - ], - "vr": "DS" - }, - "00180083": { - "Value": [ - 1 - ], - "vr": "DS" - }, - "00180084": { - "Value": [ - 63.860145 - ], - "vr": "DS" - }, - "00180085": { - "Value": [ - "1H" - ], - "vr": "SH" - }, - "00180086": { - "Value": [ - 1 - ], - "vr": "IS" - }, - "00180087": { - "Value": [ - 1.5 - ], - "vr": "DS" - }, - "00180088": { - "Value": [ - 4.5 - ], - "vr": "DS" - }, - "00180091": { - "Value": [ - 10 - ], - "vr": "IS" - }, - "00180093": { - "Value": [ - 100 - ], - "vr": "DS" - }, - "00180094": { - "Value": [ - 100 - ], - "vr": "DS" - }, - "00180095": { - "Value": [ - 162.773 - ], - "vr": "DS" - }, - "00181000": { - "Value": [ - "0000000843815bmr" - ], - "vr": "LO" - }, - "00181020": { - "Value": [ - "12", - "LX", - "MR Software release:12.0_M5_0606.b" - ], - "vr": "LO" - }, - "00181030": { - "Value": [ - "324-58-2995/6" - ], - "vr": "LO" - }, - "00181088": { - "Value": [ - 474 - ], - "vr": "IS" - }, - "00181090": { - "Value": [ - 0 - ], - "vr": "IS" - }, - "00181094": { - "Value": [ - 0 - ], - "vr": "IS" - }, - "00181100": { - "Value": [ - 170 - ], - "vr": "DS" - }, - "00181250": { - "Value": [ - "HD TRknee PA" - ], - "vr": "SH" - }, - "00181310": { - "Value": [ - 0, - 384, - 224, - 0 - ], - "vr": "US" - }, - "00181312": { - "Value": [ - "ROW" - ], - "vr": "CS" - }, - "00181314": { - "Value": [ - 90 - ], - "vr": "DS" - }, - "00181315": { - "Value": [ - "N" - ], - "vr": "CS" - }, - "00181316": { - "Value": [ - 0.0533 - ], - "vr": "DS" - }, - "00185100": { - "Value": [ - "FFS" - ], - "vr": "CS" - }, - "0020000D": { - "Value": [ - "1.2.840.113619.2.176.2025.1499492.7391.1171285944.390" - ], - "vr": "UI" - }, - "0020000E": { - "Value": [ - "1.2.840.113619.2.176.2025.1499492.7391.1171285944.394" - ], - "vr": "UI" - }, - "00200010": { - "Value": [ - "1" - ], - "vr": "SH" - }, - "00200011": { - "Value": [ - 5 - ], - "vr": "IS" - }, - "00200012": { - "Value": [ - 1 - ], - "vr": "IS" - }, - "00200013": { - "Value": [ - 1 - ], - "vr": "IS" - }, - "00200032": { - "Value": [ - -149.033, - -118.499, - -61.0464 - ], - "vr": "DS" - }, - "00200037": { - "Value": [ - 0.999841, - 0.000366209, - 0.0178227, - -0.000427244, - 0.999995, - 0.00326545 - ], - "vr": "DS" - }, - "00200052": { - "Value": [ - "1.2.840.113619.2.176.2025.1499492.7391.1171285944.389" - ], - "vr": "UI" - }, - "00201002": { - "Value": [ - 24 - ], - "vr": "IS" - }, - "00201041": { - "Value": [ - -59.25741196 - ], - "vr": "DS" - }, - "00280002": { - "Value": [ - 1 - ], - "vr": "US" - }, - "00280004": { - "Value": [ - "MONOCHROME2" - ], - "vr": "CS" - }, - "00280010": { - "Value": [ - 512 - ], - "vr": "US" - }, - "00280011": { - "Value": [ - 512 - ], - "vr": "US" - }, - "00280030": { - "Value": [ - 0.332, - 0.332 - ], - "vr": "DS" - }, - "00280100": { - "Value": [ - 16 - ], - "vr": "US" - }, - "00280101": { - "Value": [ - 16 - ], - "vr": "US" - }, - "00280102": { - "Value": [ - 15 - ], - "vr": "US" - }, - "00280103": { - "Value": [ - 1 - ], - "vr": "US" - }, - "00280106": { - "Value": [ - 0 - ], - "vr": "SS" - }, - "00280107": { - "Value": [ - 5145 - ], - "vr": "SS" - }, - "00280120": { - "Value": [ - 0 - ], - "vr": "SS" - }, - "00281050": { - "Value": [ - 2572 - ], - "vr": "DS" - }, - "00281051": { - "Value": [ - 5145 - ], - "vr": "DS" + "00080005" : { + "Value" : [ "ISO_IR 100" ], + "vr" : "CS" + }, + "00080008" : { + "Value" : [ "ORIGINAL", "PRIMARY", "OTHER" ], + "vr" : "CS" + }, + "00080012" : { + "Value" : [ "20070101" ], + "vr" : "DA" + }, + "00080013" : { + "Value" : [ "120000.000000" ], + "vr" : "TM" + }, + "00080016" : { + "Value" : [ "1.2.840.10008.5.1.4.1.1.4" ], + "vr" : "UI" + }, + "00080018" : { + "Value" : [ "1.2.840.113619.2.176.2025.1499492.7040.1171286242.109" ], + "vr" : "UI" + }, + "00080020" : { + "Value" : [ "20070101" ], + "vr" : "DA" + }, + "00080021" : { + "Value" : [ "20070101" ], + "vr" : "DA" + }, + "00080022" : { + "Value" : [ "20070101" ], + "vr" : "DA" + }, + "00080023" : { + "Value" : [ "20070101" ], + "vr" : "DA" + }, + "0008002A" : { + "Value" : [ "20070101120000" ], + "vr" : "DT" + }, + "00080030" : { + "Value" : [ "120000.000000" ], + "vr" : "TM" + }, + "00080031" : { + "Value" : [ "120000.000000" ], + "vr" : "TM" + }, + "00080032" : { + "Value" : [ "120000.000000" ], + "vr" : "TM" + }, + "00080033" : { + "Value" : [ "120000.000000" ], + "vr" : "TM" + }, + "00080060" : { + "Value" : [ "MR" ], + "vr" : "CS" + }, + "00080070" : { + "Value" : [ "GE MEDICAL SYSTEMS" ], + "vr" : "LO" + }, + "00080080" : { + "Value" : [ "0ECJ52puWpVIjTuhnBA0um" ], + "vr" : "LO" + }, + "00080090" : { + "Value" : [ + { + "Alphabetic" : "1" + } + ], + "vr" : "PN" + }, + "00081010" : { + "Value" : [ "TWINOW" ], + "vr" : "SH" + }, + "00081030" : { + "Value" : [ "Knee (R)" ], + "vr" : "LO" + }, + "0008103E" : { + "Value" : [ "AX. FSE PD" ], + "vr" : "LO" + }, + "00081060" : { + "Value" : [ + { + "Alphabetic" : "ajb" + } + ], + "vr" : "PN" + }, + "00081070" : { + "Value" : [ + { + "Alphabetic" : "ca" + } + ], + "vr" : "PN" + }, + "00081090" : { + "Value" : [ "SIGNA EXCITE" ], + "vr" : "LO" + }, + "00081140" : { + "Value" : [ + { + "00081150" : { + "Value" : [ "1.2.840.10008.5.1.4.1.1.4" ], + "vr" : "UI" + }, + "00081155" : { + "Value" : [ "1.2.840.113619.2.176.2025.1499492.7040.1171286241.719" ], + "vr" : "UI" + } + }, + { + "00081150" : { + "Value" : [ "1.2.840.10008.5.1.4.1.1.4" ], + "vr" : "UI" + }, + "00081155" : { + "Value" : [ "1.2.840.113619.2.176.2025.1499492.7040.1171286241.726" ], + "vr" : "UI" + } + } + ], + "vr" : "SQ" + }, + "00082111" : { + "Value" : [ + "Lossless JPEG compression, selection value 1, point transform 0, compression ratio 2.1453 [Lossless JPEG compression, selection value 1, point transform 0, compression ratio 2.1453]" + ], + "vr" : "ST" + }, + "00089215" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "121327" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "DCM" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Full fidelity image, uncompressed or lossless compressed" ], + "vr" : "LO" + } + } + ], + "vr" : "SQ" + }, + "00100010" : { + "Value" : [ + { + "Alphabetic" : "KNIX" + } + ], + "vr" : "PN" + }, + "00100020" : { + "Value" : [ "ozp00SjY2xG" ], + "vr" : "LO" + }, + "00101010" : { + "Value" : [ "000Y" ], + "vr" : "AS" + }, + "00101030" : { + "Value" : [ "0" ], + "vr" : "DS" + }, + "00180020" : { + "Value" : [ "SE" ], + "vr" : "CS" + }, + "00180021" : { + "Value" : [ "SK", "OSP" ], + "vr" : "CS" + }, + "00180022" : { + "Value" : [ "SAT_GEMS", "NPW", "TRF_GEMS", "FILTERED_GEMS", "FS" ], + "vr" : "CS" + }, + "00180023" : { + "Value" : [ "2D" ], + "vr" : "CS" + }, + "00180025" : { + "Value" : [ "N" ], + "vr" : "CS" + }, + "00180050" : { + "Value" : [ "4" ], + "vr" : "DS" + }, + "00180080" : { + "Value" : [ "2800" ], + "vr" : "DS" + }, + "00180081" : { + "Value" : [ "27.524" ], + "vr" : "DS" + }, + "00180082" : { + "Value" : [ "0" ], + "vr" : "DS" + }, + "00180083" : { + "Value" : [ "1" ], + "vr" : "DS" + }, + "00180084" : { + "Value" : [ "63.860145" ], + "vr" : "DS" + }, + "00180085" : { + "Value" : [ "1H" ], + "vr" : "SH" + }, + "00180086" : { + "Value" : [ 1 ], + "vr" : "IS" + }, + "00180087" : { + "Value" : [ "1.5" ], + "vr" : "DS" + }, + "00180088" : { + "Value" : [ "4.5" ], + "vr" : "DS" + }, + "00180091" : { + "Value" : [ 10 ], + "vr" : "IS" + }, + "00180093" : { + "Value" : [ "100" ], + "vr" : "DS" + }, + "00180094" : { + "Value" : [ "100" ], + "vr" : "DS" + }, + "00180095" : { + "Value" : [ "162.773" ], + "vr" : "DS" + }, + "00181000" : { + "Value" : [ "0000000843815bmr" ], + "vr" : "LO" + }, + "00181020" : { + "Value" : [ "12", "LX", "MR Software release:12.0_M5_0606.b" ], + "vr" : "LO" + }, + "00181030" : { + "Value" : [ "324-58-2995/6" ], + "vr" : "LO" + }, + "00181088" : { + "Value" : [ 474 ], + "vr" : "IS" + }, + "00181090" : { + "Value" : [ 0 ], + "vr" : "IS" + }, + "00181094" : { + "Value" : [ 0 ], + "vr" : "IS" + }, + "00181100" : { + "Value" : [ "170" ], + "vr" : "DS" + }, + "00181250" : { + "Value" : [ "HD TRknee PA" ], + "vr" : "SH" + }, + "00181310" : { + "Value" : [ 0, 384, 224, 0 ], + "vr" : "US" + }, + "00181312" : { + "Value" : [ "ROW" ], + "vr" : "CS" + }, + "00181314" : { + "Value" : [ "90" ], + "vr" : "DS" + }, + "00181315" : { + "Value" : [ "N" ], + "vr" : "CS" + }, + "00181316" : { + "Value" : [ "0.0533" ], + "vr" : "DS" + }, + "00185100" : { + "Value" : [ "FFS" ], + "vr" : "CS" + }, + "0020000D" : { + "Value" : [ "1.2.840.113619.2.176.2025.1499492.7391.1171285944.390" ], + "vr" : "UI" + }, + "0020000E" : { + "Value" : [ "1.2.840.113619.2.176.2025.1499492.7391.1171285944.394" ], + "vr" : "UI" + }, + "00200010" : { + "Value" : [ "1" ], + "vr" : "SH" + }, + "00200011" : { + "Value" : [ 5 ], + "vr" : "IS" + }, + "00200012" : { + "Value" : [ 1 ], + "vr" : "IS" + }, + "00200013" : { + "Value" : [ 1 ], + "vr" : "IS" + }, + "00200032" : { + "Value" : [ "-149.033", "-118.499", "-61.0464" ], + "vr" : "DS" + }, + "00200037" : { + "Value" : [ + "0.999841", + "0.000366209", + "0.0178227", + "-0.000427244", + "0.999995", + "0.00326545" + ], + "vr" : "DS" + }, + "00200052" : { + "Value" : [ "1.2.840.113619.2.176.2025.1499492.7391.1171285944.389" ], + "vr" : "UI" + }, + "00201002" : { + "Value" : [ 24 ], + "vr" : "IS" + }, + "00201041" : { + "Value" : [ "-59.25741196" ], + "vr" : "DS" + }, + "00280002" : { + "Value" : [ 1 ], + "vr" : "US" + }, + "00280004" : { + "Value" : [ "MONOCHROME2" ], + "vr" : "CS" + }, + "00280010" : { + "Value" : [ 512 ], + "vr" : "US" + }, + "00280011" : { + "Value" : [ 512 ], + "vr" : "US" + }, + "00280030" : { + "Value" : [ "0.332", "0.332" ], + "vr" : "DS" + }, + "00280100" : { + "Value" : [ 16 ], + "vr" : "US" + }, + "00280101" : { + "Value" : [ 16 ], + "vr" : "US" + }, + "00280102" : { + "Value" : [ 15 ], + "vr" : "US" + }, + "00280103" : { + "Value" : [ 1 ], + "vr" : "US" + }, + "00280106" : { + "Value" : [ 0 ], + "vr" : "SS" + }, + "00280107" : { + "Value" : [ 5145 ], + "vr" : "SS" + }, + "00280120" : { + "Value" : [ 0 ], + "vr" : "SS" + }, + "00281050" : { + "Value" : [ "2572" ], + "vr" : "DS" + }, + "00281051" : { + "Value" : [ "5145" ], + "vr" : "DS" } -} + } \ No newline at end of file
--- a/Database/HierarchicalAnonymization/StructuredReports/IM0.json Mon Sep 23 15:40:57 2024 +0200 +++ b/Database/HierarchicalAnonymization/StructuredReports/IM0.json Wed Sep 25 19:37:06 2024 +0200 @@ -1,333 +1,249 @@ { - "00080005": { - "Value": [ - "ISO_IR 100" - ], - "vr": "CS" - }, - "00080012": { - "Value": [ - "20180328" - ], - "vr": "DA" - }, - "00080013": { - "Value": [ - "082247" - ], - "vr": "TM" - }, - "00080014": { - "Value": [ - "1.2.276.0.7230010.3.0.3.6.1" - ], - "vr": "UI" - }, - "00080016": { - "Value": [ - "1.2.840.10008.5.1.4.1.1.88.11" - ], - "vr": "UI" - }, - "00080018": { - "Value": [ - "1.2.276.0.7230010.3.1.4.0.15880.1522218167.161162" - ], - "vr": "UI" - }, - "00080020": { - "Value": [ - "20141206" - ], - "vr": "DA" - }, - "00080023": { - "Value": [ - "20180328" - ], - "vr": "DA" - }, - "00080030": { - "Value": [ - "120000.000000" - ], - "vr": "TM" - }, - "00080033": { - "Value": [ - "082247.689453" - ], - "vr": "TM" - }, - "00080050": { - "Value": [ - "R0A8A2D1AI" - ], - "vr": "SH" - }, - "00080060": { - "Value": [ - "SR" - ], - "vr": "CS" - }, - "00080070": { - "Value": [ - "OsiriX" - ], - "vr": "LO" - }, - "00080090": { - "vr": "PN" - }, - "00080110": { - "Value": [ - { - "00080102": { - "Value": [ - "99_OFFIS_DCMTK" - ], - "vr": "SH" - }, - "0008010C": { - "Value": [ - "1.2.276.0.7230010.3.0.0.1" - ], - "vr": "UI" - }, - "00080115": { - "Value": [ - "OFFIS DCMTK Coding Scheme" - ], - "vr": "ST" - }, - "00080116": { - "Value": [ - "OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany" - ], - "vr": "ST" - } - } - ], - "vr": "SQ" - }, - "00081030": { - "Value": [ - "MR Lever" - ], - "vr": "LO" - }, - "0008103E": { - "Value": [ - "OsiriX Annotations SR" - ], - "vr": "LO" - }, - "00081111": { - "vr": "SQ" - }, - "00100010": { - "Value": [ - { - "Alphabetic": "Anonymous Male 1960" - } - ], - "vr": "PN" - }, - "00100020": { - "Value": [ - "ANON0A8A2D1RJ" - ], - "vr": "LO" - }, - "00100030": { - "vr": "DA" - }, - "00100040": { - "Value": [ - "M" - ], - "vr": "CS" - }, - "0020000D": { - "Value": [ - "1.2.840.113564.9.1.20050211120557.20141206125743.24926955301" - ], - "vr": "UI" - }, - "0020000E": { - "Value": [ - "1.2.276.0.7230010.3.1.3.0.15880.1522218167.161163" - ], - "vr": "UI" - }, - "00200010": { - "Value": [ - "E0A8A2D13I" - ], - "vr": "SH" - }, - "00200011": { - "Value": [ - 5004 - ], - "vr": "IS" - }, - "00200013": { - "Value": [ - 0 - ], - "vr": "IS" - }, - "0040A040": { - "Value": [ - "CONTAINER" - ], - "vr": "CS" - }, - "0040A043": { - "Value": [ - { - "00080100": { - "Value": [ - "1" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "99_OSIRIX" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Annotations" - ], - "vr": "LO" - } - } - ], - "vr": "SQ" - }, - "0040A050": { - "Value": [ - "SEPARATE" - ], - "vr": "CS" - }, - "0040A372": { - "vr": "SQ" - }, - "0040A375": { - "Value": [ - { - "00081115": { - "Value": [ - { - "00081199": { - "Value": [ - { - "00081150": { - "Value": [ - "1.2.840.10008.5.1.4.1.1.4" - ], - "vr": "UI" - }, - "00081155": { - "Value": [ - "1.3.12.2.1107.5.2.18.41185.2014120613392067352020757" - ], - "vr": "UI" - } - } - ], - "vr": "SQ" - }, - "0020000E": { - "Value": [ - "1.3.12.2.1107.5.2.18.41185.2014120613381454627419747.0.0.2" - ], - "vr": "UI" + "00080005" : { + "Value" : [ "ISO_IR 100" ], + "vr" : "CS" + }, + "00080012" : { + "Value" : [ "20180328" ], + "vr" : "DA" + }, + "00080013" : { + "Value" : [ "082247" ], + "vr" : "TM" + }, + "00080014" : { + "Value" : [ "1.2.276.0.7230010.3.0.3.6.1" ], + "vr" : "UI" + }, + "00080016" : { + "Value" : [ "1.2.840.10008.5.1.4.1.1.88.11" ], + "vr" : "UI" + }, + "00080018" : { + "Value" : [ "1.2.276.0.7230010.3.1.4.0.15880.1522218167.161162" ], + "vr" : "UI" + }, + "00080020" : { + "Value" : [ "20141206" ], + "vr" : "DA" + }, + "00080023" : { + "Value" : [ "20180328" ], + "vr" : "DA" + }, + "00080030" : { + "Value" : [ "120000.000000" ], + "vr" : "TM" + }, + "00080033" : { + "Value" : [ "082247.689453" ], + "vr" : "TM" + }, + "00080050" : { + "Value" : [ "R0A8A2D1AI" ], + "vr" : "SH" + }, + "00080060" : { + "Value" : [ "SR" ], + "vr" : "CS" + }, + "00080070" : { + "Value" : [ "OsiriX" ], + "vr" : "LO" + }, + "00080090" : { + "vr" : "PN" + }, + "00080110" : { + "Value" : [ + { + "00080102" : { + "Value" : [ "99_OFFIS_DCMTK" ], + "vr" : "SH" + }, + "0008010C" : { + "Value" : [ "1.2.276.0.7230010.3.0.0.1" ], + "vr" : "UI" + }, + "00080115" : { + "Value" : [ "OFFIS DCMTK Coding Scheme" ], + "vr" : "ST" + }, + "00080116" : { + "Value" : [ "OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany" ], + "vr" : "ST" + } + } + ], + "vr" : "SQ" + }, + "00081030" : { + "Value" : [ "MR Lever" ], + "vr" : "LO" + }, + "0008103E" : { + "Value" : [ "OsiriX Annotations SR" ], + "vr" : "LO" + }, + "00081111" : { + "vr" : "SQ" + }, + "00100010" : { + "Value" : [ + { + "Alphabetic" : "Anonymous Male 1960" + } + ], + "vr" : "PN" + }, + "00100020" : { + "Value" : [ "ANON0A8A2D1RJ" ], + "vr" : "LO" + }, + "00100030" : { + "vr" : "DA" + }, + "00100040" : { + "Value" : [ "M" ], + "vr" : "CS" + }, + "0020000D" : { + "Value" : [ "1.2.840.113564.9.1.20050211120557.20141206125743.24926955301" ], + "vr" : "UI" + }, + "0020000E" : { + "Value" : [ "1.2.276.0.7230010.3.1.3.0.15880.1522218167.161163" ], + "vr" : "UI" + }, + "00200010" : { + "Value" : [ "E0A8A2D13I" ], + "vr" : "SH" + }, + "00200011" : { + "Value" : [ 5004 ], + "vr" : "IS" + }, + "00200013" : { + "Value" : [ 0 ], + "vr" : "IS" + }, + "0040A040" : { + "Value" : [ "CONTAINER" ], + "vr" : "CS" + }, + "0040A043" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "1" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "99_OSIRIX" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Annotations" ], + "vr" : "LO" + } + } + ], + "vr" : "SQ" + }, + "0040A050" : { + "Value" : [ "SEPARATE" ], + "vr" : "CS" + }, + "0040A372" : { + "vr" : "SQ" + }, + "0040A375" : { + "Value" : [ + { + "00081115" : { + "Value" : [ + { + "00081199" : { + "Value" : [ + { + "00081150" : { + "Value" : [ "1.2.840.10008.5.1.4.1.1.4" ], + "vr" : "UI" + }, + "00081155" : { + "Value" : [ "1.3.12.2.1107.5.2.18.41185.2014120613392067352020757" ], + "vr" : "UI" + } } - } - ], - "vr": "SQ" - }, - "0020000D": { - "Value": [ - "1.2.840.113564.9.1.20050211120557.20141206125743.24926955301" - ], - "vr": "UI" - } - } - ], - "vr": "SQ" - }, - "0040A491": { - "Value": [ - "PARTIAL" - ], - "vr": "CS" - }, - "0040A493": { - "Value": [ - "UNVERIFIED" - ], - "vr": "CS" - }, - "0040A730": { - "Value": [ - { - "0040A010": { - "Value": [ - "CONTAINS" - ], - "vr": "CS" - }, - "0040A040": { - "Value": [ - "TEXT" - ], - "vr": "CS" - }, - "0040A043": { - "Value": [ - { - "00080100": { - "Value": [ - "IHE.10" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "99_OSIRIX" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Image Reference" - ], - "vr": "LO" - } - } - ], - "vr": "SQ" - }, - "0040A160": { - "Value": [ - "{\n albums = (\n );\n patientID = ANON0A8A2D1RJ;\n patientName = \"Anonymous Male 1960\";\n patientUID = \"ANONYMOUS MALE 1960-ANON0A8A2D1RJ-20010101\";\n series = (\n {\n images = (\n {\n isKeyImage = 1;\n sopInstanceUID = \"1.3.12.2.1107.5.2.18.41185.2014120613122494249501919\";\n }\n );\n seriesDICOMUID = \"1.3.12.2.1107.5.2.18.41185.201412061310059864601354.0.0.0\";\n seriesInstanceUID = \"00000002 1.3.12.2.1107.5.2.18.41185.201412061310059864601354.0.0.0 TE-112\";\n }\n );\n stateText = 0;\n studyInstanceUID = \"1.2.840.113564.9.1.20050211120557.20141206125743.24926955301\";\n}" - ], - "vr": "UT" - } - } - ], - "vr": "SQ" - }, - "00420011": { - "InlineBinary": "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPCFET0NUWVBFIHBsaXN0IFBVQkxJQyAiLS8vQXBwbGUvL0RURCBQTElTVCAxLjAvL0VOIiAiaHR0cDovL3d3dy5hcHBsZS5jb20vRFREcy9Qcm9wZXJ0eUxpc3QtMS4wLmR0ZCI+CjxwbGlzdCB2ZXJzaW9uPSIxLjAiPgo8ZGljdD4KCTxrZXk+YWxidW1zPC9rZXk+Cgk8YXJyYXkvPgoJPGtleT5wYXRpZW50SUQ8L2tleT4KCTxzdHJpbmc+QU5PTjBBOEEyRDFSSjwvc3RyaW5nPgoJPGtleT5wYXRpZW50TmFtZTwva2V5PgoJPHN0cmluZz5Bbm9ueW1vdXMgTWFsZSAxOTYwPC9zdHJpbmc+Cgk8a2V5PnBhdGllbnRVSUQ8L2tleT4KCTxzdHJpbmc+QU5PTllNT1VTIE1BTEUgMTk2MC1BTk9OMEE4QTJEMVJKLTIwMDEwMTAxPC9zdHJpbmc+Cgk8a2V5PnNlcmllczwva2V5PgoJPGFycmF5PgoJCTxkaWN0PgoJCQk8a2V5PmltYWdlczwva2V5PgoJCQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmlzS2V5SW1hZ2U8L2tleT4KCQkJCQk8aW50ZWdlcj4xPC9pbnRlZ2VyPgoJCQkJCTxrZXk+c29wSW5zdGFuY2VVSUQ8L2tleT4KCQkJCQk8c3RyaW5nPjEuMy4xMi4yLjExMDcuNS4yLjE4LjQxMTg1LjIwMTQxMjA2MTMxMjI0OTQyNDk1MDE5MTk8L3N0cmluZz4KCQkJCTwvZGljdD4KCQkJPC9hcnJheT4KCQkJPGtleT5zZXJpZXNESUNPTVVJRDwva2V5PgoJCQk8c3RyaW5nPjEuMy4xMi4yLjExMDcuNS4yLjE4LjQxMTg1LjIwMTQxMjA2MTMxMDA1OTg2NDYwMTM1NC4wLjAuMDwvc3RyaW5nPgoJCQk8a2V5PnNlcmllc0luc3RhbmNlVUlEPC9rZXk+CgkJCTxzdHJpbmc+MDAwMDAwMDIgMS4zLjEyLjIuMTEwNy41LjIuMTguNDExODUuMjAxNDEyMDYxMzEwMDU5ODY0NjAxMzU0LjAuMC4wIFRFLTExMjwvc3RyaW5nPgoJCTwvZGljdD4KCTwvYXJyYXk+Cgk8a2V5PnN0YXRlVGV4dDwva2V5PgoJPGludGVnZXI+MDwvaW50ZWdlcj4KCTxrZXk+c3R1ZHlJbnN0YW5jZVVJRDwva2V5PgoJPHN0cmluZz4xLjIuODQwLjExMzU2NC45LjEuMjAwNTAyMTExMjA1NTcuMjAxNDEyMDYxMjU3NDMuMjQ5MjY5NTUzMDE8L3N0cmluZz4KPC9kaWN0Pgo8L3BsaXN0PgoA", - "vr": "OB" + ], + "vr" : "SQ" + }, + "0020000E" : { + "Value" : [ "1.3.12.2.1107.5.2.18.41185.2014120613381454627419747.0.0.2" ], + "vr" : "UI" + } + } + ], + "vr" : "SQ" + }, + "0020000D" : { + "Value" : [ "1.2.840.113564.9.1.20050211120557.20141206125743.24926955301" ], + "vr" : "UI" + } + } + ], + "vr" : "SQ" + }, + "0040A491" : { + "Value" : [ "PARTIAL" ], + "vr" : "CS" + }, + "0040A493" : { + "Value" : [ "UNVERIFIED" ], + "vr" : "CS" + }, + "0040A730" : { + "Value" : [ + { + "0040A010" : { + "Value" : [ "CONTAINS" ], + "vr" : "CS" + }, + "0040A040" : { + "Value" : [ "TEXT" ], + "vr" : "CS" + }, + "0040A043" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "IHE.10" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "99_OSIRIX" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Image Reference" ], + "vr" : "LO" + } + } + ], + "vr" : "SQ" + }, + "0040A160" : { + "Value" : [ + "{\n albums = (\n );\n patientID = ANON0A8A2D1RJ;\n patientName = \"Anonymous Male 1960\";\n patientUID = \"ANONYMOUS MALE 1960-ANON0A8A2D1RJ-20010101\";\n series = (\n {\n images = (\n {\n isKeyImage = 1;\n sopInstanceUID = \"1.3.12.2.1107.5.2.18.41185.2014120613122494249501919\";\n }\n );\n seriesDICOMUID = \"1.3.12.2.1107.5.2.18.41185.201412061310059864601354.0.0.0\";\n seriesInstanceUID = \"00000002 1.3.12.2.1107.5.2.18.41185.201412061310059864601354.0.0.0 TE-112\";\n }\n );\n stateText = 0;\n studyInstanceUID = \"1.2.840.113564.9.1.20050211120557.20141206125743.24926955301\";\n}" + ], + "vr" : "UT" + } + } + ], + "vr" : "SQ" + }, + "00420011" : { + "InlineBinary" : "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPCFET0NUWVBFIHBsaXN0IFBVQkxJQyAiLS8vQXBwbGUvL0RURCBQTElTVCAxLjAvL0VOIiAiaHR0cDovL3d3dy5hcHBsZS5jb20vRFREcy9Qcm9wZXJ0eUxpc3QtMS4wLmR0ZCI+CjxwbGlzdCB2ZXJzaW9uPSIxLjAiPgo8ZGljdD4KCTxrZXk+YWxidW1zPC9rZXk+Cgk8YXJyYXkvPgoJPGtleT5wYXRpZW50SUQ8L2tleT4KCTxzdHJpbmc+QU5PTjBBOEEyRDFSSjwvc3RyaW5nPgoJPGtleT5wYXRpZW50TmFtZTwva2V5PgoJPHN0cmluZz5Bbm9ueW1vdXMgTWFsZSAxOTYwPC9zdHJpbmc+Cgk8a2V5PnBhdGllbnRVSUQ8L2tleT4KCTxzdHJpbmc+QU5PTllNT1VTIE1BTEUgMTk2MC1BTk9OMEE4QTJEMVJKLTIwMDEwMTAxPC9zdHJpbmc+Cgk8a2V5PnNlcmllczwva2V5PgoJPGFycmF5PgoJCTxkaWN0PgoJCQk8a2V5PmltYWdlczwva2V5PgoJCQk8YXJyYXk+CgkJCQk8ZGljdD4KCQkJCQk8a2V5PmlzS2V5SW1hZ2U8L2tleT4KCQkJCQk8aW50ZWdlcj4xPC9pbnRlZ2VyPgoJCQkJCTxrZXk+c29wSW5zdGFuY2VVSUQ8L2tleT4KCQkJCQk8c3RyaW5nPjEuMy4xMi4yLjExMDcuNS4yLjE4LjQxMTg1LjIwMTQxMjA2MTMxMjI0OTQyNDk1MDE5MTk8L3N0cmluZz4KCQkJCTwvZGljdD4KCQkJPC9hcnJheT4KCQkJPGtleT5zZXJpZXNESUNPTVVJRDwva2V5PgoJCQk8c3RyaW5nPjEuMy4xMi4yLjExMDcuNS4yLjE4LjQxMTg1LjIwMTQxMjA2MTMxMDA1OTg2NDYwMTM1NC4wLjAuMDwvc3RyaW5nPgoJCQk8a2V5PnNlcmllc0luc3RhbmNlVUlEPC9rZXk+CgkJCTxzdHJpbmc+MDAwMDAwMDIgMS4zLjEyLjIuMTEwNy41LjIuMTguNDExODUuMjAxNDEyMDYxMzEwMDU5ODY0NjAxMzU0LjAuMC4wIFRFLTExMjwvc3RyaW5nPgoJCTwvZGljdD4KCTwvYXJyYXk+Cgk8a2V5PnN0YXRlVGV4dDwva2V5PgoJPGludGVnZXI+MDwvaW50ZWdlcj4KCTxrZXk+c3R1ZHlJbnN0YW5jZVVJRDwva2V5PgoJPHN0cmluZz4xLjIuODQwLjExMzU2NC45LjEuMjAwNTAyMTExMjA1NTcuMjAxNDEyMDYxMjU3NDMuMjQ5MjY5NTUzMDE8L3N0cmluZz4KPC9kaWN0Pgo8L3BsaXN0PgoA", + "vr" : "OB" } -} + } \ No newline at end of file
--- a/Database/MarekLatin2.json Mon Sep 23 15:40:57 2024 +0200 +++ b/Database/MarekLatin2.json Wed Sep 25 19:37:06 2024 +0200 @@ -1,643 +1,473 @@ { - "00080005": { - "Value": [ - "ISO_IR 101" - ], - "vr": "CS" - }, - "00080012": { - "Value": [ - "20140507" - ], - "vr": "DA" - }, - "00080013": { - "Value": [ - "104131" - ], - "vr": "TM" - }, - "00080014": { - "Value": [ - "1.2.826.0.1.3680043.2.1569.0.2.0.0" - ], - "vr": "UI" - }, - "00080016": { - "Value": [ - "1.2.840.10008.5.1.4.1.1.88.11" - ], - "vr": "UI" - }, - "00080018": { - "Value": [ - "1.2.826.0.1.3680043.2.1569.1.4.323026757.1700.1399452091.57" - ], - "vr": "UI" - }, - "00080020": { - "Value": [ - "20140404" - ], - "vr": "DA" - }, - "00080021": { - "Value": [ - "20140507" - ], - "vr": "DA" - }, - "00080023": { - "Value": [ - "20140507" - ], - "vr": "DA" - }, - "00080030": { - "Value": [ - "093323" - ], - "vr": "TM" - }, - "00080031": { - "Value": [ - "104131" - ], - "vr": "TM" - }, - "00080033": { - "Value": [ - "104131" - ], - "vr": "TM" - }, - "00080050": { - "Value": [ - "73" - ], - "vr": "SH" - }, - "00080060": { - "Value": [ - "SR" - ], - "vr": "CS" - }, - "00080070": { - "Value": [ - "IM s.c." - ], - "vr": "LO" - }, - "00080090": { - "vr": "PN" - }, - "00081010": { - "Value": [ - "RSR2" - ], - "vr": "SH" - }, - "00081030": { - "Value": [ - "StudyDescription" - ], - "vr": "LO" - }, - "0008103E": { - "Value": [ - "Opis badania radiologicznego" - ], - "vr": "LO" - }, - "00081111": { - "vr": "SQ" - }, - "00100010": { - "Value": [ - { - "Alphabetic": "Testowy^Teste" - } - ], - "vr": "PN" - }, - "00100020": { - "Value": [ - "P22" - ], - "vr": "LO" - }, - "00100030": { - "Value": [ - "19450630" - ], - "vr": "DA" - }, - "00100040": { - "Value": [ - "M" - ], - "vr": "CS" - }, - "00181020": { - "Value": [ - "2.2.2.87" - ], - "vr": "LO" - }, - "0020000D": { - "Value": [ - "1.2.826.0.1.3680043.2.15698796759233767756630698199" - ], - "vr": "UI" - }, - "0020000E": { - "Value": [ - "1.2.826.0.1.3680043.2.1569.1.3.323026757.1700.1399452091.58" - ], - "vr": "UI" - }, - "00200010": { - "Value": [ - "3" - ], - "vr": "SH" - }, - "00200011": { - "Value": [ - 1 - ], - "vr": "IS" - }, - "00200013": { - "Value": [ - 1 - ], - "vr": "IS" - }, - "00321032": { - "vr": "PN" - }, - "0040A040": { - "Value": [ - "CONTAINER" - ], - "vr": "CS" - }, - "0040A043": { - "Value": [ - { - "00080100": { - "Value": [ - "11528-7" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "LN" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Opis badania radiologicznego" - ], - "vr": "LO" - } - } - ], - "vr": "SQ" - }, - "0040A050": { - "Value": [ - "SEPARATE" - ], - "vr": "CS" - }, - "0040A372": { - "vr": "SQ" - }, - "0040A491": { - "Value": [ - "PARTIAL" - ], - "vr": "CS" - }, - "0040A493": { - "Value": [ - "UNVERIFIED" - ], - "vr": "CS" - }, - "0040A730": { - "Value": [ - { - "0040A010": { - "Value": [ - "HAS CONCEPT MOD" - ], - "vr": "CS" - }, - "0040A040": { - "Value": [ - "TEXT" - ], - "vr": "CS" - }, - "0040A043": { - "Value": [ - { - "00080100": { - "Value": [ - "121058" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "DCM" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Opisywane procedury" - ], - "vr": "LO" - } - } - ], - "vr": "SQ" - }, - "0040A160": { - "Value": [ - "iodsa" - ], - "vr": "UT" - } - }, - { - "0040A010": { - "Value": [ - "HAS CONCEPT MOD" - ], - "vr": "CS" - }, - "0040A040": { - "Value": [ - "TEXT" - ], - "vr": "CS" - }, - "0040A043": { - "Value": [ - { - "00080100": { - "Value": [ - "100001" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "IMSC" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Oddział" - ], - "vr": "LO" + "00080005" : { + "Value" : [ "ISO_IR 101" ], + "vr" : "CS" + }, + "00080012" : { + "Value" : [ "20140507" ], + "vr" : "DA" + }, + "00080013" : { + "Value" : [ "104131" ], + "vr" : "TM" + }, + "00080014" : { + "Value" : [ "1.2.826.0.1.3680043.2.1569.0.2.0.0" ], + "vr" : "UI" + }, + "00080016" : { + "Value" : [ "1.2.840.10008.5.1.4.1.1.88.11" ], + "vr" : "UI" + }, + "00080018" : { + "Value" : [ "1.2.826.0.1.3680043.2.1569.1.4.323026757.1700.1399452091.57" ], + "vr" : "UI" + }, + "00080020" : { + "Value" : [ "20140404" ], + "vr" : "DA" + }, + "00080021" : { + "Value" : [ "20140507" ], + "vr" : "DA" + }, + "00080023" : { + "Value" : [ "20140507" ], + "vr" : "DA" + }, + "00080030" : { + "Value" : [ "093323" ], + "vr" : "TM" + }, + "00080031" : { + "Value" : [ "104131" ], + "vr" : "TM" + }, + "00080033" : { + "Value" : [ "104131" ], + "vr" : "TM" + }, + "00080050" : { + "Value" : [ "73" ], + "vr" : "SH" + }, + "00080060" : { + "Value" : [ "SR" ], + "vr" : "CS" + }, + "00080070" : { + "Value" : [ "IM s.c." ], + "vr" : "LO" + }, + "00080090" : { + "vr" : "PN" + }, + "00081010" : { + "Value" : [ "RSR2" ], + "vr" : "SH" + }, + "00081030" : { + "Value" : [ "StudyDescription" ], + "vr" : "LO" + }, + "0008103E" : { + "Value" : [ "Opis badania radiologicznego" ], + "vr" : "LO" + }, + "00081111" : { + "vr" : "SQ" + }, + "00100010" : { + "Value" : [ + { + "Alphabetic" : "Testowy^Teste" + } + ], + "vr" : "PN" + }, + "00100020" : { + "Value" : [ "P22" ], + "vr" : "LO" + }, + "00100030" : { + "Value" : [ "19450630" ], + "vr" : "DA" + }, + "00100040" : { + "Value" : [ "M" ], + "vr" : "CS" + }, + "00181020" : { + "Value" : [ "2.2.2.87" ], + "vr" : "LO" + }, + "0020000D" : { + "Value" : [ "1.2.826.0.1.3680043.2.15698796759233767756630698199" ], + "vr" : "UI" + }, + "0020000E" : { + "Value" : [ "1.2.826.0.1.3680043.2.1569.1.3.323026757.1700.1399452091.58" ], + "vr" : "UI" + }, + "00200010" : { + "Value" : [ "3" ], + "vr" : "SH" + }, + "00200011" : { + "Value" : [ 1 ], + "vr" : "IS" + }, + "00200013" : { + "Value" : [ 1 ], + "vr" : "IS" + }, + "00321032" : { + "vr" : "PN" + }, + "0040A040" : { + "Value" : [ "CONTAINER" ], + "vr" : "CS" + }, + "0040A043" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "11528-7" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "LN" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Opis badania radiologicznego" ], + "vr" : "LO" + } + } + ], + "vr" : "SQ" + }, + "0040A050" : { + "Value" : [ "SEPARATE" ], + "vr" : "CS" + }, + "0040A372" : { + "vr" : "SQ" + }, + "0040A491" : { + "Value" : [ "PARTIAL" ], + "vr" : "CS" + }, + "0040A493" : { + "Value" : [ "UNVERIFIED" ], + "vr" : "CS" + }, + "0040A730" : { + "Value" : [ + { + "0040A010" : { + "Value" : [ "HAS CONCEPT MOD" ], + "vr" : "CS" + }, + "0040A040" : { + "Value" : [ "TEXT" ], + "vr" : "CS" + }, + "0040A043" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "121058" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "DCM" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Opisywane procedury" ], + "vr" : "LO" + } + } + ], + "vr" : "SQ" + }, + "0040A160" : { + "Value" : [ "iodsa" ], + "vr" : "UT" + } + }, + { + "0040A010" : { + "Value" : [ "HAS CONCEPT MOD" ], + "vr" : "CS" + }, + "0040A040" : { + "Value" : [ "TEXT" ], + "vr" : "CS" + }, + "0040A043" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "100001" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "IMSC" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Oddział" ], + "vr" : "LO" + } + } + ], + "vr" : "SQ" + }, + "0040A160" : { + "Value" : [ "sdadasdas" ], + "vr" : "UT" + } + }, + { + "0040A010" : { + "Value" : [ "HAS CONCEPT MOD" ], + "vr" : "CS" + }, + "0040A040" : { + "Value" : [ "CODE" ], + "vr" : "CS" + }, + "0040A043" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "121049" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "DCM" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Język treści" ], + "vr" : "LO" + } + } + ], + "vr" : "SQ" + }, + "0040A168" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "pl" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "RFC3066" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Polish" ], + "vr" : "LO" + } + } + ], + "vr" : "SQ" + } + }, + { + "0040A010" : { + "Value" : [ "HAS OBS CONTEXT" ], + "vr" : "CS" + }, + "0040A040" : { + "Value" : [ "CODE" ], + "vr" : "CS" + }, + "0040A043" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "121005" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "DCM" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Typ obserwatora" ], + "vr" : "LO" + } + } + ], + "vr" : "SQ" + }, + "0040A168" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "121006" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "DCM" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Osoba" ], + "vr" : "LO" + } + } + ], + "vr" : "SQ" + } + }, + { + "0040A010" : { + "Value" : [ "HAS OBS CONTEXT" ], + "vr" : "CS" + }, + "0040A040" : { + "Value" : [ "PNAME" ], + "vr" : "CS" + }, + "0040A043" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "121008" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "DCM" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Imię i Nazwisko osoby opisującej" ], + "vr" : "LO" + } + } + ], + "vr" : "SQ" + }, + "0040A123" : { + "Value" : [ + { + "Alphabetic" : "i7big^rtg" + } + ], + "vr" : "PN" + } + }, + { + "0040A010" : { + "Value" : [ "HAS CONCEPT MOD" ], + "vr" : "CS" + }, + "0040A040" : { + "Value" : [ "TEXT" ], + "vr" : "CS" + }, + "0040A043" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "120001" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "IMSC" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Prawo wykonywania zawodu" ], + "vr" : "LO" + } + } + ], + "vr" : "SQ" + }, + "0040A160" : { + "Value" : [ "0000000" ], + "vr" : "UT" + } + }, + { + "0040A010" : { + "Value" : [ "CONTAINS" ], + "vr" : "CS" + }, + "0040A040" : { + "Value" : [ "CONTAINER" ], + "vr" : "CS" + }, + "0040A043" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "110001" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "IMSC" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Opis badania" ], + "vr" : "LO" + } + } + ], + "vr" : "SQ" + }, + "0040A050" : { + "Value" : [ "SEPARATE" ], + "vr" : "CS" + }, + "0040A730" : { + "Value" : [ + { + "0040A010" : { + "Value" : [ "CONTAINS" ], + "vr" : "CS" + }, + "0040A040" : { + "Value" : [ "TEXT" ], + "vr" : "CS" + }, + "0040A043" : { + "Value" : [ + { + "00080100" : { + "Value" : [ "110001" ], + "vr" : "SH" + }, + "00080102" : { + "Value" : [ "IMSC" ], + "vr" : "SH" + }, + "00080104" : { + "Value" : [ "Opis badania" ], + "vr" : "LO" + } } - } - ], - "vr": "SQ" - }, - "0040A160": { - "Value": [ - "sdadasdas" - ], - "vr": "UT" - } - }, - { - "0040A010": { - "Value": [ - "HAS CONCEPT MOD" - ], - "vr": "CS" - }, - "0040A040": { - "Value": [ - "CODE" - ], - "vr": "CS" - }, - "0040A043": { - "Value": [ - { - "00080100": { - "Value": [ - "121049" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "DCM" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Język treści" - ], - "vr": "LO" - } - } - ], - "vr": "SQ" - }, - "0040A168": { - "Value": [ - { - "00080100": { - "Value": [ - "pl" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "RFC3066" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Polish" - ], - "vr": "LO" - } - } - ], - "vr": "SQ" - } - }, - { - "0040A010": { - "Value": [ - "HAS OBS CONTEXT" - ], - "vr": "CS" - }, - "0040A040": { - "Value": [ - "CODE" - ], - "vr": "CS" - }, - "0040A043": { - "Value": [ - { - "00080100": { - "Value": [ - "121005" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "DCM" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Typ obserwatora" - ], - "vr": "LO" - } - } - ], - "vr": "SQ" - }, - "0040A168": { - "Value": [ - { - "00080100": { - "Value": [ - "121006" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "DCM" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Osoba" - ], - "vr": "LO" - } - } - ], - "vr": "SQ" - } - }, - { - "0040A010": { - "Value": [ - "HAS OBS CONTEXT" - ], - "vr": "CS" - }, - "0040A040": { - "Value": [ - "PNAME" - ], - "vr": "CS" - }, - "0040A043": { - "Value": [ - { - "00080100": { - "Value": [ - "121008" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "DCM" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Imię i Nazwisko osoby opisującej" - ], - "vr": "LO" - } - } - ], - "vr": "SQ" - }, - "0040A123": { - "Value": [ - { - "Alphabetic": "i7big^rtg" - } - ], - "vr": "PN" - } - }, - { - "0040A010": { - "Value": [ - "HAS CONCEPT MOD" - ], - "vr": "CS" - }, - "0040A040": { - "Value": [ - "TEXT" - ], - "vr": "CS" - }, - "0040A043": { - "Value": [ - { - "00080100": { - "Value": [ - "120001" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "IMSC" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Prawo wykonywania zawodu" - ], - "vr": "LO" - } - } - ], - "vr": "SQ" - }, - "0040A160": { - "Value": [ - "0000000" - ], - "vr": "UT" - } - }, - { - "0040A010": { - "Value": [ - "CONTAINS" - ], - "vr": "CS" - }, - "0040A040": { - "Value": [ - "CONTAINER" - ], - "vr": "CS" - }, - "0040A043": { - "Value": [ - { - "00080100": { - "Value": [ - "110001" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "IMSC" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Opis badania" - ], - "vr": "LO" - } - } - ], - "vr": "SQ" - }, - "0040A050": { - "Value": [ - "SEPARATE" - ], - "vr": "CS" - }, - "0040A730": { - "Value": [ - { - "0040A010": { - "Value": [ - "CONTAINS" - ], - "vr": "CS" - }, - "0040A040": { - "Value": [ - "TEXT" - ], - "vr": "CS" - }, - "0040A043": { - "Value": [ - { - "00080100": { - "Value": [ - "110001" - ], - "vr": "SH" - }, - "00080102": { - "Value": [ - "IMSC" - ], - "vr": "SH" - }, - "00080104": { - "Value": [ - "Opis badania" - ], - "vr": "LO" - } - } - ], - "vr": "SQ" - }, - "0040A160": { - "Value": [ - " dgtfhglhghk dgtfhglhghk dgtfhglhghk" - ], - "vr": "UT" - } - } - ], - "vr": "SQ" - } - } - ], - "vr": "SQ" + ], + "vr" : "SQ" + }, + "0040A160" : { + "Value" : [ " dgtfhglhghk dgtfhglhghk dgtfhglhghk" ], + "vr" : "UT" + } + } + ], + "vr" : "SQ" + } + } + ], + "vr" : "SQ" } -} +} \ No newline at end of file
--- a/Plugins/DicomWeb/Run.py Mon Sep 23 15:40:57 2024 +0200 +++ b/Plugins/DicomWeb/Run.py Wed Sep 25 19:37:06 2024 +0200 @@ -1143,7 +1143,10 @@ self.assertTrue('00091001' in a[0]) # This fails if DCMTK <= 3.6.1 self.assertEqual('DS', a[0]['00091001']['vr']) self.assertEqual(1, len(a[0]['00091001']['Value'])) - self.assertAlmostEqual(98.41, a[0]['00091001']['Value'][0]) + if IsOrthancVersionAbove(ORTHANC, 1, 12, 5) and DoGet(ORTHANC, '/system')['ApiVersion'] >= 26: + self.assertEqual("98.41", a[0]['00091001']['Value'][0]) + else: + self.assertAlmostEqual(98.41, a[0]['00091001']['Value'][0]) a = DoGet(ORTHANC, '/dicom-web/studies?00090010=Lunit&includefield=00091001') self.assertEqual(1, len(a)) @@ -1154,7 +1157,10 @@ self.assertTrue('00091001' in a[0]) self.assertEqual('DS', a[0]['00091001']['vr']) self.assertEqual(1, len(a[0]['00091001']['Value'])) - self.assertAlmostEqual(98.41, a[0]['00091001']['Value'][0]) + if IsOrthancVersionAbove(ORTHANC, 1, 12, 5) and DoGet(ORTHANC, '/system')['ApiVersion'] >= 26: + self.assertEqual("98.41", a[0]['00091001']['Value'][0]) + else: + self.assertAlmostEqual(98.41, a[0]['00091001']['Value'][0]) a = DoGet(ORTHANC, '/dicom-web/studies?00090010=Lunit2&includefield=00091001') self.assertEqual(0, len(a))
--- a/Tests/Tests.py Mon Sep 23 15:40:57 2024 +0200 +++ b/Tests/Tests.py Wed Sep 25 19:37:06 2024 +0200 @@ -5485,18 +5485,19 @@ def test_dicomweb(self): - def Compare(dicom, reference): - a = UploadInstance(_REMOTE, dicom) ['ID'] - b = DoGet(_REMOTE, '/instances/%s/file' % a, - headers = { 'Accept' : 'application/dicom+json' }) - with open(GetDatabasePath(reference), 'rb') as c: - d = json.load(c) - AssertAlmostEqualRecursive(self, d, b) - - Compare('DummyCT.dcm', 'DummyCT.json') - Compare('MarekLatin2.dcm', 'MarekLatin2.json') - Compare('HierarchicalAnonymization/StructuredReports/IM0', - 'HierarchicalAnonymization/StructuredReports/IM0.json') + if IsOrthancVersionAbove(_LOCAL, 1, 12, 5) and DoGet(_REMOTE, '/system')['ApiVersion'] >= 26: # the references have changed with 1.12.5 -> we don't want to keep 2 references + def Compare(dicom, reference): + a = UploadInstance(_REMOTE, dicom) ['ID'] + b = DoGet(_REMOTE, '/instances/%s/file' % a, + headers = { 'Accept' : 'application/dicom+json' }) + with open(GetDatabasePath(reference), 'rb') as c: + d = json.load(c) + AssertAlmostEqualRecursive(self, d, b) + + Compare('DummyCT.dcm', 'DummyCT.json') + Compare('MarekLatin2.dcm', 'MarekLatin2.json') + Compare('HierarchicalAnonymization/StructuredReports/IM0', + 'HierarchicalAnonymization/StructuredReports/IM0.json') def test_issue_95_encodings(self):