Mercurial > hg > orthanc
comparison OrthancServer/Sources/Database/Compatibility/GenericFind.cpp @ 5616:1e92fb051fd7 find-refactoring
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 09 May 2024 13:02:51 +0200 |
parents | a10978a5e65c |
children | 8905ffa45fc2 |
comparison
equal
deleted
inserted
replaced
5615:a10978a5e65c | 5616:1e92fb051fd7 |
---|---|
57 { | 57 { |
58 transaction_.GetAllPublicIds(identifiers, request.GetLevel()); | 58 transaction_.GetAllPublicIds(identifiers, request.GetLevel()); |
59 } | 59 } |
60 } | 60 } |
61 else if (IsRequestWithoutContraint(request) && | 61 else if (IsRequestWithoutContraint(request) && |
62 request.GetLevel() == ResourceType_Patient && | |
62 request.GetOrthancIdentifiers().HasPatientId() && | 63 request.GetOrthancIdentifiers().HasPatientId() && |
63 !request.GetOrthancIdentifiers().HasStudyId() && | 64 !request.GetOrthancIdentifiers().HasStudyId() && |
64 !request.GetOrthancIdentifiers().HasSeriesId() && | 65 !request.GetOrthancIdentifiers().HasSeriesId() && |
65 !request.GetOrthancIdentifiers().HasInstanceId()) | 66 !request.GetOrthancIdentifiers().HasInstanceId()) |
66 { | 67 { |
67 identifiers.push_back(request.GetOrthancIdentifiers().GetPatientId()); | 68 identifiers.push_back(request.GetOrthancIdentifiers().GetPatientId()); |
68 } | 69 } |
69 else if (IsRequestWithoutContraint(request) && | 70 else if (IsRequestWithoutContraint(request) && |
71 request.GetLevel() == ResourceType_Study && | |
70 !request.GetOrthancIdentifiers().HasPatientId() && | 72 !request.GetOrthancIdentifiers().HasPatientId() && |
71 request.GetOrthancIdentifiers().HasStudyId() && | 73 request.GetOrthancIdentifiers().HasStudyId() && |
72 !request.GetOrthancIdentifiers().HasSeriesId() && | 74 !request.GetOrthancIdentifiers().HasSeriesId() && |
73 !request.GetOrthancIdentifiers().HasInstanceId()) | 75 !request.GetOrthancIdentifiers().HasInstanceId()) |
74 { | 76 { |
75 identifiers.push_back(request.GetOrthancIdentifiers().GetStudyId()); | 77 identifiers.push_back(request.GetOrthancIdentifiers().GetStudyId()); |
76 } | 78 } |
77 else if (IsRequestWithoutContraint(request) && | 79 else if (IsRequestWithoutContraint(request) && |
80 request.GetLevel() == ResourceType_Series && | |
78 !request.GetOrthancIdentifiers().HasPatientId() && | 81 !request.GetOrthancIdentifiers().HasPatientId() && |
79 !request.GetOrthancIdentifiers().HasStudyId() && | 82 !request.GetOrthancIdentifiers().HasStudyId() && |
80 request.GetOrthancIdentifiers().HasSeriesId() && | 83 request.GetOrthancIdentifiers().HasSeriesId() && |
81 !request.GetOrthancIdentifiers().HasInstanceId()) | 84 !request.GetOrthancIdentifiers().HasInstanceId()) |
82 { | 85 { |
83 identifiers.push_back(request.GetOrthancIdentifiers().GetSeriesId()); | 86 identifiers.push_back(request.GetOrthancIdentifiers().GetSeriesId()); |
84 } | 87 } |
85 else if (IsRequestWithoutContraint(request) && | 88 else if (IsRequestWithoutContraint(request) && |
89 request.GetLevel() == ResourceType_Instance && | |
86 !request.GetOrthancIdentifiers().HasPatientId() && | 90 !request.GetOrthancIdentifiers().HasPatientId() && |
87 !request.GetOrthancIdentifiers().HasStudyId() && | 91 !request.GetOrthancIdentifiers().HasStudyId() && |
88 !request.GetOrthancIdentifiers().HasSeriesId() && | 92 !request.GetOrthancIdentifiers().HasSeriesId() && |
89 request.GetOrthancIdentifiers().HasInstanceId()) | 93 request.GetOrthancIdentifiers().HasInstanceId()) |
90 { | 94 { |