201 202 203 misc fixes (#221)

jackschofield23 · web-flow · commit 92c88c09de95 · 2022-07-14T10:40:29.000+01:00
* misc fixes

Signed-off-by: Jack Schofield &lt;jack.schofield@answerdigital.com&gt;
diff --git a/src/ConditionsResolver/Parser/ConditionalParameterParser.cs b/src/ConditionsResolver/Parser/ConditionalParameterParser.cs
@@ -90,7 +90,7 @@ public bool TryParse(string conditions, WorkflowInstance workflowInstance)
             }
             catch (Exception ex)
             {
-                _logger.LogWarning("Failure attemping to parse condition", conditions, ex.Message);
+                _logger.LogWarning($"Failure attemping to parse condition - {conditions}", ex);
                 return false;
             }
         }
@@ -137,7 +137,7 @@ public string ResolveParameters(string conditions, string workflowInstanceId)
             {
                 _logger.LogError(e.Message);
                 ClearWorkflowParser();
-                throw e;
+                throw;
             }
         }
 
@@ -323,6 +323,12 @@ private void ClearWorkflowParser()
                     case "dob":
                         resultStr = patientValue.PatientDob?.ToString("dd/MM/yyyy");
                         break;
+                    case "age":
+                        resultStr = patientValue.PatientAge;
+                        break;
+                    case "hospital_id":
+                        resultStr = patientValue.PatientHospitalId;
+                        break;
                     default:
                         break;
                 }
diff --git a/src/Contracts/Models/PatientDetails.cs b/src/Contracts/Models/PatientDetails.cs
@@ -16,5 +16,11 @@ public class PatientDetails
 
         [JsonProperty(PropertyName = "patient_dob")]
         public DateTime? PatientDob { get; set; }
+
+        [JsonProperty(PropertyName = "patient_age")]
+        public string PatientAge { get; set; }
+
+        [JsonProperty(PropertyName = "patient_hospital_id")]
+        public string PatientHospitalId { get; set; }
     }
 }
diff --git a/src/Contracts/Models/TaskExecution.cs b/src/Contracts/Models/TaskExecution.cs
@@ -28,9 +28,15 @@ public class TaskExecution
         [JsonProperty(PropertyName = "task_id")]
         public string TaskId { get; set; }
 
+        [JsonProperty(PropertyName = "previous_task_id")]
+        public string PreviousTaskId { get; set; }
+
         [JsonProperty(PropertyName = "status")]
         public TaskExecutionStatus Status { get; set; }
 
+        [JsonProperty(PropertyName = "reason")]
+        public FailureReason Reason { get; set; }
+
         [JsonProperty(PropertyName = "input_artifacts")]
         public Dictionary<string, string> InputArtifacts { get; set; }
 
