From 9ae4d3b5d183d927366f7eeb31cb2877b91448bd Mon Sep 17 00:00:00 2001 From: Johan van Soest Date: Wed, 1 Apr 2015 09:54:08 +0200 Subject: [PATCH] Added opportunity to use DICOM tag values in @hashuid, next to the internal anonymizer parameters --- .../stdstages/anonymizer/dicom/DICOMAnonymizer.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/source/java/org/rsna/ctp/stdstages/anonymizer/dicom/DICOMAnonymizer.java b/source/java/org/rsna/ctp/stdstages/anonymizer/dicom/DICOMAnonymizer.java index e8c231a5..d27ce795 100644 --- a/source/java/org/rsna/ctp/stdstages/anonymizer/dicom/DICOMAnonymizer.java +++ b/source/java/org/rsna/ctp/stdstages/anonymizer/dicom/DICOMAnonymizer.java @@ -1110,7 +1110,15 @@ private static String hashuid(FnCall fn) { String removeUID = "@remove()"; try { if (fn.args.length < 2) return fn.getArgs(); - String prefix = getParam(fn); + + //use prefix of anonymizer parameter, or from dicom tag + String prefix = ""; + if(fn.args[0].startsWith("@")) { + prefix = getParam(fn); + } else { + prefix = fn.context.contentsNull(fn.args[0], fn.thisTag); + } + String uid = fn.context.contentsNull(fn.args[1], fn.thisTag); //If there is no UID in the dataset, then return @remove(). if (uid == null) return removeUID;