#4545 : RESTful service to update Instance Attributes

dcm4che · Sep 16, 2024 · 79dded8 · 79dded8
1 parent 62ff665
commit 79dded8
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/dcm4chee-arc-study/src/main/java/org/dcm4chee/arc/study/impl/StudyServiceEJB.java b/dcm4chee-arc-study/src/main/java/org/dcm4chee/arc/study/impl/StudyServiceEJB.java
@@ -174,16 +174,25 @@ public void updateInstance(StudyMgtContext ctx) throws StudyMissingException, Pa
         if (attrs.diff(newAttrs, filter.getSelection(false), modified, true) == 0)
             return;
 
+        ctx.setEventActionCode(AuditMessages.EventActionCode.Update);
+        ctx.setStudy(instance.getSeries().getStudy());
+        if (ctx.getPatient() == null)
+            ctx.setPatient(instance.getSeries().getStudy().getPatient());
+        else if (instance.getSeries().getStudy().getPatient().getPk() != ctx.getPatient().getPk())
+            throw new PatientMismatchException(ctx.getPatient()
+                    + " found using patient identifiers sent in request payload does not match with "
+                    + instance.getSeries().getStudy().getPatient() + " of " + instance);
+
         Attributes.unifyCharacterSets(newAttrs, attrs);
         newAttrs.addSelected(attrs, null, Tag.OriginalAttributesSequence);
         attrs = newAttrs;
         instance.setAttributes(ctx.getReasonForModification() != null
                         ? attrs.addOriginalAttributes(
-                        ctx.getSourceOfPreviousValues(),
-                        new Date(),
-                        ctx.getReasonForModification(),
-                        device.getDeviceName(),
-                        modified)
+                            ctx.getSourceOfPreviousValues(),
+                            new Date(),
+                            ctx.getReasonForModification(),
+                            device.getDeviceName(),
+                            modified)
                         : attrs,
                 filter, true, ctx.getFuzzyStr());
         em.createNamedQuery(Series.SCHEDULE_METADATA_UPDATE_FOR_SERIES)