diff --git a/src/Database/WorkflowInstanceRepository.cs b/src/Database/WorkflowInstanceRepository.cs
@@ -157,9 +157,10 @@ public async Task<bool> UpdateWorkflowInstanceStatusAsync(string workflowInstanc
 
             try
             {
-                var result = await _workflowInstanceCollection.FindOneAndUpdateAsync(
+                await _workflowInstanceCollection.FindOneAndUpdateAsync(
                     i => i.Id == workflowInstanceId,
                     Builders<WorkflowInstance>.Update.Set(w => w.Status, status));
+
                 return true;
             }
             catch (Exception e)
@@ -197,9 +198,10 @@ public async Task<bool> UpdateTasksAsync(string workflowInstanceId, List<TaskExe
 
             try
             {
-                var result = await _workflowInstanceCollection.FindOneAndUpdateAsync(
+                await _workflowInstanceCollection.FindOneAndUpdateAsync(
                     i => i.Id == workflowInstanceId,
                     Builders<WorkflowInstance>.Update.Set(w => w.Tasks, tasks));
+
                 return true;
             }
             catch (Exception e)
diff --git a/src/Logging/Logging/Log.cs b/src/Logging/Logging/Log.cs
@@ -76,16 +76,16 @@ public static partial class Log
         [LoggerMessage(EventId = 22, Level = LogLevel.Error, Message = "The task execution status for task {taskId} cannot be updated from {oldStatus} to {newStatus}. Payload: {payloadId}")]
         public static partial void TaskStatusUpdateNotValid(this ILogger logger, string payloadId, string taskId, string oldStatus, string newStatus);
 
-        [LoggerMessage(EventId = 23, Level = LogLevel.Error, Message = "The task {taskId} metadata store update failed. Payload: {payloadId}")]
+        [LoggerMessage(EventId = 23, Level = LogLevel.Error, Message = "The task {taskId} metadata store update failed. Payload: {payloadId} - Metadata: {metadata}")]
         public static partial void TaskMetaDataUpdateFailed(this ILogger logger, string payloadId, string taskId, Dictionary<string, object> metadata);
         
         [LoggerMessage(EventId = 24, Level = LogLevel.Debug, Message = "No files to export for task {taskId} within workflow instance {workflowInstanceId}.")]
         public static partial void ExportFilesNotFound(this ILogger logger, string taskId, string workflowInstanceId);
 
-        [LoggerMessage(EventId = 24, Level = LogLevel.Error, Message = "Failed to get dicom tag {keyId} in bucket {bucketId}. Payload: {payloadId}")]
+        [LoggerMessage(EventId = 25, Level = LogLevel.Error, Message = "Failed to get dicom tag {keyId} in bucket {bucketId}. Payload: {payloadId}")]
         public static partial void FailedToGetDicomTag(this ILogger logger, string payloadId, string keyId, string bucketId, Exception ex);
 
-        [LoggerMessage(EventId = 25, Level = LogLevel.Error, Message = "Failed to get patient details in bucket {bucketId}. Payload: {payloadId}")]
+        [LoggerMessage(EventId = 26, Level = LogLevel.Error, Message = "Failed to get patient details in bucket {bucketId}. Payload: {payloadId}")]
         public static partial void FailedToGetPatientDetails(this ILogger logger, string payloadId, string bucketId, Exception ex);
 
         public static void TaskComplete(this ILogger logger, TaskExecution task, WorkflowInstance workflowInstance, PatientDetails patientDetails, string correlationId, string taskStatus)
@@ -98,7 +98,7 @@ public static void TaskComplete(this ILogger logger, TaskExecution task, Workflo
 
             var jsonString = JsonConvert.SerializeObject(objectLog);
 
-            logger.LogInformation(26, message: jsonString);
+            logger.LogInformation(27, message: jsonString);
         }
     }
 }
diff --git a/src/Logging/Monai.Deploy.WorkflowManager.Logging.csproj b/src/Logging/Monai.Deploy.WorkflowManager.Logging.csproj
@@ -8,7 +8,6 @@ SPDX-License-Identifier: Apache License 2.0
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Constants/DicomTagConstants.cs b/src/Monai.Deploy.WorkflowManager.Storage/Constants/DicomTagConstants.cs
@@ -12,5 +12,9 @@ public static class DicomTagConstants
         public const string PatientSexTag = "00100040";
 
         public const string PatientDateOfBirthTag = "00100030";
+
+        public const string PatientAgeTag = "00101010";
+
+        public const string PatientHospitalIdTag = "00100021";
     }
 }
diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Services/DicomService.cs b/src/Monai.Deploy.WorkflowManager.Storage/Services/DicomService.cs
@@ -34,7 +34,9 @@ public async Task<PatientDetails> GetPayloadPatientDetailsAsync(string payloadId
             {
                 PatientName = await GetFirstValueAsync(items, payloadId, bucketName, DicomTagConstants.PatientNameTag),
                 PatientId = await GetFirstValueAsync(items, payloadId, bucketName, DicomTagConstants.PatientIdTag),
-                PatientSex = await GetFirstValueAsync(items, payloadId, bucketName, DicomTagConstants.PatientSexTag)
+                PatientSex = await GetFirstValueAsync(items, payloadId, bucketName, DicomTagConstants.PatientSexTag),
+                PatientAge = await GetFirstValueAsync(items, payloadId, bucketName, DicomTagConstants.PatientAgeTag),
+                PatientHospitalId = await GetFirstValueAsync(items, payloadId, bucketName, DicomTagConstants.PatientHospitalIdTag)
             };
 
             var dob = await GetFirstValueAsync(items, payloadId, bucketName, DicomTagConstants.PatientDateOfBirthTag);
@@ -187,6 +189,12 @@ public async Task<string> GetDcmJsonFileValueAtIndexAsync(int index,
             var jsonStr = Encoding.UTF8.GetString(((MemoryStream)stream).ToArray());
 
             var dict = JsonConvert.DeserializeObject<Dictionary<string, DicomValue>>(jsonStr);
+
+            if (dict is null)
+            {
+                return string.Empty;
+            }
+
             dict.TryGetValue(keyId, out var value);
 
             if (value is not null && value.Value is not null)
diff --git a/src/Monai.Deploy.WorkflowManager.Storage/Services/IDicomService.cs b/src/Monai.Deploy.WorkflowManager.Storage/Services/IDicomService.cs
@@ -14,6 +14,11 @@ public interface IDicomService
         /// <param name="bucketName">Name of the bucket.</param>
         Task<IEnumerable<string>> GetDicomPathsForTaskAsync(string outputDirectory, string bucketName);
 
+        /// <summary>
+        /// Gets patient details from the dicom metadata.
+        /// </summary>
+        /// <param name="payloadId">Payload id.</param>
+        /// <param name="bucketName">Name of the bucket.</param>
         Task<PatientDetails> GetPayloadPatientDetailsAsync(string payloadId, string bucketName);
 
         /// <summary>
diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs b/src/TaskManager/Plug-ins/AideClinicalReview/AideClinicalReviewPlugin.cs
@@ -22,6 +22,8 @@ public class AideClinicalReviewPlugin : TaskPluginBase, IAsyncDisposable
         private string _patientName;
         private string _patientSex;
         private string _patientDob;
+        private string _patientAge;
+        private string _patientHospitalId;
         private string _queueName;
         private string _workflowName;
 
@@ -65,6 +67,16 @@ private void Initialize()
                 _patientDob = Event.TaskPluginArguments[Keys.PatientDob];
             }
 
+            if (Event.TaskPluginArguments.ContainsKey(Keys.PatientAge))
+            {
+                _patientAge = Event.TaskPluginArguments[Keys.PatientAge];
+            }
+
+            if (Event.TaskPluginArguments.ContainsKey(Keys.PatientHospitalId))
+            {
+                _patientHospitalId = Event.TaskPluginArguments[Keys.PatientHospitalId];
+            }
+
             if (Event.TaskPluginArguments.ContainsKey(Keys.QueueName))
             {
                 _queueName = Event.TaskPluginArguments[Keys.QueueName];
@@ -123,7 +135,9 @@ private JsonMessage<ClinicalReviewRequestEvent> GenerateClinicalReviewRequestEve
                     PatientId = _patientId,
                     PatientSex = _patientSex,
                     PatientName = _patientName,
-                    PatientDob = _patientDob
+                    PatientDob = _patientDob,
+                    PatientAge = _patientAge,
+                    PatientHospitalId = _patientHospitalId
                 }
             }, TaskManagerApplicationId, Event.CorrelationId);
         }
@@ -139,7 +153,7 @@ private async Task SendClinicalReviewRequestEvent(JsonMessage<ClinicalReviewRequ
 
         public override async Task<ExecutionStatus> GetStatus(string identity, CancellationToken cancellationToken = default)
         {
-            return new ExecutionStatus { Status = TaskExecutionStatus.Succeeded };
+            return await Task.Run(() => new ExecutionStatus { Status = TaskExecutionStatus.Succeeded });
         }
 
         ~AideClinicalReviewPlugin() => Dispose(disposing: false);
diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Keys.cs b/src/TaskManager/Plug-ins/AideClinicalReview/Keys.cs
@@ -22,6 +22,16 @@ public class Keys
         /// </summary>
         public static readonly string PatientDob = "patient_dob";
 
+        /// <summary>
+        /// Key for the patient age.
+        /// </summary>
+        public static readonly string PatientAge = "patient_age";
+
+        /// <summary>
+        /// Key for the patient hospital id.
+        /// </summary>
+        public static readonly string PatientHospitalId = "patient_hospital_id";
+
         /// <summary>
         /// Key for the workflow name.
         /// </summary>
@@ -42,13 +52,8 @@ public class Keys
         /// </summary>
         public static readonly IReadOnlyList<string> RequiredParameters =
             new List<string> {
-                PatientId,
-                PatientName,
-                PatientSex,
-                PatientDob,
                 QueueName,
-                WorkflowName,
-                ReviewedTaskDetails
+                WorkflowName
             };
     }
 }
