# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1720220665 -7200
# Node ID 56859a7ffa9915158addd82791346f8aa3fb5cea
# Parent  bd1352bd9d827884125b62b94bf65c83981416b0# Parent  f690568f03255630f39d6b7b84594ec398fa4547
integration mainline->find-refactoring

diff -r bd1352bd9d82 -r 56859a7ffa99 NEWS
--- a/NEWS	Thu Jul 04 21:57:39 2024 +0200
+++ b/NEWS	Sat Jul 06 01:04:25 2024 +0200
@@ -19,6 +19,9 @@
   DB plugins that are implementing the UpdateAndGetStatistics function (currently only
   PostgreSQL).  This avoids very long update times in case you don't call /statistics
   for a long period.
+* Fix C-Find queries not returning computed tags like ModalitiesInStudy, NumberOfStudyRelatedSeries, ...
+  in very specific use-cases.
+
 
 
 Version 1.12.4 (2024-06-05)
diff -r bd1352bd9d82 -r 56859a7ffa99 OrthancServer/Sources/ServerContext.cpp
--- a/OrthancServer/Sources/ServerContext.cpp	Thu Jul 04 21:57:39 2024 +0200
+++ b/OrthancServer/Sources/ServerContext.cpp	Sat Jul 06 01:04:25 2024 +0200
@@ -2608,7 +2608,13 @@
       Toolbox::GetMissingsFromSet(missingTags, requestedTags, retrievedTags);
 
       // if all possible tags have been read, no need to get them from DB anymore
-      if (missingTags.size() == 0 || DicomMap::HasOnlyComputedTags(missingTags))
+      if (missingTags.size() > 0 && DicomMap::HasOnlyComputedTags(missingTags))
+      {
+        resource.missingRequestedTags_ = missingTags;
+        ComputeTags(resource, *this, publicId, level, requestedTags);
+        return true;
+      }
+      else if (missingTags.size() == 0)
       {
         expandFlags = static_cast<ExpandResourceFlags>(expandFlags & ~ExpandResourceFlags_IncludeMainDicomTags);
       }