Mercurial > hg > orthanc
changeset 5334:5b2a5cc64cb1
upgraded anonymization to Basic Profile of PS 3.15-2023b Table E.1-1
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 27 Jun 2023 15:12:39 +0200 |
| parents | 816968b5a031 |
| children | c103b0e70d75 |
| files | NEWS OrthancFramework/Sources/DicomParsing/DicomModification.cpp OrthancFramework/Sources/DicomParsing/DicomModification.h OrthancFramework/Sources/DicomParsing/DicomModification_Anonymization2023b.impl.h OrthancFramework/Sources/Enumerations.cpp OrthancFramework/Sources/Enumerations.h OrthancFramework/UnitTestsSources/FrameworkTests.cpp OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp OrthancServer/Resources/Configuration.json OrthancServer/Resources/GenerateAnonymizationProfile.py OrthancServer/Sources/ServerContext.cpp OrthancServer/UnitTestsSources/ServerJobsTests.cpp |
| diffstat | 12 files changed, 668 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Tue Jun 27 10:39:17 2023 +0200 +++ b/NEWS Tue Jun 27 15:12:39 2023 +0200 @@ -1,6 +1,12 @@ Pending changes in the mainline =============================== +General +------- + +* Orthanc now anonymizes according to Basic Profile of PS 3.15-2023b Table E.1-1 +* Added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" + REST API -------- @@ -26,7 +32,6 @@ * When deleting a resource, its parents LastUpdate metadata are now updated * Reduced the memory usage when downloading archives when "ZipLoaderThreads" > 0 * Metrics are now stored as integers instead of floats to avoid precision loss in increments -* Added metrics "orthanc_storage_read_bytes" and "orthanc_storage_written_bytes" * Upgraded dependencies for static builds: - boost 1.82.0
--- a/OrthancFramework/Sources/DicomParsing/DicomModification.cpp Tue Jun 27 10:39:17 2023 +0200 +++ b/OrthancFramework/Sources/DicomParsing/DicomModification.cpp Tue Jun 27 15:12:39 2023 +0200 @@ -43,6 +43,9 @@ static const std::string ORTHANC_DEIDENTIFICATION_METHOD_2021b = "Orthanc " ORTHANC_VERSION " - PS 3.15-2021b Table E.1-1 Basic Profile"; +static const std::string ORTHANC_DEIDENTIFICATION_METHOD_2023b = + "Orthanc " ORTHANC_VERSION " - PS 3.15-2023b Table E.1-1 Basic Profile"; + namespace Orthanc { namespace @@ -427,7 +430,8 @@ if (it->second->asString() == ORTHANC_DEIDENTIFICATION_METHOD_2008 || it->second->asString() == ORTHANC_DEIDENTIFICATION_METHOD_2017c || - it->second->asString() == ORTHANC_DEIDENTIFICATION_METHOD_2021b) + it->second->asString() == ORTHANC_DEIDENTIFICATION_METHOD_2021b || + it->second->asString() == ORTHANC_DEIDENTIFICATION_METHOD_2023b) { delete it->second; replacements_.erase(it); @@ -831,9 +835,6 @@ * generated automatically by calling: * "../../../OrthancServer/Resources/GenerateAnonymizationProfile.py * https://raw.githubusercontent.com/jodogne/dicom-specification/master/2021b/part15.xml" - * - * http://dicom.nema.org/medical/dicom/2021b/output/chtml/part15/chapter_E.html#table_E.1-1a - * http://dicom.nema.org/medical/dicom/2021b/output/chtml/part15/chapter_E.html#table_E.1-1 **/ #include "DicomModification_Anonymization2021b.impl.h" @@ -843,6 +844,26 @@ } + void DicomModification::SetupAnonymization2023b() + { + /** + * This is Table E.1-1 from PS 3.15-2023b (DICOM Part 15: Security + * and System Management Profiles), "basic profile" column. It was + * generated automatically by calling: + * "../../../OrthancServer/Resources/GenerateAnonymizationProfile.py + * https://raw.githubusercontent.com/jodogne/dicom-specification/master/2023b/part15.xml" + * + * http://dicom.nema.org/medical/dicom/current/output/chtml/part15/chapter_E.html#table_E.1-1a + * http://dicom.nema.org/medical/dicom/current/output/chtml/part15/chapter_E.html#table_E.1-1 + **/ + +#include "DicomModification_Anonymization2023b.impl.h" + + // Set the DeidentificationMethod tag + ReplaceInternal(DICOM_TAG_DEIDENTIFICATION_METHOD, ORTHANC_DEIDENTIFICATION_METHOD_2023b); + } + + void DicomModification::SetupAnonymization(DicomVersion version) { isAnonymization_ = true; @@ -874,6 +895,10 @@ SetupAnonymization2021b(); break; + case DicomVersion_2023b: + SetupAnonymization2023b(); + break; + default: throw OrthancException(ErrorCode_ParameterOutOfRange); } @@ -1344,7 +1369,9 @@ // DicomVersion version = DicomVersion_2008; // For Orthanc <= 1.2.0 // DicomVersion version = DicomVersion_2017c; // For Orthanc between 1.3.0 and 1.9.3 - DicomVersion version = DicomVersion_2021b; // For Orthanc >= 1.9.4 + // DicomVersion version = DicomVersion_2021b; // For Orthanc >= 1.9.4 + DicomVersion version = DicomVersion_2023b; // For Orthanc >= 1.12.1 + if (request.isMember("DicomVersion")) { if (request["DicomVersion"].type() != Json::stringValue)
--- a/OrthancFramework/Sources/DicomParsing/DicomModification.h Tue Jun 27 10:39:17 2023 +0200 +++ b/OrthancFramework/Sources/DicomParsing/DicomModification.h Tue Jun 27 15:12:39 2023 +0200 @@ -179,6 +179,8 @@ void SetupAnonymization2021b(); + void SetupAnonymization2023b(); + void UnserializeUidMap(ResourceType level, const Json::Value& serialized, const char* field);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OrthancFramework/Sources/DicomParsing/DicomModification_Anonymization2023b.impl.h Tue Jun 27 15:12:39 2023 +0200 @@ -0,0 +1,610 @@ +// RelationshipsVisitor handles (0x0008, 0x1140) /* X/Z/U* */ // Referenced Image Sequence +// RelationshipsVisitor handles (0x0008, 0x2112) /* X/Z/U* */ // Source Image Sequence +// Tag (0x0008, 0x0018) is set in Apply() /* U */ // SOP Instance UID +// Tag (0x0010, 0x0010) is set below (*) /* Z */ // Patient's Name +// Tag (0x0010, 0x0020) is set below (*) /* Z */ // Patient ID +// Tag (0x0020, 0x000d) is set in Apply() /* U */ // Study Instance UID +// Tag (0x0020, 0x000e) is set in Apply() /* U */ // Series Instance UID +clearings_.insert(DicomTag(0x0008, 0x0020)); // Study Date +clearings_.insert(DicomTag(0x0008, 0x0023)); /* Z/D */ // Content Date +clearings_.insert(DicomTag(0x0008, 0x0030)); // Study Time +clearings_.insert(DicomTag(0x0008, 0x0033)); /* Z/D */ // Content Time +clearings_.insert(DicomTag(0x0008, 0x0050)); // Accession Number +clearings_.insert(DicomTag(0x0008, 0x0090)); // Referring Physician's Name +clearings_.insert(DicomTag(0x0008, 0x009c)); // Consulting Physician's Name +clearings_.insert(DicomTag(0x0008, 0x0106)); /* D */ // Context Group Version +clearings_.insert(DicomTag(0x0008, 0x0107)); /* D */ // Context Group Local Version +clearings_.insert(DicomTag(0x0010, 0x0030)); // Patient's Birth Date +clearings_.insert(DicomTag(0x0010, 0x0040)); // Patient's Sex +clearings_.insert(DicomTag(0x0012, 0x0010)); /* D */ // Clinical Trial Sponsor Name +clearings_.insert(DicomTag(0x0012, 0x0020)); /* D */ // Clinical Trial Protocol ID +clearings_.insert(DicomTag(0x0012, 0x0021)); // Clinical Trial Protocol Name +clearings_.insert(DicomTag(0x0012, 0x0030)); // Clinical Trial Site ID +clearings_.insert(DicomTag(0x0012, 0x0031)); // Clinical Trial Site Name +clearings_.insert(DicomTag(0x0012, 0x0040)); /* D */ // Clinical Trial Subject ID +clearings_.insert(DicomTag(0x0012, 0x0042)); /* D */ // Clinical Trial Subject Reading ID +clearings_.insert(DicomTag(0x0012, 0x0050)); // Clinical Trial Time Point ID +clearings_.insert(DicomTag(0x0012, 0x0060)); // Clinical Trial Coordinating Center Name +clearings_.insert(DicomTag(0x0012, 0x0081)); /* D */ // Clinical Trial Protocol Ethics Committee Name +clearings_.insert(DicomTag(0x0018, 0x0010)); /* Z/D */ // Contrast/Bolus Agent +clearings_.insert(DicomTag(0x0018, 0x11bb)); /* D */ // Acquisition Field Of View Label +clearings_.insert(DicomTag(0x0018, 0x1203)); // Calibration DateTime +clearings_.insert(DicomTag(0x0018, 0x9074)); /* D */ // Frame Acquisition DateTime +clearings_.insert(DicomTag(0x0018, 0x9151)); /* D */ // Frame Reference DateTime +clearings_.insert(DicomTag(0x0018, 0x9367)); /* D */ // X-Ray Source ID +clearings_.insert(DicomTag(0x0018, 0x9369)); /* D */ // Source Start DateTime +clearings_.insert(DicomTag(0x0018, 0x936a)); /* D */ // Source End DateTime +clearings_.insert(DicomTag(0x0018, 0x9371)); /* D */ // X-Ray Detector ID +clearings_.insert(DicomTag(0x0018, 0x9623)); /* D */ // Functional Sync Pulse +clearings_.insert(DicomTag(0x0018, 0x9701)); /* D */ // Decay Correction DateTime +clearings_.insert(DicomTag(0x0018, 0x9804)); /* D */ // Exclusion Start DateTime +clearings_.insert(DicomTag(0x0018, 0x9919)); /* Z/D */ // Instruction Performed DateTime +clearings_.insert(DicomTag(0x0020, 0x0010)); // Study ID +clearings_.insert(DicomTag(0x0034, 0x0001)); /* D */ // Flow Identifier Sequence +clearings_.insert(DicomTag(0x0034, 0x0002)); /* D */ // Flow Identifier +clearings_.insert(DicomTag(0x0034, 0x0005)); /* D */ // Source Identifier +clearings_.insert(DicomTag(0x0034, 0x0007)); /* D */ // Frame Origin Timestamp +clearings_.insert(DicomTag(0x003a, 0x0314)); /* D */ // Impedance Measurement DateTime +clearings_.insert(DicomTag(0x0040, 0x0512)); /* D */ // Container Identifier +clearings_.insert(DicomTag(0x0040, 0x0513)); // Issuer of the Container Identifier Sequence +clearings_.insert(DicomTag(0x0040, 0x0551)); /* D */ // Specimen Identifier +clearings_.insert(DicomTag(0x0040, 0x0562)); // Issuer of the Specimen Identifier Sequence +clearings_.insert(DicomTag(0x0040, 0x0610)); // Specimen Preparation Sequence +clearings_.insert(DicomTag(0x0040, 0x1101)); /* D */ // Person Identification Code Sequence +clearings_.insert(DicomTag(0x0040, 0x2016)); // Placer Order Number / Imaging Service Request +clearings_.insert(DicomTag(0x0040, 0x2017)); // Filler Order Number / Imaging Service Request +clearings_.insert(DicomTag(0x0040, 0xa027)); /* D */ // Verifying Organization +clearings_.insert(DicomTag(0x0040, 0xa030)); /* D */ // Verification DateTime +clearings_.insert(DicomTag(0x0040, 0xa073)); /* D */ // Verifying Observer Sequence +clearings_.insert(DicomTag(0x0040, 0xa075)); /* D */ // Verifying Observer Name +clearings_.insert(DicomTag(0x0040, 0xa082)); // Participation DateTime +clearings_.insert(DicomTag(0x0040, 0xa088)); // Verifying Observer Identification Code Sequence +clearings_.insert(DicomTag(0x0040, 0xa120)); /* D */ // DateTime +clearings_.insert(DicomTag(0x0040, 0xa121)); /* D */ // Date +clearings_.insert(DicomTag(0x0040, 0xa122)); /* D */ // Time +clearings_.insert(DicomTag(0x0040, 0xa123)); /* D */ // Person Name +clearings_.insert(DicomTag(0x0040, 0xa13a)); /* D */ // Referenced DateTime +clearings_.insert(DicomTag(0x0040, 0xa730)); /* D */ // Content Sequence +clearings_.insert(DicomTag(0x0042, 0x0011)); /* D */ // Encapsulated Document +clearings_.insert(DicomTag(0x0044, 0x0104)); /* D */ // Assertion DateTime +clearings_.insert(DicomTag(0x0068, 0x6226)); /* D */ // Effective DateTime +clearings_.insert(DicomTag(0x0068, 0x6270)); /* D */ // Information Issue DateTime +clearings_.insert(DicomTag(0x006a, 0x0003)); /* D */ // Annotation Group UID +clearings_.insert(DicomTag(0x006a, 0x0005)); /* D */ // Annotation Group Label +clearings_.insert(DicomTag(0x0070, 0x0001)); /* D */ // Graphic Annotation Sequence +clearings_.insert(DicomTag(0x0070, 0x0084)); /* Z/D */ // Content Creator's Name +clearings_.insert(DicomTag(0x0072, 0x000a)); /* D */ // Hanging Protocol Creation DateTime +clearings_.insert(DicomTag(0x0072, 0x005e)); /* D */ // Selector AE Value +clearings_.insert(DicomTag(0x0072, 0x005f)); /* D */ // Selector AS Value +clearings_.insert(DicomTag(0x0072, 0x0061)); /* D */ // Selector DA Value +clearings_.insert(DicomTag(0x0072, 0x0063)); /* D */ // Selector DT Value +clearings_.insert(DicomTag(0x0072, 0x0065)); /* D */ // Selector OB Value +clearings_.insert(DicomTag(0x0072, 0x0066)); /* D */ // Selector LO Value +clearings_.insert(DicomTag(0x0072, 0x0068)); /* D */ // Selector LT Value +clearings_.insert(DicomTag(0x0072, 0x006a)); /* D */ // Selector PN Value +clearings_.insert(DicomTag(0x0072, 0x006b)); /* D */ // Selector TM Value +clearings_.insert(DicomTag(0x0072, 0x006c)); /* D */ // Selector SH Value +clearings_.insert(DicomTag(0x0072, 0x006d)); /* D */ // Selector UN Value +clearings_.insert(DicomTag(0x0072, 0x006e)); /* D */ // Selector ST Value +clearings_.insert(DicomTag(0x0072, 0x0070)); /* D */ // Selector UT Value +clearings_.insert(DicomTag(0x0072, 0x0071)); /* D */ // Selector UR Value +clearings_.insert(DicomTag(0x0400, 0x0105)); /* D */ // Digital Signature DateTime +clearings_.insert(DicomTag(0x0400, 0x0115)); /* D */ // Certificate of Signer +clearings_.insert(DicomTag(0x0400, 0x0562)); /* D */ // Attribute Modification DateTime +clearings_.insert(DicomTag(0x0400, 0x0563)); /* D */ // Modifying System +clearings_.insert(DicomTag(0x0400, 0x0564)); // Source of Previous Values +clearings_.insert(DicomTag(0x0400, 0x0565)); /* D */ // Reason for the Attribute Modification +clearings_.insert(DicomTag(0x2100, 0x0140)); /* D */ // Destination AE +clearings_.insert(DicomTag(0x3006, 0x0002)); /* D */ // Structure Set Label +clearings_.insert(DicomTag(0x3006, 0x0008)); // Structure Set Date +clearings_.insert(DicomTag(0x3006, 0x0009)); // Structure Set Time +clearings_.insert(DicomTag(0x3006, 0x0026)); // ROI Name +clearings_.insert(DicomTag(0x3006, 0x00a6)); // ROI Interpreter +clearings_.insert(DicomTag(0x3008, 0x0024)); /* D */ // Treatment Control Point Date +clearings_.insert(DicomTag(0x3008, 0x0025)); /* D */ // Treatment Control Point Time +clearings_.insert(DicomTag(0x3008, 0x0162)); /* D */ // Safe Position Exit Date +clearings_.insert(DicomTag(0x3008, 0x0164)); /* D */ // Safe Position Exit Time +clearings_.insert(DicomTag(0x3008, 0x0166)); /* D */ // Safe Position Return Date +clearings_.insert(DicomTag(0x3008, 0x0168)); /* D */ // Safe Position Return Time +clearings_.insert(DicomTag(0x300a, 0x0002)); /* D */ // RT Plan Label +clearings_.insert(DicomTag(0x300a, 0x022c)); /* D */ // Source Strength Reference Date +clearings_.insert(DicomTag(0x300a, 0x022e)); /* D */ // Source Strength Reference Time +clearings_.insert(DicomTag(0x300a, 0x0608)); /* D */ // Treatment Position Group Label +clearings_.insert(DicomTag(0x300a, 0x0611)); // RT Accessory Holder Slot ID +clearings_.insert(DicomTag(0x300a, 0x0615)); // RT Accessory Device Slot ID +clearings_.insert(DicomTag(0x300a, 0x0619)); /* D */ // Radiation Dose Identification Label +clearings_.insert(DicomTag(0x300a, 0x0623)); /* D */ // Radiation Dose In-Vivo Measurement Label +clearings_.insert(DicomTag(0x300a, 0x062a)); /* D */ // RT Tolerance Set Label +clearings_.insert(DicomTag(0x300a, 0x067c)); /* D */ // Radiation Generation Mode Label +clearings_.insert(DicomTag(0x300a, 0x067d)); // Radiation Generation Mode Description +clearings_.insert(DicomTag(0x300a, 0x0734)); /* D */ // Treatment Tolerance Violation Description +clearings_.insert(DicomTag(0x300a, 0x0736)); /* D */ // Treatment Tolerance Violation DateTime +clearings_.insert(DicomTag(0x300a, 0x073a)); /* D */ // Recorded RT Control Point DateTime +clearings_.insert(DicomTag(0x300a, 0x0741)); /* D */ // Interlock DateTime +clearings_.insert(DicomTag(0x300a, 0x0742)); /* D */ // Interlock Description +clearings_.insert(DicomTag(0x300a, 0x0760)); /* D */ // Override DateTime +clearings_.insert(DicomTag(0x300a, 0x0783)); /* D */ // Interlock Origin Description +clearings_.insert(DicomTag(0x300c, 0x0127)); /* D */ // Beam Hold Transition DateTime +clearings_.insert(DicomTag(0x300e, 0x0004)); // Review Date +clearings_.insert(DicomTag(0x300e, 0x0005)); // Review Time +clearings_.insert(DicomTag(0x3010, 0x000f)); // Conceptual Volume Combination Description +clearings_.insert(DicomTag(0x3010, 0x0017)); // Conceptual Volume Description +clearings_.insert(DicomTag(0x3010, 0x001b)); // Device Alternate Identifier +clearings_.insert(DicomTag(0x3010, 0x002d)); /* D */ // Device Label +clearings_.insert(DicomTag(0x3010, 0x0033)); /* D */ // User Content Label +clearings_.insert(DicomTag(0x3010, 0x0034)); /* D */ // User Content Long Label +clearings_.insert(DicomTag(0x3010, 0x0035)); /* D */ // Entity Label +clearings_.insert(DicomTag(0x3010, 0x0038)); /* D */ // Entity Long Label +clearings_.insert(DicomTag(0x3010, 0x0043)); // Manufacturer's Device Identifier +clearings_.insert(DicomTag(0x3010, 0x0054)); /* D */ // RT Prescription Label +clearings_.insert(DicomTag(0x3010, 0x005a)); // RT Physician Intent Narrative +clearings_.insert(DicomTag(0x3010, 0x005c)); // Reason for Superseding +clearings_.insert(DicomTag(0x3010, 0x007a)); // Treatment Technique Notes +clearings_.insert(DicomTag(0x3010, 0x007b)); // Prescription Notes +clearings_.insert(DicomTag(0x3010, 0x007f)); // Fractionation Notes +clearings_.insert(DicomTag(0x3010, 0x0081)); // Prescription Notes Sequence +removals_.insert(DicomTag(0x0000, 0x1000)); // Affected SOP Instance UID +removals_.insert(DicomTag(0x0008, 0x0012)); /* X/D */ // Instance Creation Date +removals_.insert(DicomTag(0x0008, 0x0013)); /* X/Z/D */ // Instance Creation Time +removals_.insert(DicomTag(0x0008, 0x0015)); // Instance Coercion DateTime +removals_.insert(DicomTag(0x0008, 0x0021)); /* X/D */ // Series Date +removals_.insert(DicomTag(0x0008, 0x0022)); /* X/Z */ // Acquisition Date +removals_.insert(DicomTag(0x0008, 0x0024)); // Overlay Date +removals_.insert(DicomTag(0x0008, 0x0025)); // Curve Date +removals_.insert(DicomTag(0x0008, 0x002a)); /* X/Z/D */ // Acquisition DateTime +removals_.insert(DicomTag(0x0008, 0x0031)); /* X/D */ // Series Time +removals_.insert(DicomTag(0x0008, 0x0032)); /* X/Z */ // Acquisition Time +removals_.insert(DicomTag(0x0008, 0x0034)); // Overlay Time +removals_.insert(DicomTag(0x0008, 0x0035)); // Curve Time +removals_.insert(DicomTag(0x0008, 0x0054)); // Retrieve AE Title +removals_.insert(DicomTag(0x0008, 0x0055)); // Station AE Title +removals_.insert(DicomTag(0x0008, 0x0080)); /* X/Z/D */ // Institution Name +removals_.insert(DicomTag(0x0008, 0x0081)); // Institution Address +removals_.insert(DicomTag(0x0008, 0x0082)); /* X/Z/D */ // Institution Code Sequence +removals_.insert(DicomTag(0x0008, 0x0092)); // Referring Physician's Address +removals_.insert(DicomTag(0x0008, 0x0094)); // Referring Physician's Telephone Numbers +removals_.insert(DicomTag(0x0008, 0x0096)); // Referring Physician Identification Sequence +removals_.insert(DicomTag(0x0008, 0x009d)); // Consulting Physician Identification Sequence +removals_.insert(DicomTag(0x0008, 0x0201)); // Timezone Offset From UTC +removals_.insert(DicomTag(0x0008, 0x1000)); // Network ID +removals_.insert(DicomTag(0x0008, 0x1010)); /* X/Z/D */ // Station Name +removals_.insert(DicomTag(0x0008, 0x1030)); // Study Description +removals_.insert(DicomTag(0x0008, 0x103e)); // Series Description +removals_.insert(DicomTag(0x0008, 0x1040)); // Institutional Department Name +removals_.insert(DicomTag(0x0008, 0x1041)); // Institutional Department Type Code Sequence +removals_.insert(DicomTag(0x0008, 0x1048)); // Physician(s) of Record +removals_.insert(DicomTag(0x0008, 0x1049)); // Physician(s) of Record Identification Sequence +removals_.insert(DicomTag(0x0008, 0x1050)); // Performing Physician's Name +removals_.insert(DicomTag(0x0008, 0x1052)); // Performing Physician Identification Sequence +removals_.insert(DicomTag(0x0008, 0x1060)); // Name of Physician(s) Reading Study +removals_.insert(DicomTag(0x0008, 0x1062)); // Physician(s) Reading Study Identification Sequence +removals_.insert(DicomTag(0x0008, 0x1070)); /* X/Z/D */ // Operators' Name +removals_.insert(DicomTag(0x0008, 0x1072)); /* X/D */ // Operator Identification Sequence +removals_.insert(DicomTag(0x0008, 0x1080)); // Admitting Diagnoses Description +removals_.insert(DicomTag(0x0008, 0x1084)); // Admitting Diagnoses Code Sequence +removals_.insert(DicomTag(0x0008, 0x1088)); // Pyramid Description +removals_.insert(DicomTag(0x0008, 0x1110)); /* X/Z */ // Referenced Study Sequence +removals_.insert(DicomTag(0x0008, 0x1111)); /* X/Z/D */ // Referenced Performed Procedure Step Sequence +removals_.insert(DicomTag(0x0008, 0x1120)); // Referenced Patient Sequence +removals_.insert(DicomTag(0x0008, 0x2111)); // Derivation Description +removals_.insert(DicomTag(0x0008, 0x4000)); // Identifying Comments +removals_.insert(DicomTag(0x0010, 0x0021)); // Issuer of Patient ID +removals_.insert(DicomTag(0x0010, 0x0032)); // Patient's Birth Time +removals_.insert(DicomTag(0x0010, 0x0050)); // Patient's Insurance Plan Code Sequence +removals_.insert(DicomTag(0x0010, 0x0101)); // Patient's Primary Language Code Sequence +removals_.insert(DicomTag(0x0010, 0x0102)); // Patient's Primary Language Modifier Code Sequence +removals_.insert(DicomTag(0x0010, 0x1000)); // Other Patient IDs +removals_.insert(DicomTag(0x0010, 0x1001)); // Other Patient Names +removals_.insert(DicomTag(0x0010, 0x1002)); // Other Patient IDs Sequence +removals_.insert(DicomTag(0x0010, 0x1005)); // Patient's Birth Name +removals_.insert(DicomTag(0x0010, 0x1010)); // Patient's Age +removals_.insert(DicomTag(0x0010, 0x1020)); // Patient's Size +removals_.insert(DicomTag(0x0010, 0x1030)); // Patient's Weight +removals_.insert(DicomTag(0x0010, 0x1040)); // Patient's Address +removals_.insert(DicomTag(0x0010, 0x1050)); // Insurance Plan Identification +removals_.insert(DicomTag(0x0010, 0x1060)); // Patient's Mother's Birth Name +removals_.insert(DicomTag(0x0010, 0x1080)); // Military Rank +removals_.insert(DicomTag(0x0010, 0x1081)); // Branch of Service +removals_.insert(DicomTag(0x0010, 0x1090)); // Medical Record Locator +removals_.insert(DicomTag(0x0010, 0x1100)); // Referenced Patient Photo Sequence +removals_.insert(DicomTag(0x0010, 0x2000)); // Medical Alerts +removals_.insert(DicomTag(0x0010, 0x2110)); // Allergies +removals_.insert(DicomTag(0x0010, 0x2150)); // Country of Residence +removals_.insert(DicomTag(0x0010, 0x2152)); // Region of Residence +removals_.insert(DicomTag(0x0010, 0x2154)); // Patient's Telephone Numbers +removals_.insert(DicomTag(0x0010, 0x2155)); // Patient's Telecom Information +removals_.insert(DicomTag(0x0010, 0x2160)); // Ethnic Group +removals_.insert(DicomTag(0x0010, 0x2180)); // Occupation +removals_.insert(DicomTag(0x0010, 0x21a0)); // Smoking Status +removals_.insert(DicomTag(0x0010, 0x21b0)); // Additional Patient History +removals_.insert(DicomTag(0x0010, 0x21c0)); // Pregnancy Status +removals_.insert(DicomTag(0x0010, 0x21d0)); // Last Menstrual Date +removals_.insert(DicomTag(0x0010, 0x21f0)); // Patient's Religious Preference +removals_.insert(DicomTag(0x0010, 0x2203)); /* X/Z */ // Patient's Sex Neutered +removals_.insert(DicomTag(0x0010, 0x2297)); // Responsible Person +removals_.insert(DicomTag(0x0010, 0x2299)); // Responsible Organization +removals_.insert(DicomTag(0x0010, 0x4000)); // Patient Comments +removals_.insert(DicomTag(0x0012, 0x0051)); // Clinical Trial Time Point Description +removals_.insert(DicomTag(0x0012, 0x0071)); // Clinical Trial Series ID +removals_.insert(DicomTag(0x0012, 0x0072)); // Clinical Trial Series Description +removals_.insert(DicomTag(0x0012, 0x0082)); // Clinical Trial Protocol Ethics Committee Approval Number +removals_.insert(DicomTag(0x0012, 0x0086)); // Ethics Committee Approval Effectiveness Start Date +removals_.insert(DicomTag(0x0012, 0x0087)); // Ethics Committee Approval Effectiveness End Date +removals_.insert(DicomTag(0x0014, 0x407c)); // Calibration Time +removals_.insert(DicomTag(0x0014, 0x407e)); // Calibration Date +removals_.insert(DicomTag(0x0016, 0x002b)); // Maker Note +removals_.insert(DicomTag(0x0016, 0x004b)); // Device Setting Description +removals_.insert(DicomTag(0x0016, 0x004d)); // Camera Owner Name +removals_.insert(DicomTag(0x0016, 0x004e)); // Lens Specification +removals_.insert(DicomTag(0x0016, 0x004f)); // Lens Make +removals_.insert(DicomTag(0x0016, 0x0050)); // Lens Model +removals_.insert(DicomTag(0x0016, 0x0051)); // Lens Serial Number +removals_.insert(DicomTag(0x0016, 0x0070)); // GPS Version ID +removals_.insert(DicomTag(0x0016, 0x0071)); // GPS Latitude Ref +removals_.insert(DicomTag(0x0016, 0x0072)); // GPS Latitude +removals_.insert(DicomTag(0x0016, 0x0073)); // GPS Longitude Ref +removals_.insert(DicomTag(0x0016, 0x0074)); // GPS Longitude +removals_.insert(DicomTag(0x0016, 0x0075)); // GPS Altitude Ref +removals_.insert(DicomTag(0x0016, 0x0076)); // GPS Altitude +removals_.insert(DicomTag(0x0016, 0x0077)); // GPS Time Stamp +removals_.insert(DicomTag(0x0016, 0x0078)); // GPS Satellites +removals_.insert(DicomTag(0x0016, 0x0079)); // GPS Status +removals_.insert(DicomTag(0x0016, 0x007a)); // GPS Measure Mode +removals_.insert(DicomTag(0x0016, 0x007b)); // GPS DOP +removals_.insert(DicomTag(0x0016, 0x007c)); // GPS Speed Ref +removals_.insert(DicomTag(0x0016, 0x007d)); // GPS Speed +removals_.insert(DicomTag(0x0016, 0x007e)); // GPS Track Ref +removals_.insert(DicomTag(0x0016, 0x007f)); // GPS Track +removals_.insert(DicomTag(0x0016, 0x0080)); // GPS Img Direction Ref +removals_.insert(DicomTag(0x0016, 0x0081)); // GPS Img Direction +removals_.insert(DicomTag(0x0016, 0x0082)); // GPS Map Datum +removals_.insert(DicomTag(0x0016, 0x0083)); // GPS Dest Latitude Ref +removals_.insert(DicomTag(0x0016, 0x0084)); // GPS Dest Latitude +removals_.insert(DicomTag(0x0016, 0x0085)); // GPS Dest Longitude Ref +removals_.insert(DicomTag(0x0016, 0x0086)); // GPS Dest Longitude +removals_.insert(DicomTag(0x0016, 0x0087)); // GPS Dest Bearing Ref +removals_.insert(DicomTag(0x0016, 0x0088)); // GPS Dest Bearing +removals_.insert(DicomTag(0x0016, 0x0089)); // GPS Dest Distance Ref +removals_.insert(DicomTag(0x0016, 0x008a)); // GPS Dest Distance +removals_.insert(DicomTag(0x0016, 0x008b)); // GPS Processing Method +removals_.insert(DicomTag(0x0016, 0x008c)); // GPS Area Information +removals_.insert(DicomTag(0x0016, 0x008d)); // GPS Date Stamp +removals_.insert(DicomTag(0x0016, 0x008e)); // GPS Differential +removals_.insert(DicomTag(0x0018, 0x0027)); // Intervention Drug Stop Time +removals_.insert(DicomTag(0x0018, 0x0035)); // Intervention Drug Start Time +removals_.insert(DicomTag(0x0018, 0x1000)); /* X/Z/D */ // Device Serial Number +removals_.insert(DicomTag(0x0018, 0x1004)); // Plate ID +removals_.insert(DicomTag(0x0018, 0x1005)); // Generator ID +removals_.insert(DicomTag(0x0018, 0x1007)); // Cassette ID +removals_.insert(DicomTag(0x0018, 0x1008)); // Gantry ID +removals_.insert(DicomTag(0x0018, 0x1009)); // Unique Device Identifier +removals_.insert(DicomTag(0x0018, 0x100a)); // UDI Sequence +removals_.insert(DicomTag(0x0018, 0x1012)); // Date of Secondary Capture +removals_.insert(DicomTag(0x0018, 0x1014)); // Time of Secondary Capture +removals_.insert(DicomTag(0x0018, 0x1030)); /* X/D */ // Protocol Name +removals_.insert(DicomTag(0x0018, 0x1042)); // Contrast/Bolus Start Time +removals_.insert(DicomTag(0x0018, 0x1043)); // Contrast/Bolus Stop Time +removals_.insert(DicomTag(0x0018, 0x1072)); // Radiopharmaceutical Start Time +removals_.insert(DicomTag(0x0018, 0x1073)); // Radiopharmaceutical Stop Time +removals_.insert(DicomTag(0x0018, 0x1078)); // Radiopharmaceutical Start DateTime +removals_.insert(DicomTag(0x0018, 0x1079)); // Radiopharmaceutical Stop DateTime +removals_.insert(DicomTag(0x0018, 0x1200)); // Date of Last Calibration +removals_.insert(DicomTag(0x0018, 0x1201)); // Time of Last Calibration +removals_.insert(DicomTag(0x0018, 0x1202)); // DateTime of Last Calibration +removals_.insert(DicomTag(0x0018, 0x1400)); /* X/D */ // Acquisition Device Processing Description +removals_.insert(DicomTag(0x0018, 0x4000)); // Acquisition Comments +removals_.insert(DicomTag(0x0018, 0x5011)); // Transducer Identification Sequence +removals_.insert(DicomTag(0x0018, 0x700a)); /* X/D */ // Detector ID +removals_.insert(DicomTag(0x0018, 0x700c)); /* X/D */ // Date of Last Detector Calibration +removals_.insert(DicomTag(0x0018, 0x700e)); /* X/D */ // Time of Last Detector Calibration +removals_.insert(DicomTag(0x0018, 0x9185)); // Respiratory Motion Compensation Technique Description +removals_.insert(DicomTag(0x0018, 0x9373)); // X-Ray Detector Label +removals_.insert(DicomTag(0x0018, 0x937b)); // Multi-energy Acquisition Description +removals_.insert(DicomTag(0x0018, 0x937f)); // Decomposition Description +removals_.insert(DicomTag(0x0018, 0x9424)); // Acquisition Protocol Description +removals_.insert(DicomTag(0x0018, 0x9516)); /* X/D */ // Start Acquisition DateTime +removals_.insert(DicomTag(0x0018, 0x9517)); /* X/D */ // End Acquisition DateTime +removals_.insert(DicomTag(0x0018, 0x9937)); // Requested Series Description +removals_.insert(DicomTag(0x0018, 0xa002)); // Contribution DateTime +removals_.insert(DicomTag(0x0018, 0xa003)); // Contribution Description +removals_.insert(DicomTag(0x0020, 0x0027)); // Pyramid Label +removals_.insert(DicomTag(0x0020, 0x3401)); // Modifying Device ID +removals_.insert(DicomTag(0x0020, 0x3403)); // Modified Image Date +removals_.insert(DicomTag(0x0020, 0x3405)); // Modified Image Time +removals_.insert(DicomTag(0x0020, 0x3406)); // Modified Image Description +removals_.insert(DicomTag(0x0020, 0x4000)); // Image Comments +removals_.insert(DicomTag(0x0020, 0x9158)); // Frame Comments +removals_.insert(DicomTag(0x0028, 0x4000)); // Image Presentation Comments +removals_.insert(DicomTag(0x0032, 0x0012)); // Study ID Issuer +removals_.insert(DicomTag(0x0032, 0x0032)); // Study Verified Date +removals_.insert(DicomTag(0x0032, 0x0033)); // Study Verified Time +removals_.insert(DicomTag(0x0032, 0x0034)); // Study Read Date +removals_.insert(DicomTag(0x0032, 0x0035)); // Study Read Time +removals_.insert(DicomTag(0x0032, 0x1000)); // Scheduled Study Start Date +removals_.insert(DicomTag(0x0032, 0x1001)); // Scheduled Study Start Time +removals_.insert(DicomTag(0x0032, 0x1010)); // Scheduled Study Stop Date +removals_.insert(DicomTag(0x0032, 0x1011)); // Scheduled Study Stop Time +removals_.insert(DicomTag(0x0032, 0x1020)); // Scheduled Study Location +removals_.insert(DicomTag(0x0032, 0x1021)); // Scheduled Study Location AE Title +removals_.insert(DicomTag(0x0032, 0x1021)); // Scheduled Study Location AE Title +removals_.insert(DicomTag(0x0032, 0x1030)); // Reason for Study +removals_.insert(DicomTag(0x0032, 0x1032)); // Requesting Physician +removals_.insert(DicomTag(0x0032, 0x1033)); // Requesting Service +removals_.insert(DicomTag(0x0032, 0x1040)); // Study Arrival Date +removals_.insert(DicomTag(0x0032, 0x1041)); // Study Arrival Time +removals_.insert(DicomTag(0x0032, 0x1050)); // Study Completion Date +removals_.insert(DicomTag(0x0032, 0x1051)); // Study Completion Time +removals_.insert(DicomTag(0x0032, 0x1060)); /* X/Z */ // Requested Procedure Description +removals_.insert(DicomTag(0x0032, 0x1066)); // Reason for Visit +removals_.insert(DicomTag(0x0032, 0x1067)); // Reason for Visit Code Sequence +removals_.insert(DicomTag(0x0032, 0x1070)); // Requested Contrast Agent +removals_.insert(DicomTag(0x0032, 0x4000)); // Study Comments +removals_.insert(DicomTag(0x0038, 0x0004)); // Referenced Patient Alias Sequence +removals_.insert(DicomTag(0x0038, 0x0010)); // Admission ID +removals_.insert(DicomTag(0x0038, 0x0011)); // Issuer of Admission ID +removals_.insert(DicomTag(0x0038, 0x0014)); // Issuer of Admission ID Sequence +removals_.insert(DicomTag(0x0038, 0x001a)); // Scheduled Admission Date +removals_.insert(DicomTag(0x0038, 0x001b)); // Scheduled Admission Time +removals_.insert(DicomTag(0x0038, 0x001c)); // Scheduled Discharge Date +removals_.insert(DicomTag(0x0038, 0x001d)); // Scheduled Discharge Time +removals_.insert(DicomTag(0x0038, 0x001e)); // Scheduled Patient Institution Residence +removals_.insert(DicomTag(0x0038, 0x0020)); // Admitting Date +removals_.insert(DicomTag(0x0038, 0x0021)); // Admitting Time +removals_.insert(DicomTag(0x0038, 0x0030)); // Discharge Date +removals_.insert(DicomTag(0x0038, 0x0032)); // Discharge Time +removals_.insert(DicomTag(0x0038, 0x0040)); // Discharge Diagnosis Description +removals_.insert(DicomTag(0x0038, 0x0050)); // Special Needs +removals_.insert(DicomTag(0x0038, 0x0060)); // Service Episode ID +removals_.insert(DicomTag(0x0038, 0x0061)); // Issuer of Service Episode ID +removals_.insert(DicomTag(0x0038, 0x0062)); // Service Episode Description +removals_.insert(DicomTag(0x0038, 0x0064)); // Issuer of Service Episode ID Sequence +removals_.insert(DicomTag(0x0038, 0x0300)); // Current Patient Location +removals_.insert(DicomTag(0x0038, 0x0400)); // Patient's Institution Residence +removals_.insert(DicomTag(0x0038, 0x0500)); // Patient State +removals_.insert(DicomTag(0x0038, 0x4000)); // Visit Comments +removals_.insert(DicomTag(0x003a, 0x0329)); // Waveform Filter Description +removals_.insert(DicomTag(0x003a, 0x032b)); // Filter Lookup Table Description +removals_.insert(DicomTag(0x0040, 0x0001)); // Scheduled Station AE Title +removals_.insert(DicomTag(0x0040, 0x0001)); // Scheduled Station AE Title +removals_.insert(DicomTag(0x0040, 0x0002)); // Scheduled Procedure Step Start Date +removals_.insert(DicomTag(0x0040, 0x0003)); // Scheduled Procedure Step Start Time +removals_.insert(DicomTag(0x0040, 0x0004)); // Scheduled Procedure Step End Date +removals_.insert(DicomTag(0x0040, 0x0005)); // Scheduled Procedure Step End Time +removals_.insert(DicomTag(0x0040, 0x0006)); // Scheduled Performing Physician's Name +removals_.insert(DicomTag(0x0040, 0x0007)); // Scheduled Procedure Step Description +removals_.insert(DicomTag(0x0040, 0x0009)); // Scheduled Procedure Step ID +removals_.insert(DicomTag(0x0040, 0x000b)); // Scheduled Performing Physician Identification Sequence +removals_.insert(DicomTag(0x0040, 0x0010)); // Scheduled Station Name +removals_.insert(DicomTag(0x0040, 0x0011)); // Scheduled Procedure Step Location +removals_.insert(DicomTag(0x0040, 0x0012)); // Pre-Medication +removals_.insert(DicomTag(0x0040, 0x0241)); // Performed Station AE Title +removals_.insert(DicomTag(0x0040, 0x0241)); // Performed Station AE Title +removals_.insert(DicomTag(0x0040, 0x0242)); // Performed Station Name +removals_.insert(DicomTag(0x0040, 0x0243)); // Performed Location +removals_.insert(DicomTag(0x0040, 0x0244)); // Performed Procedure Step Start Date +removals_.insert(DicomTag(0x0040, 0x0245)); // Performed Procedure Step Start Time +removals_.insert(DicomTag(0x0040, 0x0250)); // Performed Procedure Step End Date +removals_.insert(DicomTag(0x0040, 0x0251)); // Performed Procedure Step End Time +removals_.insert(DicomTag(0x0040, 0x0253)); // Performed Procedure Step ID +removals_.insert(DicomTag(0x0040, 0x0254)); // Performed Procedure Step Description +removals_.insert(DicomTag(0x0040, 0x0275)); // Request Attributes Sequence +removals_.insert(DicomTag(0x0040, 0x0280)); // Comments on the Performed Procedure Step +removals_.insert(DicomTag(0x0040, 0x0310)); // Comments on Radiation Dose +removals_.insert(DicomTag(0x0040, 0x050a)); // Specimen Accession Number +removals_.insert(DicomTag(0x0040, 0x051a)); // Container Description +removals_.insert(DicomTag(0x0040, 0x0555)); /* X/Z */ // Acquisition Context Sequence +removals_.insert(DicomTag(0x0040, 0x0600)); // Specimen Short Description +removals_.insert(DicomTag(0x0040, 0x0602)); // Specimen Detailed Description +removals_.insert(DicomTag(0x0040, 0x06fa)); // Slide Identifier +removals_.insert(DicomTag(0x0040, 0x1001)); // Requested Procedure ID +removals_.insert(DicomTag(0x0040, 0x1002)); // Reason for the Requested Procedure +removals_.insert(DicomTag(0x0040, 0x1004)); // Patient Transport Arrangements +removals_.insert(DicomTag(0x0040, 0x1005)); // Requested Procedure Location +removals_.insert(DicomTag(0x0040, 0x100a)); // Reason for Requested Procedure Code Sequence +removals_.insert(DicomTag(0x0040, 0x1010)); // Names of Intended Recipients of Results +removals_.insert(DicomTag(0x0040, 0x1011)); // Intended Recipients of Results Identification Sequence +removals_.insert(DicomTag(0x0040, 0x1102)); // Person's Address +removals_.insert(DicomTag(0x0040, 0x1103)); // Person's Telephone Numbers +removals_.insert(DicomTag(0x0040, 0x1104)); // Person's Telecom Information +removals_.insert(DicomTag(0x0040, 0x1400)); // Requested Procedure Comments +removals_.insert(DicomTag(0x0040, 0x2001)); // Reason for the Imaging Service Request +removals_.insert(DicomTag(0x0040, 0x2004)); // Issue Date of Imaging Service Request +removals_.insert(DicomTag(0x0040, 0x2005)); // Issue Time of Imaging Service Request +removals_.insert(DicomTag(0x0040, 0x2008)); // Order Entered By +removals_.insert(DicomTag(0x0040, 0x2009)); // Order Enterer's Location +removals_.insert(DicomTag(0x0040, 0x2010)); // Order Callback Phone Number +removals_.insert(DicomTag(0x0040, 0x2011)); // Order Callback Telecom Information +removals_.insert(DicomTag(0x0040, 0x2400)); // Imaging Service Request Comments +removals_.insert(DicomTag(0x0040, 0x3001)); // Confidentiality Constraint on Patient Data Description +removals_.insert(DicomTag(0x0040, 0x4005)); // Scheduled Procedure Step Start DateTime +removals_.insert(DicomTag(0x0040, 0x4008)); // Scheduled Procedure Step Expiration DateTime +removals_.insert(DicomTag(0x0040, 0x4010)); // Scheduled Procedure Step Modification DateTime +removals_.insert(DicomTag(0x0040, 0x4011)); // Expected Completion DateTime +removals_.insert(DicomTag(0x0040, 0x4025)); // Scheduled Station Name Code Sequence +removals_.insert(DicomTag(0x0040, 0x4027)); // Scheduled Station Geographic Location Code Sequence +removals_.insert(DicomTag(0x0040, 0x4028)); // Performed Station Name Code Sequence +removals_.insert(DicomTag(0x0040, 0x4030)); // Performed Station Geographic Location Code Sequence +removals_.insert(DicomTag(0x0040, 0x4034)); // Scheduled Human Performers Sequence +removals_.insert(DicomTag(0x0040, 0x4035)); // Actual Human Performers Sequence +removals_.insert(DicomTag(0x0040, 0x4036)); // Human Performer's Organization +removals_.insert(DicomTag(0x0040, 0x4037)); // Human Performer's Name +removals_.insert(DicomTag(0x0040, 0x4050)); // Performed Procedure Step Start DateTime +removals_.insert(DicomTag(0x0040, 0x4051)); // Performed Procedure Step End DateTime +removals_.insert(DicomTag(0x0040, 0x4052)); // Procedure Step Cancellation DateTime +removals_.insert(DicomTag(0x0040, 0xa023)); // Findings Group Recording Date (Trial) +removals_.insert(DicomTag(0x0040, 0xa024)); // Findings Group Recording Time (Trial) +removals_.insert(DicomTag(0x0040, 0xa032)); /* X/D */ // Observation DateTime +removals_.insert(DicomTag(0x0040, 0xa033)); // Observation Start DateTime +removals_.insert(DicomTag(0x0040, 0xa078)); // Author Observer Sequence +removals_.insert(DicomTag(0x0040, 0xa07a)); // Participant Sequence +removals_.insert(DicomTag(0x0040, 0xa07c)); // Custodial Organization Sequence +removals_.insert(DicomTag(0x0040, 0xa110)); // Date of Document or Verbal Transaction (Trial) +removals_.insert(DicomTag(0x0040, 0xa112)); // Time of Document or Verbal Transaction (Trial) +removals_.insert(DicomTag(0x0040, 0xa192)); // Observation Date (Trial) +removals_.insert(DicomTag(0x0040, 0xa193)); // Observation Time (Trial) +removals_.insert(DicomTag(0x0040, 0xa307)); // Current Observer (Trial) +removals_.insert(DicomTag(0x0040, 0xa352)); // Verbal Source (Trial) +removals_.insert(DicomTag(0x0040, 0xa353)); // Address (Trial) +removals_.insert(DicomTag(0x0040, 0xa354)); // Telephone Number (Trial) +removals_.insert(DicomTag(0x0040, 0xa358)); // Verbal Source Identifier Code Sequence (Trial) +removals_.insert(DicomTag(0x0040, 0xdb06)); // Template Version +removals_.insert(DicomTag(0x0040, 0xdb07)); // Template Local Version +removals_.insert(DicomTag(0x0040, 0xe004)); // HL7 Document Effective Time +removals_.insert(DicomTag(0x0044, 0x0004)); // Approval Status DateTime +removals_.insert(DicomTag(0x0044, 0x000b)); // Product Expiration DateTime +removals_.insert(DicomTag(0x0044, 0x0010)); // Substance Administration DateTime +removals_.insert(DicomTag(0x0044, 0x0105)); // Assertion Expiration DateTime +removals_.insert(DicomTag(0x0050, 0x001b)); // Container Component ID +removals_.insert(DicomTag(0x0050, 0x0020)); // Device Description +removals_.insert(DicomTag(0x0050, 0x0021)); // Long Device Description +removals_.insert(DicomTag(0x006a, 0x0006)); // Annotation Group Description +removals_.insert(DicomTag(0x0070, 0x0082)); // Presentation Creation Date +removals_.insert(DicomTag(0x0070, 0x0083)); // Presentation Creation Time +removals_.insert(DicomTag(0x0070, 0x0086)); // Content Creator's Identification Code Sequence +removals_.insert(DicomTag(0x0074, 0x1234)); // Receiving AE +removals_.insert(DicomTag(0x0074, 0x1236)); // Requesting AE +removals_.insert(DicomTag(0x0088, 0x0200)); // Icon Image Sequence +removals_.insert(DicomTag(0x0088, 0x0904)); // Topic Title +removals_.insert(DicomTag(0x0088, 0x0906)); // Topic Subject +removals_.insert(DicomTag(0x0088, 0x0910)); // Topic Author +removals_.insert(DicomTag(0x0088, 0x0912)); // Topic Keywords +removals_.insert(DicomTag(0x0100, 0x0420)); // SOP Authorization DateTime +removals_.insert(DicomTag(0x0400, 0x0310)); // Certified Timestamp +removals_.insert(DicomTag(0x0400, 0x0402)); // Referenced Digital Signature Sequence +removals_.insert(DicomTag(0x0400, 0x0403)); // Referenced SOP Instance MAC Sequence +removals_.insert(DicomTag(0x0400, 0x0404)); // MAC +removals_.insert(DicomTag(0x0400, 0x0550)); // Modified Attributes Sequence +removals_.insert(DicomTag(0x0400, 0x0551)); // Nonconforming Modified Attributes Sequence +removals_.insert(DicomTag(0x0400, 0x0552)); // Nonconforming Data Element Value +removals_.insert(DicomTag(0x0400, 0x0561)); // Original Attributes Sequence +removals_.insert(DicomTag(0x0400, 0x0600)); // Instance Origin Status +removals_.insert(DicomTag(0x2030, 0x0020)); // Text String +removals_.insert(DicomTag(0x2100, 0x0040)); // Creation Date +removals_.insert(DicomTag(0x2100, 0x0050)); // Creation Time +removals_.insert(DicomTag(0x2100, 0x0070)); // Originator +removals_.insert(DicomTag(0x2200, 0x0002)); /* X/Z */ // Label Text +removals_.insert(DicomTag(0x2200, 0x0005)); /* X/Z */ // Barcode Value +removals_.insert(DicomTag(0x3002, 0x0121)); // Position Acquisition Template Name +removals_.insert(DicomTag(0x3002, 0x0123)); // Position Acquisition Template Description +removals_.insert(DicomTag(0x3006, 0x0004)); // Structure Set Name +removals_.insert(DicomTag(0x3006, 0x0006)); // Structure Set Description +removals_.insert(DicomTag(0x3006, 0x0028)); // ROI Description +removals_.insert(DicomTag(0x3006, 0x0038)); // ROI Generation Description +removals_.insert(DicomTag(0x3006, 0x0085)); // ROI Observation Label +removals_.insert(DicomTag(0x3006, 0x0088)); // ROI Observation Description +removals_.insert(DicomTag(0x3008, 0x0054)); /* X/D */ // First Treatment Date +removals_.insert(DicomTag(0x3008, 0x0056)); /* X/D */ // Most Recent Treatment Date +removals_.insert(DicomTag(0x3008, 0x0105)); /* X/Z */ // Source Serial Number +removals_.insert(DicomTag(0x3008, 0x0250)); /* X/D */ // Treatment Date +removals_.insert(DicomTag(0x3008, 0x0251)); /* X/D */ // Treatment Time +removals_.insert(DicomTag(0x300a, 0x0003)); // RT Plan Name +removals_.insert(DicomTag(0x300a, 0x0004)); // RT Plan Description +removals_.insert(DicomTag(0x300a, 0x0006)); /* X/D */ // RT Plan Date +removals_.insert(DicomTag(0x300a, 0x0007)); /* X/D */ // RT Plan Time +removals_.insert(DicomTag(0x300a, 0x000b)); // Treatment Sites +removals_.insert(DicomTag(0x300a, 0x000e)); // Prescription Description +removals_.insert(DicomTag(0x300a, 0x0016)); // Dose Reference Description +removals_.insert(DicomTag(0x300a, 0x0072)); // Fraction Group Description +removals_.insert(DicomTag(0x300a, 0x00b2)); /* X/Z */ // Treatment Machine Name +removals_.insert(DicomTag(0x300a, 0x00c3)); // Beam Description +removals_.insert(DicomTag(0x300a, 0x00dd)); // Bolus Description +removals_.insert(DicomTag(0x300a, 0x0196)); // Fixation Device Description +removals_.insert(DicomTag(0x300a, 0x01a6)); // Shielding Device Description +removals_.insert(DicomTag(0x300a, 0x01b2)); // Setup Technique Description +removals_.insert(DicomTag(0x300a, 0x0216)); // Source Manufacturer +removals_.insert(DicomTag(0x300a, 0x02eb)); // Compensator Description +removals_.insert(DicomTag(0x300a, 0x0676)); // Equipment Frame of Reference Description +removals_.insert(DicomTag(0x300a, 0x078e)); // Patient Treatment Preparation Procedure Parameter Description +removals_.insert(DicomTag(0x300a, 0x0792)); // Patient Treatment Preparation Method Description +removals_.insert(DicomTag(0x300a, 0x0794)); // Patient Setup Photo Description +removals_.insert(DicomTag(0x300a, 0x079a)); // Displacement Reference Label +removals_.insert(DicomTag(0x300c, 0x0113)); // Reason for Omission Description +removals_.insert(DicomTag(0x300e, 0x0008)); /* X/Z */ // Reviewer Name +removals_.insert(DicomTag(0x3010, 0x0036)); // Entity Name +removals_.insert(DicomTag(0x3010, 0x0037)); // Entity Description +removals_.insert(DicomTag(0x3010, 0x004c)); /* X/D */ // Intended Phase Start Date +removals_.insert(DicomTag(0x3010, 0x004d)); /* X/D */ // Intended Phase End Date +removals_.insert(DicomTag(0x3010, 0x0056)); /* X/D */ // RT Treatment Approach Label +removals_.insert(DicomTag(0x3010, 0x0061)); // Prior Treatment Dose Description +removals_.insert(DicomTag(0x3010, 0x0077)); /* X/D */ // Treatment Site +removals_.insert(DicomTag(0x3010, 0x0085)); // Intended Fraction Start Time +removals_.insert(DicomTag(0x4000, 0x0010)); // Arbitrary +removals_.insert(DicomTag(0x4000, 0x4000)); // Text Comments +removals_.insert(DicomTag(0x4008, 0x0040)); // Results ID +removals_.insert(DicomTag(0x4008, 0x0042)); // Results ID Issuer +removals_.insert(DicomTag(0x4008, 0x0100)); // Interpretation Recorded Date +removals_.insert(DicomTag(0x4008, 0x0101)); // Interpretation Recorded Time +removals_.insert(DicomTag(0x4008, 0x0102)); // Interpretation Recorder +removals_.insert(DicomTag(0x4008, 0x0108)); // Interpretation Transcription Date +removals_.insert(DicomTag(0x4008, 0x0109)); // Interpretation Transcription Time +removals_.insert(DicomTag(0x4008, 0x010a)); // Interpretation Transcriber +removals_.insert(DicomTag(0x4008, 0x010b)); // Interpretation Text +removals_.insert(DicomTag(0x4008, 0x010c)); // Interpretation Author +removals_.insert(DicomTag(0x4008, 0x0111)); // Interpretation Approver Sequence +removals_.insert(DicomTag(0x4008, 0x0112)); // Interpretation Approval Date +removals_.insert(DicomTag(0x4008, 0x0113)); // Interpretation Approval Time +removals_.insert(DicomTag(0x4008, 0x0114)); // Physician Approving Interpretation +removals_.insert(DicomTag(0x4008, 0x0115)); // Interpretation Diagnosis Description +removals_.insert(DicomTag(0x4008, 0x0118)); // Results Distribution List Sequence +removals_.insert(DicomTag(0x4008, 0x0119)); // Distribution Name +removals_.insert(DicomTag(0x4008, 0x011a)); // Distribution Address +removals_.insert(DicomTag(0x4008, 0x0200)); // Interpretation ID +removals_.insert(DicomTag(0x4008, 0x0202)); // Interpretation ID Issuer +removals_.insert(DicomTag(0x4008, 0x0300)); // Impressions +removals_.insert(DicomTag(0x4008, 0x4000)); // Results Comments +removals_.insert(DicomTag(0xfffa, 0xfffa)); // Digital Signatures Sequence +removals_.insert(DicomTag(0xfffc, 0xfffc)); // Data Set Trailing Padding +removedRanges_.push_back(DicomTagRange(0x5000, 0x50ff, 0x0000, 0xffff)); // Curve Data +removedRanges_.push_back(DicomTagRange(0x6000, 0x60ff, 0x3000, 0x3000)); // Overlay Data +removedRanges_.push_back(DicomTagRange(0x6000, 0x60ff, 0x4000, 0x4000)); // Overlay Comments +uids_.insert(DicomTag(0x0000, 0x1001)); // Requested SOP Instance UID +uids_.insert(DicomTag(0x0002, 0x0003)); // Media Storage SOP Instance UID +uids_.insert(DicomTag(0x0004, 0x1511)); // Referenced SOP Instance UID in File +uids_.insert(DicomTag(0x0008, 0x0014)); // Instance Creator UID +uids_.insert(DicomTag(0x0008, 0x0017)); // Acquisition UID +uids_.insert(DicomTag(0x0008, 0x0019)); // Pyramid UID +uids_.insert(DicomTag(0x0008, 0x0058)); // Failed SOP Instance UID List +uids_.insert(DicomTag(0x0008, 0x1155)); // Referenced SOP Instance UID +uids_.insert(DicomTag(0x0008, 0x1195)); // Transaction UID +uids_.insert(DicomTag(0x0008, 0x3010)); // Irradiation Event UID +uids_.insert(DicomTag(0x0018, 0x1002)); // Device UID +uids_.insert(DicomTag(0x0018, 0x100b)); // Manufacturer's Device Class UID +uids_.insert(DicomTag(0x0018, 0x2042)); // Target UID +uids_.insert(DicomTag(0x0020, 0x0052)); // Frame of Reference UID +uids_.insert(DicomTag(0x0020, 0x0200)); // Synchronization Frame of Reference UID +uids_.insert(DicomTag(0x0020, 0x9161)); // Concatenation UID +uids_.insert(DicomTag(0x0020, 0x9164)); // Dimension Organization UID +uids_.insert(DicomTag(0x0028, 0x1199)); // Palette Color Lookup Table UID +uids_.insert(DicomTag(0x0028, 0x1214)); // Large Palette Color Lookup Table UID +uids_.insert(DicomTag(0x003a, 0x0310)); // Multiplex Group UID +uids_.insert(DicomTag(0x0040, 0x0554)); // Specimen UID +uids_.insert(DicomTag(0x0040, 0x4023)); // Referenced General Purpose Scheduled Procedure Step Transaction UID +uids_.insert(DicomTag(0x0040, 0xa124)); // UID +uids_.insert(DicomTag(0x0040, 0xa171)); // Observation UID +uids_.insert(DicomTag(0x0040, 0xa172)); // Referenced Observation UID (Trial) +uids_.insert(DicomTag(0x0040, 0xa402)); // Observation Subject UID (Trial) +uids_.insert(DicomTag(0x0040, 0xdb0c)); // Template Extension Organization UID +uids_.insert(DicomTag(0x0040, 0xdb0d)); // Template Extension Creator UID +uids_.insert(DicomTag(0x0062, 0x0021)); // Tracking UID +uids_.insert(DicomTag(0x0064, 0x0003)); // Source Frame of Reference UID +uids_.insert(DicomTag(0x0070, 0x031a)); // Fiducial UID +uids_.insert(DicomTag(0x0070, 0x1101)); // Presentation Display Collection UID +uids_.insert(DicomTag(0x0070, 0x1102)); // Presentation Sequence Collection UID +uids_.insert(DicomTag(0x0088, 0x0140)); // Storage Media File-set UID +uids_.insert(DicomTag(0x0400, 0x0100)); // Digital Signature UID +uids_.insert(DicomTag(0x3006, 0x0024)); // Referenced Frame of Reference UID +uids_.insert(DicomTag(0x3006, 0x00c2)); // Related Frame of Reference UID +uids_.insert(DicomTag(0x300a, 0x0013)); // Dose Reference UID +uids_.insert(DicomTag(0x300a, 0x0083)); // Referenced Dose Reference UID +uids_.insert(DicomTag(0x300a, 0x0609)); // Treatment Position Group UID +uids_.insert(DicomTag(0x300a, 0x0650)); // Patient Setup UID +uids_.insert(DicomTag(0x300a, 0x0700)); // Treatment Session UID +uids_.insert(DicomTag(0x300a, 0x0785)); // Referenced Treatment Position Group UID +uids_.insert(DicomTag(0x3010, 0x0006)); // Conceptual Volume UID +uids_.insert(DicomTag(0x3010, 0x000b)); // Referenced Conceptual Volume UID +uids_.insert(DicomTag(0x3010, 0x0013)); // Constituent Conceptual Volume UID +uids_.insert(DicomTag(0x3010, 0x0015)); // Source Conceptual Volume UID +uids_.insert(DicomTag(0x3010, 0x0031)); // Referenced Fiducials UID +uids_.insert(DicomTag(0x3010, 0x003b)); // RT Treatment Phase UID +uids_.insert(DicomTag(0x3010, 0x006e)); // Dosimetric Objective UID +uids_.insert(DicomTag(0x3010, 0x006f)); // Referenced Dosimetric Objective UID
--- a/OrthancFramework/Sources/Enumerations.cpp Tue Jun 27 10:39:17 2023 +0200 +++ b/OrthancFramework/Sources/Enumerations.cpp Tue Jun 27 15:12:39 2023 +0200 @@ -878,15 +878,15 @@ { case DicomVersion_2008: return "2008"; - break; case DicomVersion_2017c: return "2017c"; - break; case DicomVersion_2021b: return "2021b"; - break; + + case DicomVersion_2023b: + return "2023b"; default: throw OrthancException(ErrorCode_ParameterOutOfRange); @@ -1642,6 +1642,10 @@ { return DicomVersion_2021b; } + else if (version == "2023b") + { + return DicomVersion_2023b; + } else { throw OrthancException(ErrorCode_ParameterOutOfRange,
--- a/OrthancFramework/Sources/Enumerations.h Tue Jun 27 10:39:17 2023 +0200 +++ b/OrthancFramework/Sources/Enumerations.h Tue Jun 27 15:12:39 2023 +0200 @@ -620,7 +620,8 @@ { DicomVersion_2008, DicomVersion_2017c, - DicomVersion_2021b + DicomVersion_2021b, + DicomVersion_2023b }; enum ModalityManufacturer
--- a/OrthancFramework/UnitTestsSources/FrameworkTests.cpp Tue Jun 27 10:39:17 2023 +0200 +++ b/OrthancFramework/UnitTestsSources/FrameworkTests.cpp Tue Jun 27 15:12:39 2023 +0200 @@ -749,6 +749,7 @@ ASSERT_EQ(DicomVersion_2008, StringToDicomVersion(EnumerationToString(DicomVersion_2008))); ASSERT_EQ(DicomVersion_2017c, StringToDicomVersion(EnumerationToString(DicomVersion_2017c))); ASSERT_EQ(DicomVersion_2021b, StringToDicomVersion(EnumerationToString(DicomVersion_2021b))); + ASSERT_EQ(DicomVersion_2023b, StringToDicomVersion(EnumerationToString(DicomVersion_2023b))); for (int i = static_cast<int>(ValueRepresentation_ApplicationEntity); i < static_cast<int>(ValueRepresentation_NotSupported); i += 1)
--- a/OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp Tue Jun 27 10:39:17 2023 +0200 +++ b/OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp Tue Jun 27 15:12:39 2023 +0200 @@ -2772,7 +2772,7 @@ { DicomModification modif; - modif.SetupAnonymization(DicomVersion_2021b); + modif.SetupAnonymization(DicomVersion_2023b); modif.Apply(*dicom1); modif.Apply(*dicom2); } @@ -2799,7 +2799,7 @@ { DicomModification modif; - modif.SetupAnonymization(DicomVersion_2021b); + modif.SetupAnonymization(DicomVersion_2023b); modif.Keep(DicomPath::Parse("ReferencedImageSequence[1].ReferencedSOPInstanceUID")); modif.Keep(DicomPath::Parse("RelatedSeriesSequence")); modif.Apply(*dicom);
--- a/OrthancServer/Resources/Configuration.json Tue Jun 27 10:39:17 2023 +0200 +++ b/OrthancServer/Resources/Configuration.json Tue Jun 27 15:12:39 2023 +0200 @@ -852,9 +852,9 @@ // If "DeidentifyLogs" is true, this sets the DICOM standard to // follow for the deidentification/anonymization of the query - // contents. Possible values are "2008", "2017c" and "2021b" (new - // in Orthanc 1.8.2) - "DeidentifyLogsDicomVersion" : "2021b", + // contents. Possible values are "2008", "2017c", "2021b" (new + // in Orthanc 1.8.2), and "2023b" (new in Orthanc 1.12.1) + "DeidentifyLogsDicomVersion" : "2023b", // Maximum length of the PDU (Protocol Data Unit) in the DICOM // network protocol, expressed in bytes. This value affects both
--- a/OrthancServer/Resources/GenerateAnonymizationProfile.py Tue Jun 27 10:39:17 2023 +0200 +++ b/OrthancServer/Resources/GenerateAnonymizationProfile.py Tue Jun 27 15:12:39 2023 +0200 @@ -26,7 +26,7 @@ import xml.etree.ElementTree as ET # Usage: -# ./GenerateAnonymizationProfile.py https://raw.githubusercontent.com/jodogne/dicom-specification/master/2021b/part15.xml +# ./GenerateAnonymizationProfile.py https://raw.githubusercontent.com/jodogne/dicom-specification/master/2023b/part15.xml > ../../OrthancFramework/Sources/DicomParsing/DicomModification_Anonymization2023b.impl.h if len(sys.argv) != 2: raise Exception('Please provide the path or the URL to the part15.xml file from the DICOM standard')
--- a/OrthancServer/Sources/ServerContext.cpp Tue Jun 27 10:39:17 2023 +0200 +++ b/OrthancServer/Sources/ServerContext.cpp Tue Jun 27 15:12:39 2023 +0200 @@ -406,7 +406,7 @@ CLOG(INFO, DICOM) << "Deidentification of log contents (notably for DIMSE queries) is enabled"; DicomVersion version = StringToDicomVersion( - lock.GetConfiguration().GetStringParameter("DeidentifyLogsDicomVersion", "2021b")); + lock.GetConfiguration().GetStringParameter("DeidentifyLogsDicomVersion", "2023b")); CLOG(INFO, DICOM) << "Version of DICOM standard used for deidentification is " << EnumerationToString(version);
--- a/OrthancServer/UnitTestsSources/ServerJobsTests.cpp Tue Jun 27 10:39:17 2023 +0200 +++ b/OrthancServer/UnitTestsSources/ServerJobsTests.cpp Tue Jun 27 15:12:39 2023 +0200 @@ -725,7 +725,7 @@ { std::unique_ptr<DicomModification> modification(new DicomModification); - modification->SetupAnonymization(DicomVersion_2021b); + modification->SetupAnonymization(DicomVersion_2023b); ModifyInstanceOperation operation(GetContext(), RequestOrigin_Lua, modification.release());