diff --git a/src/TaskManager/Plug-ins/AideClinicalReview/Models/PatientMetadata.cs b/src/TaskManager/Plug-ins/AideClinicalReview/Models/PatientMetadata.cs
@@ -1,24 +1,25 @@
-﻿using System.ComponentModel.DataAnnotations;
-using Newtonsoft.Json;
+﻿using Newtonsoft.Json;
 
 namespace Monai.Deploy.WorkflowManager.TaskManager.AideClinicalReview.Models
 {
     public class PatientMetadata
     {
         [JsonProperty(PropertyName = "patient_name")]
-        [Required]
         public string PatientName { get; set; }
 
         [JsonProperty(PropertyName = "patient_id")]
-        [Required]
         public string PatientId { get; set; }
 
         [JsonProperty(PropertyName = "patient_dob")]
-        [Required]
         public string PatientDob { get; set; }
 
         [JsonProperty(PropertyName = "patient_sex")]
-        [Required]
         public string PatientSex { get; set; }
+
+        [JsonProperty(PropertyName = "patient_age")]
+        public string PatientAge { get; set; }
+
+        [JsonProperty(PropertyName = "patient_hospital_id")]
+        public string PatientHospitalId { get; set; }
     }
 }
diff --git a/src/TaskManager/TaskManager.cs b/src/TaskManager/TaskManager.cs
@@ -166,6 +166,8 @@ private async Task HandleTaskCallback(JsonMessage<TaskCallbackEvent> message)
                 var executionStatus = await runner.Runner.GetStatus(message.Body.Identity, _cancellationTokenSource.Token).ConfigureAwait(false);
                 updateMessage = GenerateUpdateEventMessage(message, message.Body.ExecutionId, message.Body.WorkflowInstanceId, message.Body.TaskId, executionStatus);
                 updateMessage.Body.Metadata.Add(Strings.JobIdentity, message.Body.Identity);
