Support Range Matching by Attributes.matches(Attributes keys,..) dcm4…

…che/dcm4chee-arc-light#830
dcm4che · Jun 30, 2017 · 00dcd92 · 00dcd92
1 parent f11d1e1
commit 00dcd92
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/dcm4che-core/src/main/java/org/dcm4che3/data/Attributes.java b/dcm4che-core/src/main/java/org/dcm4che3/data/Attributes.java
@@ -2944,8 +2944,6 @@ private boolean matches(String privateCreator, int tag, VR vr,
         boolean ignoreCase = ignorePNCase && vr == VR.PN;
         for (String keyVal : keyVals) {
             DateRange dateRange = null;
-            if (vr == VR.PN)
-                keyVal = new PersonName(keyVals[0]).toString();
             switch (vr) {
                 case PN:
                     keyVal = new PersonName(keyVals[0]).toString();
@@ -2954,6 +2952,7 @@ private boolean matches(String privateCreator, int tag, VR vr,
                 case DT:
                 case TM:
                     dateRange = toDateRange(keyVal, vr);
+                    break;
             }
 
             if (StringUtils.containsWildCard(keyVal)) {