changes due to comments

Signed-off-by: Neil South <[email protected]>
Project-MONAI · Feb 8, 2024 · 09df102 · 09df102
1 parent 0f161e0
commit 09df102
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 27 deletions.
diff --git a/src/WorkflowManager/Storage/Services/DicomService.cs b/src/WorkflowManager/Storage/Services/DicomService.cs
@@ -99,11 +99,6 @@ public async Task<PatientDetails> GetPayloadPatientDetailsAsync(string payloadId
 
             try
             {
-                if (dict is null)
-                {
-                    return null;
-                }
-
                 var value = GetValue(dict, keyId);
 
                 if (!string.IsNullOrWhiteSpace(value))
@@ -150,12 +145,7 @@ public async Task<PatientDetails> GetPayloadPatientDetailsAsync(string payloadId
                     // merge the two dictionaries
                     foreach (var (key, value) in dictCurrent)
                     {
-                        if (dict.ContainsKey(key))
-                        {
-                            continue;
-                        }
-
-                        dict.Add(key, value);
+                        dict.TryAdd(key, value);
                     }
                 }
                 return dict;
@@ -265,11 +255,6 @@ public async Task<string> GetDcmJsonFileValueAtIndexAsync(int index,
 
         public string GetValue(Dictionary<string, DicomValue> dict, string keyId)
         {
-            if (dict.Count == 0)
-            {
-                return string.Empty;
-            }
-
             var result = string.Empty;
 
             if (dict.TryGetValue(keyId, out var value))

diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs b/tests/UnitTests/WorkflowExecuter.Tests/Services/WorkflowExecuterServiceTests.cs
@@ -3811,17 +3811,7 @@ public async Task ProcessPayload_With_Multiple_Taskdestinations_One_Has_Inputs()
                     {
                         TaskId = "router",
                         Status = TaskExecutionStatus.Created
-                    },
-                    //new TaskExecution
-                    //{
-                    //    TaskId = "export1",
-                    //    Status = TaskExecutionStatus.Created
-                    //},
-                    //new TaskExecution
-                    //{
-                    //    TaskId = "export2",
-                    //    Status = TaskExecutionStatus.Created
-                    //}
+                    }
                 ]
             };