+                foreach (var item in message.Body.Metadata)
+                    updateMessage.Body.Metadata.Add(item.Key, item.Value);
             }
             catch (Exception ex)
             {
diff --git a/src/WorkflowExecuter/Common/EventMapper.cs b/src/WorkflowExecuter/Common/EventMapper.cs
@@ -10,11 +10,12 @@ namespace Monai.Deploy.WorkflowManager.WorkfowExecuter.Common
 {
     public static class EventMapper
     {
-        public static TaskDispatchEvent ToTaskDispatchEvent(TaskExecution task, string workflowId, string correlationId, StorageServiceConfiguration configuration)
+        public static TaskDispatchEvent ToTaskDispatchEvent(TaskExecution task, string workflowInstanceId, string correlationId, string payloadId, StorageServiceConfiguration configuration)
         {
             Guard.Against.Null(task, nameof(task));
-            Guard.Against.Null(workflowId, nameof(workflowId));
-            Guard.Against.Null(correlationId, nameof(correlationId));
+            Guard.Against.NullOrWhiteSpace(workflowInstanceId, nameof(workflowInstanceId));
+            Guard.Against.NullOrWhiteSpace(correlationId, nameof(correlationId));
+            Guard.Against.NullOrWhiteSpace(payloadId, nameof(payloadId));
             Guard.Against.Null(configuration, nameof(configuration));
 
             var inputs = new List<Messaging.Common.Storage>();
@@ -36,7 +37,7 @@ public static TaskDispatchEvent ToTaskDispatchEvent(TaskExecution task, string w
 
             return new TaskDispatchEvent
             {
-                WorkflowInstanceId = workflowId,
+                WorkflowInstanceId = workflowInstanceId,
                 TaskId = task.TaskId,
                 ExecutionId = task.ExecutionId.ToString(),
                 CorrelationId = correlationId,
@@ -45,6 +46,7 @@ public static TaskDispatchEvent ToTaskDispatchEvent(TaskExecution task, string w
                 Inputs = inputs,
                 TaskPluginType = task.TaskType,
                 Metadata = task.Metadata,
+                PayloadId = payloadId,
                 IntermediateStorage = new Messaging.Common.Storage
                 {
                     Bucket = configuration.Settings["bucket"],
diff --git a/src/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowExecuter/Services/WorkflowExecuterService.cs
@@ -187,9 +187,11 @@ public async Task<bool> ProcessTaskUpdate(TaskUpdateEvent message)
                 return false;
             }
 
-            if (message.ExecutionStats is not null)
+            if (message.ExecutionStats is not null
+                || message.Reason != FailureReason.None)
             {
                 currentTask.ExecutionStats = message.ExecutionStats;
+                currentTask.Reason = message.Reason;
                 await _workflowInstanceRepository.UpdateTaskAsync(workflowInstance.Id, currentTask.TaskId, currentTask);
             }
 
@@ -420,24 +422,24 @@ private async Task<List<TaskExecution>> CreateTaskDestinations(WorkflowInstance
                     continue;
                 }
 
-                var newTask = workflow.Workflow.Tasks.FirstOrDefault(t => t.Id == taskDest.Name);
+                var newTask = workflow?.Workflow?.Tasks.FirstOrDefault(t => t.Id == taskDest.Name);
 
                 if (newTask is null)
                 {
-                    _logger.TaskNotFoundInWorkfow(workflowInstance.PayloadId, taskDest.Name, workflow.WorkflowId);
+                    _logger.TaskNotFoundInWorkfow(workflowInstance.PayloadId, taskDest.Name, workflow?.WorkflowId);
 
                     continue;
                 }
 
-                newTaskExecutions.Add(await CreateTaskExecutionAsync(newTask, workflowInstance));
+                newTaskExecutions.Add(await CreateTaskExecutionAsync(newTask, workflowInstance, null, null, taskId));
             }
 
             return newTaskExecutions;
         }
 
         private async Task<bool> DispatchTask(WorkflowInstance workflowInstance, TaskExecution taskExec, string correlationId)
         {
-            var taskDispatchEvent = EventMapper.ToTaskDispatchEvent(taskExec, workflowInstance.Id, correlationId, _storageConfiguration);
+            var taskDispatchEvent = EventMapper.ToTaskDispatchEvent(taskExec, workflowInstance.Id, correlationId, workflowInstance.PayloadId, _storageConfiguration);
             var jsonMesssage = new JsonMessage<TaskDispatchEvent>(taskDispatchEvent, MessageBrokerConfiguration.WorkflowManagerApplicationId, taskDispatchEvent.CorrelationId, Guid.NewGuid().ToString());
 
             await _messageBrokerPublisherService.Publish(TaskDispatchRoutingKey, jsonMesssage.ToMessage());
@@ -476,7 +478,7 @@ private async Task<WorkflowInstance> CreateWorkflowInstanceAsync(WorkflowRequest
 
             var tasks = new List<TaskExecution>();
             // part of this ticket just take the first task
-            if (workflow.Workflow.Tasks.Length > 0)
+            if (workflow?.Workflow?.Tasks.Length > 0)
             {
                 var firstTask = workflow.Workflow.Tasks.First();
 
@@ -506,7 +508,8 @@ private async Task<WorkflowInstance> CreateWorkflowInstanceAsync(WorkflowRequest
         private async Task<TaskExecution> CreateTaskExecutionAsync(TaskObject task,
                                                   WorkflowInstance workflowInstance,
                                                   string? bucketName = null,
-                                                  string? payloadId = null)
+                                                  string? payloadId = null,
+                                                  string? previousTaskId = null)
         {
             Guard.Against.Null(workflowInstance, nameof(workflowInstance));
 
@@ -542,7 +545,8 @@ private async Task<TaskExecution> CreateTaskExecutionAsync(TaskObject task,
                 InputArtifacts = await _artifactMapper.ConvertArtifactVariablesToPath(task?.Artifacts?.Input ?? new Artifact[] { }, payloadId, workflowInstanceId, bucketName),
                 OutputDirectory = $"{payloadId}/workflows/{workflowInstanceId}/{executionId}/",
                 Metadata = { },
-                InputParameters = newInputParameters
+                InputParameters = newInputParameters,
+                PreviousTaskId = previousTaskId
             };
         }
 
diff --git a/tests/UnitTests/Storage.Tests/Services/DicomServiceTests.cs b/tests/UnitTests/Storage.Tests/Services/DicomServiceTests.cs
diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Common/EventMapperTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Common/EventMapperTests.cs
diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/ConditionalParameterParserTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/ConditionalParameterParserTests.cs

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public bool TryParse(string conditions, WorkflowInstance workflowInstance)`
`90`	`90`	`}`
`91`	`91`	`catch (Exception ex)`
`92`	`92`	`{`
`93`		`- _logger.LogWarning("Failure attemping to parse condition", conditions, ex.Message);`
	`93`	`+ _logger.LogWarning($"Failure attemping to parse condition - {conditions}", ex);`
`94`	`94`	`return false;`
`95`	`95`	`}`
`96`	`96`	`}`
`@@ -137,7 +137,7 @@ public string ResolveParameters(string conditions, string workflowInstanceId)`
`137`	`137`	`{`
`138`	`138`	`_logger.LogError(e.Message);`
`139`	`139`	`ClearWorkflowParser();`
`140`		`- throw e;`
	`140`	`+ throw;`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
`@@ -323,6 +323,12 @@ private void ClearWorkflowParser()`
`323`	`323`	`case "dob":`
`324`	`324`	`resultStr = patientValue.PatientDob?.ToString("dd/MM/yyyy");`
`325`	`325`	`break;`
	`326`	`+ case "age":`
	`327`	`+ resultStr = patientValue.PatientAge;`
	`328`	`+ break;`
	`329`	`+ case "hospital_id":`
	`330`	`+ resultStr = patientValue.PatientHospitalId;`
	`331`	`+ break;`
`326`	`332`	`default:`
`327`	`333`	`break;`
`328`	`334`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,11 @@ public class PatientDetails`
`16`	`16`
`17`	`17`	`[JsonProperty(PropertyName = "patient_dob")]`
`18`	`18`	`public DateTime? PatientDob { get; set; }`
	`19`	`+`
	`20`	`+ [JsonProperty(PropertyName = "patient_age")]`
	`21`	`+ public string PatientAge { get; set; }`
	`22`	`+`
	`23`	`+ [JsonProperty(PropertyName = "patient_hospital_id")]`
	`24`	`+ public string PatientHospitalId { get; set; }`
`19`	`25`	`}`
`20`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,9 +157,10 @@ public async Task<bool> UpdateWorkflowInstanceStatusAsync(string workflowInstanc`
`157`	`157`
`158`	`158`	`try`
`159`	`159`	`{`
`160`		`- var result = await _workflowInstanceCollection.FindOneAndUpdateAsync(`
	`160`	`+ await _workflowInstanceCollection.FindOneAndUpdateAsync(`
`161`	`161`	`i => i.Id == workflowInstanceId,`
`162`	`162`	`Builders<WorkflowInstance>.Update.Set(w => w.Status, status));`
	`163`	`+`
`163`	`164`	`return true;`
`164`	`165`	`}`
`165`	`166`	`catch (Exception e)`
`@@ -197,9 +198,10 @@ public async Task<bool> UpdateTasksAsync(string workflowInstanceId, List<TaskExe`
`197`	`198`
`198`	`199`	`try`
`199`	`200`	`{`
`200`		`- var result = await _workflowInstanceCollection.FindOneAndUpdateAsync(`
	`201`	`+ await _workflowInstanceCollection.FindOneAndUpdateAsync(`
`201`	`202`	`i => i.Id == workflowInstanceId,`
`202`	`203`	`Builders<WorkflowInstance>.Update.Set(w => w.Tasks, tasks));`
	`204`	`+`
`203`	`205`	`return true;`
`204`	`206`	`}`
`205`	`207`	`catch (Exception e)`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,9 @@ public static class DicomTagConstants`
`12`	`12`	`public const string PatientSexTag = "00100040";`
`13`	`13`
`14`	`14`	`public const string PatientDateOfBirthTag = "00100030";`
	`15`	`+`
	`16`	`+ public const string PatientAgeTag = "00101010";`
	`17`	`+`
	`18`	`+ public const string PatientHospitalIdTag = "00100021";`
`15`	`19`	`}`
`16`	`20`	`}`