#4580 : UI Navigation tabs : Unify ID and issuer fields' widgets acro…

…ss navigation tabs for Accession Number with Issuer and Admission ID with Issuer query filters
dcm4che · Oct 10, 2024 · 5ddd30b · 5ddd30b
1 parent 9d3fd37
commit 5ddd30b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/dcm4chee-arc-ui2/src/app/constants/globalvar.ts b/dcm4chee-arc-ui2/src/app/constants/globalvar.ts
@@ -4320,17 +4320,17 @@ export class Globalvar {
                     tag:"issuer-selector",
                     issuers:[
                         {
-                            key:"AccessionNumber",
+                            key:"ScheduledStepAttributesSequence.AccessionNumber",
                             label:$localize `:@@accession_number:Accession Number`,
                         },
                         {
-                            key:"IssuerOfAccessionNumberSequence.LocalNamespaceEntityID",
+                            key:"ScheduledStepAttributesSequence.IssuerOfAccessionNumberSequence.LocalNamespaceEntityID",
                             label:$localize `:@@local_namespace_id:Local Namespace Entity ID`
                         }, {
-                            key:"IssuerOfAccessionNumberSequence.UniversalEntityID",
+                            key:"ScheduledStepAttributesSequence.IssuerOfAccessionNumberSequence.UniversalEntityID",
                             label:$localize `:@@universal_entity_id:Universal Entity ID`
                         }, {
-                            key:"IssuerOfAccessionNumberSequence.UniversalEntityIDType",
+                            key:"ScheduledStepAttributesSequence.IssuerOfAccessionNumberSequence.UniversalEntityIDType",
                             label:$localize `:@@universal_entity_id_type:Universal Entity ID Type`
                         }
                     ],

diff --git a/dcm4chee-arc-ui2/src/app/widgets/issuer-selector/issuer-selector.component.ts b/dcm4chee-arc-ui2/src/app/widgets/issuer-selector/issuer-selector.component.ts
@@ -41,6 +41,15 @@ export class IssuerSelectorComponent implements OnInit {
                 this.model = `${this.filterModel?.["AccessionNumber"] || ''}`;
             }
             this.modelChange.emit(this.filterModel);
+        } else if(this.filterModel && this.filterModel["ScheduledStepAttributesSequence.AccessionNumber"]) {
+            let issuerPart  = _.values(_.pickBy(this.filterModel,(value,key)=>key != "ScheduledStepAttributesSequence.AccessionNumber"));
+            issuerPart = j4care.removeLastEmptyStringsFromArray(issuerPart).join('^');
+            if(issuerPart){
+                this.model = `${j4care.appendStringIfExist(this.filterModel["ScheduledStepAttributesSequence.AccessionNumber"], "^")}${issuerPart}`;
+            }else{
+                this.model = `${this.filterModel?.["ScheduledStepAttributesSequence.AccessionNumber"] || ''}`;
+            }
+            this.modelChange.emit(this.filterModel);
         } else if(this.filterModel && this.filterModel["PatientID"]) {
             let issuerPart  = _.values(_.pickBy(this.filterModel,(value,key)=>key != "PatientID"));
             issuerPart = j4care.removeLastEmptyStringsFromArray(issuerPart).join('&');