BAH-3052 | Refactor. search using extraIdentiervalues and display con…

…figured identifier in patientList
Bahmni · Jun 13, 2023 · bb61ba8 · bb61ba8
1 parent 462802c
commit bb61ba8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/ui/app/common/patient-search/controllers/patientsListController.js b/ui/app/common/patient-search/controllers/patientsListController.js
@@ -4,7 +4,7 @@ angular.module('bahmni.common.patientSearch')
 .controller('PatientsListController', ['$scope', '$window', 'patientService', '$rootScope', 'appService', 'spinner',
     '$stateParams', '$bahmniCookieStore', 'printer', 'configurationService',
     function ($scope, $window, patientService, $rootScope, appService, spinner, $stateParams, $bahmniCookieStore, printer, configurationService) {
-        $scope.preferExtraIdInSearchResults = appService.getAppDescriptor().getConfigValue("preferExtraIdInSearchResults");
+        var preferredExtraIdInPatientList = appService.getAppDescriptor().getConfigValue("preferredExtraIdInPatientList");
         const DEFAULT_FETCH_DELAY = 2000;
         var patientSearchConfig = appService.getAppDescriptor().getConfigValue("patientSearch");
         var patientListSpinner;
@@ -207,6 +207,17 @@ angular.module('bahmni.common.patientSearch')
                 });
             }
         };
+        $scope.getIdentifierValue = function (patient) {
+            if (preferredExtraIdInPatientList !== null) {
+                var identifierIndex = patient.extraIdentifiers !== undefined ? patient.extraIdentifiers.split(",").indexOf(preferredExtraIdInPatientList) : -1;
+                if (identifierIndex >= 0) {
+                    if (patient.extraIdentifierVal !== undefined && patient.extraIdentifierVal) {
+                        return patient.extraIdentifierVal.split(",")[identifierIndex];
+                    }
+                }
+            }
+            return patient.identifier;
+        };
         initialize();
     }
 ]);
diff --git a/ui/app/common/patient-search/models/search.js b/ui/app/common/patient-search/models/search.js
@@ -95,17 +95,6 @@ Bahmni.Common.PatientSearch.Search = function (searchTypes) {
             return patient[column];
         }).join(" - ");
 
-        var extraIdentifier = null;
-        if (patient.extraIdentifiers) {
-            var objIdentifiers = JSON.parse(patient.extraIdentifiers);
-            for (var key in objIdentifiers) {
-                extraIdentifier = objIdentifiers[key];
-                break;
-            }
-        } else if (patient.extraIdentifierVal) {
-            extraIdentifier = patient.extraIdentifierVal;
-        }
-        patient.extraIdentifier = patient.extraIdentifier ? patient.extraIdentifier : (extraIdentifier ? extraIdentifier : patient.identifier);
         patient.image = Bahmni.Common.Constants.patientImageUrlByPatientUuid + patient.uuid;
         return patient;
     }

diff --git a/ui/app/common/patient-search/views/patientsList.html b/ui/app/common/patient-search/views/patientsList.html
@@ -79,8 +79,7 @@
                 <li ng-repeat="patient in search.visiblePatients" class="active-patient" ng-click="forwardPatient(patient)">
                     <img class="smallImages" ng-src="{{::patient.image}}" fallback-src='../images/blank-user.png'>
                     <div class="patient-name">{{::patient.name}}</div>
-                    <div ng-if="!preferExtraIdInSearchResults" class="patient-id">{{::patient.identifier}}</div>
-                    <div ng-if="preferExtraIdInSearchResults" class="patient-id">{{::patient.extraIdentifier}}</div>
+                    <div class="patient-id">{{::getIdentifierValue(patient)}}</div>
                     <i class="ipd-indication fa fa-bed" ng-if="::(patient.hasBeenAdmitted===true||patient.hasBeenAdmitted==='true')"></i>
                 </li>
             </ul>