diff --git a/src/WorkflowManager/Contracts/Migrations/M003_WorkflowRevision_addDataRetension.cs b/src/WorkflowManager/Contracts/Migrations/M003_WorkflowRevision_addDataRetension.cs index b409c0f13..f04be721e 100755 --- a/src/WorkflowManager/Contracts/Migrations/M003_WorkflowRevision_addDataRetension.cs +++ b/src/WorkflowManager/Contracts/Migrations/M003_WorkflowRevision_addDataRetension.cs @@ -26,8 +26,15 @@ public M003_WorkflowRevision_addDataRetension() : base("1.0.3") { } public override void Up(BsonDocument document) { - var workflow = document["Workflow"].AsBsonDocument; - workflow.Add("DataRetentionDays", -1, true); + try + { + var workflow = document["Workflow"].AsBsonDocument; + workflow.Add("DataRetentionDays", -1, true); + } + catch + {// can ignore we dont want failures stopping startup ! + } + } public override void Down(BsonDocument document) diff --git a/src/WorkflowManager/Contracts/Migrations/M004_WorkflowRevision_addConditions.cs b/src/WorkflowManager/Contracts/Migrations/M004_WorkflowRevision_addConditions.cs index 37c3bf158..1073b00f7 100755 --- a/src/WorkflowManager/Contracts/Migrations/M004_WorkflowRevision_addConditions.cs +++ b/src/WorkflowManager/Contracts/Migrations/M004_WorkflowRevision_addConditions.cs @@ -26,8 +26,15 @@ public M004_WorkflowRevision_addConditions() : base("1.0.4") { } public override void Up(BsonDocument document) { - var workflow = document["Workflow"].AsBsonDocument; - workflow.Add("Conditions", new BsonArray { }); + try + { + var workflow = document["Workflow"].AsBsonDocument; + workflow.Add("Predicate", new BsonArray { }); + } + catch + { // can ignore we dont want failures stopping startup ! + } + } public override void Down(BsonDocument document) @@ -35,7 +42,7 @@ public override void Down(BsonDocument document) try { var workflow = document["Workflow"].AsBsonDocument; - workflow.Remove("Conditions"); + workflow.Remove("Predicate"); } catch { // can ignore we dont want failures stopping startup ! diff --git a/src/WorkflowManager/Storage/Services/DicomService.cs b/src/WorkflowManager/Storage/Services/DicomService.cs index 1b0ac0ec5..c1b4a2c6d 100755 --- a/src/WorkflowManager/Storage/Services/DicomService.cs +++ b/src/WorkflowManager/Storage/Services/DicomService.cs @@ -305,7 +305,9 @@ public string GetValue(Dictionary dict, string keyId) if (dict.TryGetValue(DicomTagConstants.AccessionNumberTag, out var value)) { - return JsonConvert.SerializeObject(value.Value); + var accession = JsonConvert.SerializeObject(value.Value); + accession = accession.Replace("[\"", "").Replace("\"]", ""); + return accession; } return null; }