From 3dc7e8198533c78027a383687b1f86cfa0155d21 Mon Sep 17 00:00:00 2001 From: Vrinda Date: Tue, 29 Sep 2020 14:12:49 +0200 Subject: [PATCH] Revert "Fix #2788 : Audit WADO URI event : Improve spool file naming to contain combination of Study and SOP IUIDs to avoid aggregation of instances of same study in one spool file" This reverts commit 7710374d737de00213ef6b77d6f13d4175ee1a40. --- .../src/main/java/org/dcm4chee/arc/audit/AuditService.java | 4 +--- .../main/java/org/dcm4chee/arc/audit/ParticipantObjectID.java | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditService.java b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditService.java index 120b5586bb..e40c6116eb 100644 --- a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditService.java +++ b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/AuditService.java @@ -533,8 +533,7 @@ void spoolRetrieveWADO(RetrieveContext ctx) { Attributes attrs = ctx.getMatches().get(0).getAttributes(); String suffix = '-' + req.requesterHost + '-' + ctx.getLocalAETitle() - + '-' + ctx.getStudyInstanceUIDs()[0] - + '-' + ctx.getSopInstanceUIDs()[0]; + + '-' + ctx.getStudyInstanceUIDs()[0]; AuditInfoBuilder info = new AuditInfoBuilder.Builder() .callingHost(req.requesterHost) .callingUserID(req.requesterUserID) @@ -542,7 +541,6 @@ void spoolRetrieveWADO(RetrieveContext ctx) { .studyUIDAccNumDate(attrs, getArchiveDevice()) .pIDAndName(attrs, getArchiveDevice()) .outcome(null != ctx.getException() ? ctx.getException().getMessage() : null) - .queryString(req.queryString) .build(); AuditInfoBuilder instanceInfo = new AuditInfoBuilder.Builder() .sopCUID(attrs.getString(Tag.SOPClassUID)) diff --git a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/ParticipantObjectID.java b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/ParticipantObjectID.java index 1318bad6cb..859134d9b0 100644 --- a/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/ParticipantObjectID.java +++ b/dcm4chee-arc-audit/src/main/java/org/dcm4chee/arc/audit/ParticipantObjectID.java @@ -129,9 +129,6 @@ static ParticipantObjectIdentificationBuilder[] studyPatParticipants( || eventType.eventClass == AuditUtils.EventClass.IMPAX)) studyPOIBuilder.lifeCycle(AuditMessages.ParticipantObjectDataLifeCycle.OriginationCreation); - if (eventType.eventClass == AuditUtils.EventClass.STORE_WADOR && auditInfo.getField(AuditInfo.Q_STRING) != null) - studyPOIBuilder.query(auditInfo.getField(AuditInfo.Q_STRING).getBytes()); - studyPatParticipants[0] = studyPOIBuilder.build(); studyPatParticipants[1] = patientPOIBuilder(auditInfo).build(); return studyPatParticipants;