primary_care_admin_binder 0.1.67 → 0.1.70

package/dist/index.cjs.js

@@ -10069,6 +10069,22 @@ var practitionerMasterActions = {
 };
 var practitionerMasterSlice$1 = practitionerMasterSlice.reducer;
 
+var getAgeRangeSort = function getAgeRangeSort(sort) {
+  switch (sort) {
+    case 'Long Description':
+      return "AgeRanges.longdesc";
+
+    case 'Short Description':
+      return "AgeRanges.shortdesc";
+
+    case 'Code':
+      return "AgeRanges.agerangecode";
+
+    default:
+      return "AgeRanges.createddate";
+  }
+};
+
 var query$c = {
   unitUom: "{\n        \"db_name\": \"".concat(dbName$1, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"sort\": \"document(CodeableConceptMaster.coding[0]).display\",\n        \"filter\": \"CodeableConceptMaster.Type=='VITALSUOM'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n        }"),
   // getAgeRange: `{
@@ -10076,8 +10092,8 @@ var query$c = {
   //     "entity": "AgeRanges",
   //     "return_fields": "MERGE(AgeRanges, {AgeCategory: (FOR cat IN TO_ARRAY(AgeRanges.AgeCategory) RETURN MERGE(DOCUMENT(cat), {UOM:(FOR cod IN TO_ARRAY(DOCUMENT(DOCUMENT(cat).UOM).coding) RETURN MERGE(DOCUMENT(DOCUMENT(cat).UOM),{coding:DOCUMENT(cod)} ) ) } ) ) } )"
   //   }`,
-  getAgeRange: function getAgeRange(page, perPage, search) {
-    return "{\n        \"db_name\": \"".concat(dbName$1, "\",\n        \"entity\": \"AgeRanges\",\n        \"filter\": \"(LIKE(AgeRanges.agerangecode,'%").concat(search, "%',true) || LIKE(AgeRanges.longdesc,'%").concat(search, "%',true) || LIKE(AgeRanges.shortdesc,'%").concat(search, "%',true)) && AgeRanges.activestatus == true\",\n        \"limit\" : { \"offset\" : ").concat(page, ", \"count\": ").concat(perPage, "},\n        \"return_fields\": \"MERGE(AgeRanges, {TotalCount:COUNT(").concat(search ? "FOR cnt IN AgeRanges filter UPPER(cnt.agerangecode) LIKE '%".concat(search.toUpperCase(), "%' || UPPER(cnt.longdesc) LIKE '%").concat(search.toUpperCase(), "%' || UPPER(cnt.shortdesc) LIKE '%").concat(search.toUpperCase(), "%' RETURN cnt._key") : "FOR cnt IN AgeRanges RETURN cnt._key", "), AgeCategory: (FOR cat IN TO_ARRAY(AgeRanges.AgeCategory) RETURN MERGE(DOCUMENT(cat), {UOM:(FOR cod IN TO_ARRAY(DOCUMENT(DOCUMENT(cat).UOM).coding) RETURN MERGE(DOCUMENT(DOCUMENT(cat).UOM),{coding:DOCUMENT(cod)} ) ) } ) ) } )\",\n        \"sort\":\"AgeRanges.createddate\"\n    }");
+  getAgeRange: function getAgeRange(page, perPage, sort, direction, search) {
+    return "{\n        \"db_name\": \"".concat(dbName$1, "\",\n        \"entity\": \"AgeRanges\",\n        \"filter\": \"(LIKE(AgeRanges.agerangecode,'%").concat(search, "%',true) || LIKE(AgeRanges.longdesc,'%").concat(search, "%',true) || LIKE(AgeRanges.shortdesc,'%").concat(search, "%',true)) && AgeRanges.activestatus == true\",\n        \"limit\" : { \"offset\" : ").concat(page, ", \"count\": ").concat(perPage, "},\n        \"return_fields\": \"MERGE(AgeRanges, {TotalCount:COUNT(").concat(search ? "FOR cnt IN AgeRanges filter UPPER(cnt.agerangecode) LIKE '%".concat(search.toUpperCase(), "%' || UPPER(cnt.longdesc) LIKE '%").concat(search.toUpperCase(), "%' || UPPER(cnt.shortdesc) LIKE '%").concat(search.toUpperCase(), "%' RETURN cnt._key") : "FOR cnt IN AgeRanges RETURN cnt._key", "), AgeCategory: (FOR cat IN TO_ARRAY(AgeRanges.AgeCategory) RETURN MERGE(DOCUMENT(cat), {UOM:(FOR cod IN TO_ARRAY(DOCUMENT(DOCUMENT(cat).UOM).coding) RETURN MERGE(DOCUMENT(DOCUMENT(cat).UOM),{coding:DOCUMENT(cod)} ) ) } ) ) } )\",\n        \"sort\":\"").concat(getAgeRangeSort(sort), " ").concat(direction, "\"\n    }");
   }
 };
 
@@ -10284,32 +10300,33 @@ var GET_AGE_RANGE_MASTER = createAsyncThunk("ageRangeMasterApiSlice/age_range_li
         case 0:
           payload = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
           _ref8 = _args4.length > 1 ? _args4[1] : undefined, rejectWithValue = _ref8.rejectWithValue;
-          debugger;
-          _context4.prev = 3;
-          _context4.next = 6;
+          console.clear();
+          console.log(payload === null || payload === void 0 ? void 0 : payload.sort, payload === null || payload === void 0 ? void 0 : payload.search);
+          _context4.prev = 4;
+          _context4.next = 7;
           return fetchData({
-            body: query$c.getAgeRange(payload === null || payload === void 0 ? void 0 : payload.page, payload === null || payload === void 0 ? void 0 : payload.perPage, payload !== null && payload !== void 0 && payload.search ? payload === null || payload === void 0 ? void 0 : payload.search : '')
+            body: query$c.getAgeRange(payload === null || payload === void 0 ? void 0 : payload.page, payload === null || payload === void 0 ? void 0 : payload.perPage, payload !== null && payload !== void 0 && payload.sort ? payload === null || payload === void 0 ? void 0 : payload.sort : '', payload !== null && payload !== void 0 && payload.direction ? '' : 'DESC', payload !== null && payload !== void 0 && payload.search ? payload === null || payload === void 0 ? void 0 : payload.search : '')
           }, __readDocumentUrl__);
 
-        case 6:
+        case 7:
           data = _context4.sent;
           return _context4.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data.result
           }));
 
-        case 10:
-          _context4.prev = 10;
-          _context4.t0 = _context4["catch"](3);
+        case 11:
+          _context4.prev = 11;
+          _context4.t0 = _context4["catch"](4);
           return _context4.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context4.t0.message
           })));
 
-        case 13:
+        case 14:
         case "end":
           return _context4.stop();
       }
     }
-  }, _callee4, null, [[3, 10]]);
+  }, _callee4, null, [[4, 11]]);
 })));
 var ageRangeMasterSlice = createSlice({
   name: "ageRangeMasterApiSlice",
@@ -12460,8 +12477,28 @@ var vitalsMasterSectionActions = {
 };
 var vitalsMasterSectionSlice$1 = vitalsMasterSectionSlice.reducer;
 
+var getLocationSort = function getLocationSort(sort) {
+  switch (sort) {
+    case 'Long Description':
+      return "LocationMaster.longdesc";
+
+    case 'Short Description':
+      return "LocationMaster.shortdesc";
+
+    case 'Location Type':
+      //return  "document(document(LocationMaster.locationType)[0].coding)[0].display" 
+      return "LocationMaster.locationType";
+
+    case 'Location ID':
+      return "LocationMaster.locationID";
+
+    default:
+      return "LocationMaster.createddate";
+  }
+};
+
 var queries$m = {
-  locationlist: function locationlist(type, page, perPage, search) {
+  locationlist: function locationlist(type, page, perPage, search, sort, direction) {
     debugger; // return {
     //   db_name: dbName,
     //   entity:
@@ -12481,8 +12518,9 @@ var queries$m = {
       },
       filter: "(LIKE(LocationMaster.shortdesc,'%".concat(search !== null && search !== void 0 ? search : '', "%',true) || LIKE(LocationMaster.longdesc,'%").concat(search !== null && search !== void 0 ? search : '', "%',true) || LIKE(LocationMaster.locationID,'%").concat(search !== null && search !== void 0 ? search : '', "%',true) || LIKE(document(LocationMaster.locationRoletype).display,'%").concat(search !== null && search !== void 0 ? search : '', "%',true) ) && LocationMaster.activestatus==true"),
       //  return_fields: "merge(LocationMaster,{TotalCount:COUNT(FOR cnt IN LocationMaster RETURN cnt._key) , operationalStatus:(for ops in CodeableConceptMaster filter ops._id==LocationMaster.operationalStatus return merge(ops,{coding:document(ops.coding)}))},{managingOrgEntityType:(for moe in CodeableConceptMaster filter moe._id==LocationMaster.managingOrgEntityType return merge(moe,{coding:document(moe.coding)}))}, {parentLocationID_desc:document(to_array(LocationMaster.parentLocationID_desc))},{address:document(LocationMaster.address)},{locationType:(for lt in CodeableConceptMaster filter lt._id==LocationMaster.locationType return (merge(lt,{coding:document(lt.coding)})))},{managingOrgID:document(to_array(LocationMaster.managingOrgID))},{locationRoletype:document(to_array(LocationMaster.locationRoletype))},{specialty:document(to_array(LocationMaster.specialty))},{photo:document(LocationMaster.photo)}, {pharmacy:(for ph in LocationMaster.pharmacy return merge(ph,{inventorySubStore:document(ph.inventorySubStore)}))}, {telecom:(for tel in document(LocationMaster.telecom) return merge(tel,{use:document(tel.use)},{rank:document(tel.rank)},{system:document(tel.system)}))})"
-      return_fields: "merge(LocationMaster,{locationType:(for cod in document(to_array(LocationMaster.locationType)) return merge(cod,{coding:document(cod.coding)}))},{TotalCount:count(( FOR locat IN LocationMaster FILTER ( LIKE(locat.shortdesc,'%".concat(search !== null && search !== void 0 ? search : '', "%',true) || LIKE(locat.longdesc,'%").concat(search !== null && search !== void 0 ? search : '', "%',true) || LIKE(locat.locationID,'%").concat(search !== null && search !== void 0 ? search : '', "%',true) || LIKE(document(locat.locationRoletype).display,'%").concat(search !== null && search !== void 0 ? search : '', "%',true) ) && locat.activestatus==true return locat._id ))})") // return_fields: "merge(LocationMaster,{operationalStatus:(for ops in CodeableConceptMaster filter ops._id==LocationMaster.operationalStatus return merge(ops,{coding:document(ops.coding)}))},{managingOrgEntityType:(for moe in CodeableConceptMaster filter moe._id==LocationMaster.managingOrgEntityType return merge(moe,{coding:document(moe.coding)}))}, {parentLocationID_desc:document(to_array(LocationMaster.parentLocationID_desc))},{address:document(LocationMaster.address)},{locationType:(for lt in CodeableConceptMaster filter lt._id==LocationMaster.locationType return (merge(lt,{coding:document(lt.coding)})))},{managingOrgID:document(to_array(LocationMaster.managingOrgID))},{locationRoletype:document(to_array(LocationMaster.locationRoletype))},{specialty:document(to_array(LocationMaster.specialty))},{photo:document(LocationMaster.photo)}, {pharmacy:(for ph in LocationMaster.pharmacy return merge(ph,{inventorySubStore:document(ph.inventorySubStore)}))}, {telecom:(for tel in document(LocationMaster.telecom) return merge(tel,{use:document(tel.use)},{rank:document(tel.rank)},{system:document(tel.system)}))})"
-
+      return_fields: "merge(LocationMaster,{locationType:(for cod in document(to_array(LocationMaster.locationType)) return merge(cod,{coding:document(cod.coding)}))},{TotalCount:count(( FOR locat IN LocationMaster FILTER ( LIKE(locat.shortdesc,'%".concat(search !== null && search !== void 0 ? search : '', "%',true) || LIKE(locat.longdesc,'%").concat(search !== null && search !== void 0 ? search : '', "%',true) || LIKE(locat.locationID,'%").concat(search !== null && search !== void 0 ? search : '', "%',true) || LIKE(document(locat.locationRoletype).display,'%").concat(search !== null && search !== void 0 ? search : '', "%',true) ) && locat.activestatus==true return locat._id ))})"),
+      // return_fields: "merge(LocationMaster,{operationalStatus:(for ops in CodeableConceptMaster filter ops._id==LocationMaster.operationalStatus return merge(ops,{coding:document(ops.coding)}))},{managingOrgEntityType:(for moe in CodeableConceptMaster filter moe._id==LocationMaster.managingOrgEntityType return merge(moe,{coding:document(moe.coding)}))}, {parentLocationID_desc:document(to_array(LocationMaster.parentLocationID_desc))},{address:document(LocationMaster.address)},{locationType:(for lt in CodeableConceptMaster filter lt._id==LocationMaster.locationType return (merge(lt,{coding:document(lt.coding)})))},{managingOrgID:document(to_array(LocationMaster.managingOrgID))},{locationRoletype:document(to_array(LocationMaster.locationRoletype))},{specialty:document(to_array(LocationMaster.specialty))},{photo:document(LocationMaster.photo)}, {pharmacy:(for ph in LocationMaster.pharmacy return merge(ph,{inventorySubStore:document(ph.inventorySubStore)}))}, {telecom:(for tel in document(LocationMaster.telecom) return merge(tel,{use:document(tel.use)},{rank:document(tel.rank)},{system:document(tel.system)}))})"
+      sort: "".concat(getLocationSort(sort), " ").concat(direction)
     };
   },
   locationlistupsert: function locationlistupsert(data) {
@@ -12803,6 +12841,8 @@ var LOCATION_READ = createAsyncThunk("locationSlice/locationlist", /*#__PURE__*/
       page,
       perPage,
       search,
+      sort,
+      direction,
       data,
       arry,
       _args = arguments;
@@ -12814,10 +12854,10 @@ var LOCATION_READ = createAsyncThunk("locationSlice/locationlist", /*#__PURE__*/
           payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
           _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
           _context.prev = 2;
-          type = payload.type, page = payload.page, perPage = payload.perPage, search = payload.search;
+          type = payload.type, page = payload.page, perPage = payload.perPage, search = payload.search, sort = payload.sort, direction = payload.direction;
           _context.next = 6;
           return fetchData({
-            body: JSON.stringify(queries$m.locationlist(type, page, perPage, search))
+            body: JSON.stringify(queries$m.locationlist(type, page, perPage, search ? search : '', sort ? sort : "", direction ? "" : 'DESC'))
           }, __readDocumentUrl__);
 
         case 6:
@@ -12828,15 +12868,15 @@ var LOCATION_READ = createAsyncThunk("locationSlice/locationlist", /*#__PURE__*/
           _context.next = 12;
           return data.result.map(function (val) {
             if (val.locationID) {
-              var _val$locationType, _val$locationType$, _val$locationType2, _val$locationType2$, _val$locationType2$$c, _val$locationType2$$c2, _val$locationType3, _val$locationType3$, _val$locationType4, _val$locationType4$, _val$locationType4$$c, _val$locationType4$$c2, _val$locationType5, _val$locationType5$, _val$locationType5$$c, _val$locationType5$$c2, _val$locationType6, _val$locationType6$, _val$locationType6$$c, _val$locationType6$$c2, _val$locationType7, _val$locationType7$, _val$locationType7$$c, _val$locationType7$$c2, _val$locationType8, _val$locationType8$, _val$locationType8$$c, _val$locationType8$$c2;
+              var _val$locationType$, _val$locationType$2, _val$locationType, _val$locationType$3, _val$locationType$3$c, _val$locationType$3$c2, _val$locationType2, _val$locationType2$, _val$locationType2$$c, _val$locationType2$$c2, _val$locationType3, _val$locationType3$, _val$locationType3$$c, _val$locationType3$$c2, _val$locationType4, _val$locationType4$, _val$locationType4$$c, _val$locationType4$$c2;
 
               arry.push({
                 location_id: val.locationID,
-                location_type: val.locationType.length > 0 ? (((_val$locationType = val.locationType) === null || _val$locationType === void 0 ? void 0 : (_val$locationType$ = _val$locationType[0]) === null || _val$locationType$ === void 0 ? void 0 : _val$locationType$.coding) !== null ? (_val$locationType2 = val.locationType) === null || _val$locationType2 === void 0 ? void 0 : (_val$locationType2$ = _val$locationType2[0]) === null || _val$locationType2$ === void 0 ? void 0 : (_val$locationType2$$c = _val$locationType2$.coding) === null || _val$locationType2$$c === void 0 ? void 0 : (_val$locationType2$$c2 = _val$locationType2$$c[0]) === null || _val$locationType2$$c2 === void 0 ? void 0 : _val$locationType2$$c2.code : "") + " - " + (((_val$locationType3 = val.locationType) === null || _val$locationType3 === void 0 ? void 0 : (_val$locationType3$ = _val$locationType3[0]) === null || _val$locationType3$ === void 0 ? void 0 : _val$locationType3$.coding) !== null ? (_val$locationType4 = val.locationType) === null || _val$locationType4 === void 0 ? void 0 : (_val$locationType4$ = _val$locationType4[0]) === null || _val$locationType4$ === void 0 ? void 0 : (_val$locationType4$$c = _val$locationType4$.coding) === null || _val$locationType4$$c === void 0 ? void 0 : (_val$locationType4$$c2 = _val$locationType4$$c[0]) === null || _val$locationType4$$c2 === void 0 ? void 0 : _val$locationType4$$c2.Type : "") : "-",
-                location_type_code: (_val$locationType5 = val.locationType) === null || _val$locationType5 === void 0 ? void 0 : (_val$locationType5$ = _val$locationType5[0]) === null || _val$locationType5$ === void 0 ? void 0 : (_val$locationType5$$c = _val$locationType5$.coding) === null || _val$locationType5$$c === void 0 ? void 0 : (_val$locationType5$$c2 = _val$locationType5$$c[0]) === null || _val$locationType5$$c2 === void 0 ? void 0 : _val$locationType5$$c2.code,
-                location_type_name: (_val$locationType6 = val.locationType) === null || _val$locationType6 === void 0 ? void 0 : (_val$locationType6$ = _val$locationType6[0]) === null || _val$locationType6$ === void 0 ? void 0 : (_val$locationType6$$c = _val$locationType6$.coding) === null || _val$locationType6$$c === void 0 ? void 0 : (_val$locationType6$$c2 = _val$locationType6$$c[0]) === null || _val$locationType6$$c2 === void 0 ? void 0 : _val$locationType6$$c2.Type,
-                location_type_id: (_val$locationType7 = val.locationType) === null || _val$locationType7 === void 0 ? void 0 : (_val$locationType7$ = _val$locationType7[0]) === null || _val$locationType7$ === void 0 ? void 0 : (_val$locationType7$$c = _val$locationType7$.coding) === null || _val$locationType7$$c === void 0 ? void 0 : (_val$locationType7$$c2 = _val$locationType7$$c[0]) === null || _val$locationType7$$c2 === void 0 ? void 0 : _val$locationType7$$c2._id,
-                location_type_key: (_val$locationType8 = val.locationType) === null || _val$locationType8 === void 0 ? void 0 : (_val$locationType8$ = _val$locationType8[0]) === null || _val$locationType8$ === void 0 ? void 0 : (_val$locationType8$$c = _val$locationType8$.coding) === null || _val$locationType8$$c === void 0 ? void 0 : (_val$locationType8$$c2 = _val$locationType8$$c[0]) === null || _val$locationType8$$c2 === void 0 ? void 0 : _val$locationType8$$c2._key,
+                location_type: val.locationType.length > 0 ? ((_val$locationType$ = val.locationType[0]) === null || _val$locationType$ === void 0 ? void 0 : _val$locationType$.display) !== null ? (_val$locationType$2 = val.locationType[0]) === null || _val$locationType$2 === void 0 ? void 0 : _val$locationType$2.display : "-" : "-",
+                location_type_code: (_val$locationType = val.locationType) === null || _val$locationType === void 0 ? void 0 : (_val$locationType$3 = _val$locationType[0]) === null || _val$locationType$3 === void 0 ? void 0 : (_val$locationType$3$c = _val$locationType$3.coding) === null || _val$locationType$3$c === void 0 ? void 0 : (_val$locationType$3$c2 = _val$locationType$3$c[0]) === null || _val$locationType$3$c2 === void 0 ? void 0 : _val$locationType$3$c2.code,
+                location_type_name: (_val$locationType2 = val.locationType) === null || _val$locationType2 === void 0 ? void 0 : (_val$locationType2$ = _val$locationType2[0]) === null || _val$locationType2$ === void 0 ? void 0 : (_val$locationType2$$c = _val$locationType2$.coding) === null || _val$locationType2$$c === void 0 ? void 0 : (_val$locationType2$$c2 = _val$locationType2$$c[0]) === null || _val$locationType2$$c2 === void 0 ? void 0 : _val$locationType2$$c2.Type,
+                location_type_id: (_val$locationType3 = val.locationType) === null || _val$locationType3 === void 0 ? void 0 : (_val$locationType3$ = _val$locationType3[0]) === null || _val$locationType3$ === void 0 ? void 0 : (_val$locationType3$$c = _val$locationType3$.coding) === null || _val$locationType3$$c === void 0 ? void 0 : (_val$locationType3$$c2 = _val$locationType3$$c[0]) === null || _val$locationType3$$c2 === void 0 ? void 0 : _val$locationType3$$c2._id,
+                location_type_key: (_val$locationType4 = val.locationType) === null || _val$locationType4 === void 0 ? void 0 : (_val$locationType4$ = _val$locationType4[0]) === null || _val$locationType4$ === void 0 ? void 0 : (_val$locationType4$$c = _val$locationType4$.coding) === null || _val$locationType4$$c === void 0 ? void 0 : (_val$locationType4$$c2 = _val$locationType4$$c[0]) === null || _val$locationType4$$c2 === void 0 ? void 0 : _val$locationType4$$c2._key,
                 long_description: val.longdesc,
                 short_description: val.shortdesc,
                 _key: val._key,
@@ -30052,10 +30092,10 @@ var queries$6 = {
   user_upsert: function user_upsert(data) {
     var filter = {};
 
-    if (data._key) {
+    if (data.check_key) {
       filter = {
         filter: {
-          _key: data._key
+          _key: data.prect_key
         }
       };
     }
@@ -30066,18 +30106,23 @@ var queries$6 = {
       "is_metadata": true,
       "metadataId": "04ecb73d-f048-44ce-8563-c9be015812dd"
     }, filter), {}, {
-      "doc": _objectSpread2({}, data)
+      "doc": _objectSpread2({}, data.payload)
     })];
   },
   practitioner_by_id: function practitioner_by_id(data) {
     return {
       "db_name": dbName$1,
-      // "entity": "Practitioner",
       "entity": "Person",
-      // "filter": `Practitioner.PersonID==${data.id} && Practitioner.activestatus==true`,
       "filter": "Person._id =='".concat(data.id, "' && Person.activestatus == true "),
-      // "return_fields": "merge(Practitioner,{identifier:(for doc in IdentifierMaster filter doc._id in Practitioner.identifier return merge(doc,{period:(for cod in doc.period return document(cod))})),address:(for a in Practitioner.address return document(a)),communication:( FOR cod IN CodeableConceptMaster filter cod._id in Practitioner.communication RETURN MERGE(cod,{coding:(FOR d IN cod.coding RETURN DOCUMENT(d))})),marital_status:(FOR cod IN CodeableConceptMaster filter cod._id==Practitioner.marital_status RETURN MERGE(cod,{coding:(FOR d IN cod.coding RETURN DOCUMENT(d))})),name:(for a in Practitioner.name return MERGE(document(a),{period:DOCUMENT(document(a).period)})),nationality:(FOR cod IN SMGeographicMaster filter cod._id==Practitioner.nationality RETURN cod),photo:(for a in Practitioner.photo return document(a)),position:(for pt in CodeableConceptMaster filter pt._id==Practitioner.position return merge(pt,{coding:(FOR d IN pt.coding RETURN DOCUMENT(d))})),practitioner_type:(for pt in CodeableConceptMaster filter pt._id==Practitioner.practitioner_type return merge(pt,{coding:(FOR d IN pt.coding RETURN DOCUMENT(d))})),telecom:(for a in Practitioner.telecom return document(a)),job_experience:(for c in Practitioner.job_experience RETURN merge(c,{jobexperience_contact_details:(for con in c.jobexperience_contact_details return document(con)), jobexperience_address:(for add in c.jobexperience_address return document(add))})),training_details:(for c in Practitioner.training_details RETURN merge(c,{training_contact_details:(for con in c.training_contact_details return document(con)), training_address:(for add in c.training_address return document(add))})),practitioner_role:(for doc in PractitionerRole filter doc._id IN Practitioner.practitioner_role return MERGE(doc,{telecom:(for rol in ContactPointMaster filter rol._id in doc.telecom return rol),role:(for cod in CodeableConceptMaster filter cod._id==doc.role return merge(cod,{coding:(for code in CodingMaster filter code._id in cod.coding return code)})),period:(for per in periodMaster filter per._id in doc.period return per)})),gender:(FOR cod IN CodeableConceptMaster filter cod._id==Practitioner.gender RETURN MERGE(cod,{coding:(FOR d IN cod.coding RETURN DOCUMENT(d))})),employee_status:(for pt in CodeableConceptMaster filter pt._id==Practitioner.employee_status return merge(pt,{coding:(FOR d IN pt.coding RETURN DOCUMENT(d))}))})"
-      "return_fields": "merge(Person,{OrgID: document(Person.OrgID)},{address: document(Person.address)},{gender: document(Person.gender)},{orgType: document(Person.orgType)},{name: (for doc in document(Person.name) return merge(doc,{period: document(doc.period)},{ use: document(doc.use)},{prefix: document(doc.prefix)},{ suffix: document(doc.suffix)}))},{identifier: (for ide in document(Person.identifier)return merge(ide,{ period: document(ide.period)}))},{ telecom: (for doc in document(Person.telecom) return merge(doc, { system: document(doc.system)},{use: document(document(doc.use).coding)},{ period: document(Person.Person)},{ valueprefix: document(doc.valueprefix) }, {rank: document(document(doc.rank).coding)}))})"
+      "return_fields": "merge(Person, {Practitioner: (for x in Practitioner filter x.PersonID == ".concat(data.PersonID, " return { PersonID: x.PersonID, userId: x.practitioner_id, practitioner_role:  (for z in x.practitioner_role return document(document(document(z).role).coding)[0] ), SpecialtyID: document(x.practitioner_role)[0].SpecialtyID ,  role:  (for z in x.practitioner_role return {coding: document(document(document(z).role).coding),  \"_key\": document(document(z).role)._key,\"_id\": document(document(z).role)._id,\"_rev\": document(document(z).role)._rev,\"Type\": document(document(z).role).Type,\"activestatus\": document(document(z).role).activestatus,\"createdby\": \"\",\"createddate\": document(document(z).role).createddate,\"id\": document(document(z).role).id,\"status\": document(document(z).role).status,\"text\": document(document(z).role).text,\"updatedate\": document(document(z).role).updatedate, \"updatedby\": \"\"}  )    })} ,{reporting_entity_type: document(Person.orgType)}, {reporting_entity_name: document(Person.OrgID[0])},{OrgID: document(Person.OrgID)},{address: document(Person.address)},{gender: document(Person.gender)},{orgType: document(Person.orgType)},{name: (for doc in document(Person.name) return merge(doc,{period: document(doc.period)},{ use: document(doc.use)},{prefix: document(doc.prefix)},{ suffix: document(doc.suffix)}))},{identifier: (for ide in document(Person.identifier)return merge(ide,{ period: document(ide.period)}))},{ telecom: (for doc in document(Person.telecom) return merge(doc, { system: document(doc.system)},{use: document(document(doc.use).coding)},{ period: document(Person.Person)},{ valueprefix: document(doc.valueprefix) }, {rank: document(document(doc.rank).coding)}))})")
+    };
+  },
+  check_practioner: function check_practioner(data) {
+    return {
+      "db_name": dbName$1,
+      "entity": "Practitioner",
+      "filter": "Practitioner.PersonID == ".concat(data),
+      "return_fields": "Practitioner "
     };
   }
 };
@@ -30087,6 +30132,8 @@ var USER_UPSERT = createAsyncThunk("userSlice/user_upsert", /*#__PURE__*/_asyncT
   var payload,
       _ref2,
       rejectWithValue,
+      temp_data,
+      qry,
       params,
       queriesjson,
       data,
@@ -30099,35 +30146,61 @@ var USER_UPSERT = createAsyncThunk("userSlice/user_upsert", /*#__PURE__*/_asyncT
           payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
           _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
           _context.prev = 2;
-          params = _objectSpread2({
-            _key: payload._key
-          }, payload);
+          console.clear();
+          console.log(payload);
+
+          if (!payload.PersonID) {
+            _context.next = 11;
+            break;
+          }
+
+          qry = queries$6.check_practioner(payload.PersonID);
+          _context.next = 9;
+          return fetchData({
+            body: JSON.stringify(qry)
+          }, __readDocumentUrl__);
+
+        case 9:
+          temp_data = _context.sent;
+          console.log(temp_data.result);
+
+        case 11:
+          params = {
+            payload: payload
+          };
+
+          if (temp_data.result.length > 0) {
+            params.check_key = payload._key;
+            params.prect_key = temp_data.result[0]._key;
+          }
+
           queriesjson = queries$6.user_upsert(params);
-          _context.next = 7;
+          _context.next = 16;
           return fetchData({
             body: JSON.stringify(queriesjson)
           }, __uspsertUrl__);
 
-        case 7:
+        case 16:
           data = _context.sent;
           return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             _key: data._key,
             data: data
           }));
 
-        case 11:
-          _context.prev = 11;
+        case 20:
+          _context.prev = 20;
           _context.t0 = _context["catch"](2);
+          console.log(_context.t0);
           return _context.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context.t0.message
           })));
 
-        case 14:
+        case 24:
         case "end":
           return _context.stop();
       }
     }
-  }, _callee, null, [[2, 11]]);
+  }, _callee, null, [[2, 20]]);
 })));
 var USER_DELETE = createAsyncThunk("userSlice/user_delete", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
   var payload,
@@ -31901,8 +31974,24 @@ var drugFrequencySlice = drugMasterFREQUENCYSlice.reducer;
 
 var drug_actions = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, drugCategoryActions), drugDosageActions), drugClassActions), drugRoutesActions), drugDirectionRoutesActions), drugMasterUomActions), drugMasterActions), drugMasterFrequencyActions);
 
+var orderSetSort = function orderSetSort(val) {
+  switch (val) {
+    case 'Short Description':
+      return "CA_OrderSet.shortDesc";
+
+    case 'Long Description':
+      return "CA_OrderSet.longDesc";
+
+    case 'Order Set Code':
+      return "CA_OrderSet.orderSetCode";
+
+    default:
+      return "CA_OrderSet.createddate";
+  }
+};
+
 var query$5 = {
-  orderSetList: function orderSetList(page, perPage, search) {
+  orderSetList: function orderSetList(page, perPage, search, sort, direction) {
     return {
       db_name: "".concat(dbName$1),
       entity: "CA_OrderSet",
@@ -31912,7 +32001,7 @@ var query$5 = {
         "count": perPage
       },
       return_fields: "MERGE(keep(CA_OrderSet,'id','_key','_id','longDesc','shortDesc','orderSetCode','status'),{TotalCount:COUNT(".concat(search ? "FOR cnt IN CA_OrderSet filter UPPER(cnt.orderSetCode) LIKE '%".concat(search.toUpperCase(), "%' || UPPER(cnt.shortDesc) LIKE '%").concat(search.toUpperCase(), "%' || UPPER(cnt.longDesc) LIKE '%").concat(search.toUpperCase(), "%' RETURN cnt._key") : "FOR cnt IN CA_OrderSet RETURN cnt._key", ")})"),
-      sort: "CA_OrderSet.createddate"
+      sort: "".concat(orderSetSort(sort), " ").concat(direction)
     };
   },
   orderSetListById: function orderSetListById(_key) {
@@ -32471,6 +32560,8 @@ var GET_ORDER_SET_LIST = createAsyncThunk("orderSetMasterApiSlice/order_set_mast
   var payload,
       _ref5,
       rejectWithValue,
+      sort,
+      direction,
       data,
       _args4 = arguments;
 
@@ -32481,9 +32572,10 @@ var GET_ORDER_SET_LIST = createAsyncThunk("orderSetMasterApiSlice/order_set_mast
           payload = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
           _ref5 = _args4.length > 1 ? _args4[1] : undefined, rejectWithValue = _ref5.rejectWithValue;
           _context4.prev = 2;
+          sort = payload.sort, direction = payload.direction;
           _context4.next = 6;
           return fetchData({
-            body: JSON.stringify(query$5.orderSetList(payload === null || payload === void 0 ? void 0 : payload.page, payload === null || payload === void 0 ? void 0 : payload.perPage, payload !== null && payload !== void 0 && payload.search ? payload === null || payload === void 0 ? void 0 : payload.search : ''))
+            body: JSON.stringify(query$5.orderSetList(payload === null || payload === void 0 ? void 0 : payload.page, payload === null || payload === void 0 ? void 0 : payload.perPage, payload !== null && payload !== void 0 && payload.search ? payload === null || payload === void 0 ? void 0 : payload.search : '', sort ? sort : '', direction ? '' : 'DESC'))
           }, __readDocumentUrl__);
 
         case 6:
@@ -34426,11 +34518,30 @@ var allergenMasterActions = {
 };
 var allergenMasterSlice$1 = allergenMasterSlice.reducer;
 
+var flexAttributeSort = function flexAttributeSort(val) {
+  switch (val) {
+    case 'Attribute Code':
+      return "CA_OrderAttribMaster.attribcode";
+
+    case 'Attribute Label':
+      return "CA_OrderAttribMaster.attriblabel";
+
+    case 'Attribute Type':
+      return "CA_OrderAttribMaster.attribtype";
+
+    case 'Attribute Size':
+      return "CA_OrderAttribMaster.attribsize";
+
+    default:
+      return "CA_OrderAttribMaster.createddate";
+  }
+};
+
 var flexQuery = {
   attributeTypeDropDown: "{\n        \"db_name\": \"".concat(dbName$1, "\",\n        \"entity\": \"CodingMaster\",\n        \"filter\": \"CodingMaster.Type=='FLEXDATATYPE' && CodingMaster.activestatus==true && CodingMaster.status==true\",\n        \"return_fields\": \"KEEP(CodingMaster,'_id','id','_key','code','display','Type','status')\",\n        \"sort\": \"CodingMaster.display\"\n      }"),
   numUomDropDown: "{\n        \"db_name\":\"".concat(dbName$1, "\",\n        \"entity\": \"CodingMaster\",\n        \"filter\": \"CodingMaster.Type=='UOM' && CodingMaster.activestatus==true && CodingMaster.status==true\",\n        \"return_fields\": \"KEEP(CodingMaster,'_id','id','_key','code','display','Type','status')\",\n        \"sort\": \"CodingMaster.display\"\n      }"),
   flexAttributeFullRead: "{\n        \"db_name\": \"".concat(dbName$1, "\",\n        \"entity\": \"CA_OrderAttribMaster\",\n        \"filter\": \"CA_OrderAttribMaster.activestatus==true\",\n        \"limit\": {\n          \"offset\": \"page\",\n          \"count\": \"perpage\",\n        },\n        \"return_fields\": \"merge(CA_OrderAttribMaster,{attribtype:document(CA_OrderAttribMaster.attribtype).display},{attribnumUOM:to_array(document(CA_OrderAttribMaster.attribnumUOM).display)})\"\n      }"),
-  flexAttrFullRead: function flexAttrFullRead(page, perpage, search) {
+  flexAttrFullRead: function flexAttrFullRead(page, perpage, search, sort, direction) {
     return {
       db_name: dbName$1,
       entity: "CA_OrderAttribMaster",
@@ -34440,7 +34551,7 @@ var flexQuery = {
         count: perpage
       },
       return_fields: "merge(CA_OrderAttribMaster,{TotalCount:COUNT(FOR cnt IN CA_OrderAttribMaster FILTER (LIKE(cnt.attribcode,'%".concat(search, "%',true) ) && cnt.activestatus==true   return cnt._id),attribtype:document(CA_OrderAttribMaster.attribtype).display},{attribnumUOM:to_array(document(CA_OrderAttribMaster.attribnumUOM).display)})"),
-      sort: "CA_OrderAttribMaster.createddate desc"
+      sort: "".concat(flexAttributeSort(sort), " ").concat(direction)
     };
   },
   flexStatusChange: function flexStatusChange(list, key) {
@@ -34665,6 +34776,8 @@ var FLEX_ATTRIBUTE_READ = createAsyncThunk("flexAttributeApiSlice/flexFullRead",
       page,
       perpage,
       search,
+      sort,
+      direction,
       data,
       _args3 = arguments;
 
@@ -34675,10 +34788,10 @@ var FLEX_ATTRIBUTE_READ = createAsyncThunk("flexAttributeApiSlice/flexFullRead",
           payload = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
           _ref6 = _args3.length > 1 ? _args3[1] : undefined, rejectWithValue = _ref6.rejectWithValue;
           _context3.prev = 2;
-          page = payload.page, perpage = payload.perpage, search = payload.search;
+          page = payload.page, perpage = payload.perpage, search = payload.search, sort = payload.sort, direction = payload.direction;
           _context3.next = 6;
           return fetchData({
-            body: JSON.stringify(flexQuery.flexAttrFullRead(page, perpage, search ? search : ''))
+            body: JSON.stringify(flexQuery.flexAttrFullRead(page, perpage, search ? search : '', sort ? sort : '', direction ? '' : 'DESC'))
           }, __readDocumentUrl__);
 
         case 6:
@@ -37029,9 +37142,40 @@ var additionalcolumns = function additionalcolumns(list) {
   return datas;
 };
 
+var getMasterSort = function getMasterSort(sort) {
+  switch (sort) {
+    case 'Long Description':
+      return "document(CodeableConceptMaster.coding)[0].display";
+
+    case 'Short Description':
+      return "document(CodeableConceptMaster.coding)[0].shortdesc";
+
+    case 'Code':
+      return "document(CodeableConceptMaster.coding)[0].code";
+
+    case 'Visit Type Indicator':
+      return "document(CodeableConceptMaster.coding)[0].gmconfigvalues[\"Visit Type Indicator\"].label";
+
+    case 'Grade':
+      return "((document(CodeableConceptMaster.coding[0]).gmconfigvalues).Grade).display";
+
+    default:
+      return "CodeableConceptMaster.createddate";
+  }
+};
+
 var queries$2 = {
   generalMasterlist_val: "{\n        \"db_name\": \"".concat(dbName$1, "\",\n        \"entity\": \"GMvalues\",\n        \"filter\": \"GMvalues.activestatus==true\",\n        \"return_fields\": \"merge(GMvalues,{gentype:document(GMvalues.gentype)})\"\n      }"),
-  generalMasterlist: "{\n        \"db_name\": \"".concat(dbName$1, "\",\n        \"entity\": \"GMdefinition\",\n         \"sort\":\"GMdefinition.gentype\",\n        \"filter\": \"GMdefinition.activestatus==true\",\n        \"return_fields\": \"merge(GMdefinition,{additionalcolumns:(for ad in GMdefinition.additionalcolumns return merge(ad,{columntype:document(ad.columntype)}))})\"\n    }"),
+  generalMasterlist: function generalMasterlist() {
+    var search = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    return {
+      "db_name": "".concat(dbName$1),
+      "entity": "GMdefinition",
+      "sort": "GMdefinition.gentype",
+      "filter": "".concat(search != '' ? "LIKE(GMdefinition.genname, \"%".concat(search, "%\", true) && GMdefinition.activestatus==true") : "GMdefinition.activestatus==true"),
+      "return_fields": "merge(GMdefinition,{additionalcolumns:(for ad in GMdefinition.additionalcolumns return merge(ad,{columntype:document(ad.columntype)}))})"
+    };
+  },
   // column_type: `{
   //   "db_name": "${dbName}",
   //   "entity": "CodingMaster",
@@ -37081,17 +37225,18 @@ var queries$2 = {
       })];
     }
   },
-  get_general_master_type: function get_general_master_type(type, page, perPage, search) {
+  get_general_master_type: function get_general_master_type(type, page, perPage, search, sort, direction) {
     debugger;
     return {
       "db_name": dbName$1,
       "entity": "CodeableConceptMaster",
-      "filter": "CodeableConceptMaster.Type == '".concat(type, "' &&(LIKE(document(CodeableConceptMaster.coding[0]).code,'%").concat(search, "%',true) ||LIKE(document(CodeableConceptMaster.coding[0]).shortdesc,'%").concat(search, "%',true) || LIKE(document(CodeableConceptMaster.coding[0]).longdesc,'%").concat(search, "%',true)) && CodeableConceptMaster.status == true && CodeableConceptMaster.activestatus == true"),
+      "filter": "CodeableConceptMaster.Type == '".concat(type, "' &&(LIKE(document(CodeableConceptMaster.coding[0]).code,'%").concat(search, "%',true) ||LIKE(document(CodeableConceptMaster.coding[0]).shortdesc,'%").concat(search, "%',true) || LIKE(document(CodeableConceptMaster.coding[0]).longdesc,'%").concat(search, "%',true))  && CodeableConceptMaster.activestatus == true"),
       "limit": {
         "offset": "".concat(page),
         "count": "".concat(perPage)
       },
-      "return_fields": "MERGE(CodeableConceptMaster,{coding:document(CodeableConceptMaster.coding)},{TotalCount:COUNT(FOR cnt IN CodeableConceptMaster filter cnt.Type=='".concat(type, "' filter cnt.activestatus==true RETURN cnt._key)})")
+      "return_fields": "MERGE(CodeableConceptMaster,{coding:document(CodeableConceptMaster.coding)},{TotalCount:COUNT(FOR cnt IN CodeableConceptMaster filter cnt.Type=='".concat(type, "' filter cnt.activestatus==true RETURN cnt._key)})"),
+      "sort": "".concat(getMasterSort(sort), " ").concat(direction)
     };
   },
   add_new_general_type: function add_new_general_type(data) {
@@ -37377,7 +37522,8 @@ var fetchMaster = function fetchMaster(name, query) {
 };
 
 var GENERAL_MASTERS_READ = createAsyncThunk("generalMasterSlice/generalMastersRead", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
-  var _ref5,
+  var payload,
+      _ref5,
       rejectWithValue,
       queriesjson,
       data,
@@ -37388,12 +37534,14 @@ var GENERAL_MASTERS_READ = createAsyncThunk("generalMasterSlice/generalMastersRe
     while (1) {
       switch (_context4.prev = _context4.next) {
         case 0:
+          payload = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
           _ref5 = _args4.length > 1 ? _args4[1] : undefined, rejectWithValue = _ref5.rejectWithValue;
           _context4.prev = 2;
-          queriesjson = queries$2.generalMasterlist;
+          queriesjson = queries$2.generalMasterlist(payload.search); // alert(JSON.stringify(queriesjson))
+
           _context4.next = 6;
           return fetchData({
-            body: queriesjson
+            body: JSON.stringify(queriesjson)
           }, __readDocumentUrl__);
 
         case 6:
@@ -37528,6 +37676,8 @@ var GET_GENERAL_MASTER_TYPE = createAsyncThunk("generalMasterSlice/get_general_m
       page,
       perPage,
       search,
+      sort,
+      direction,
       data,
       readData,
       _args7 = arguments;
@@ -37539,10 +37689,10 @@ var GET_GENERAL_MASTER_TYPE = createAsyncThunk("generalMasterSlice/get_general_m
           payload = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
           actions = _args7.length > 1 ? _args7[1] : undefined;
           _context7.prev = 2;
-          type = payload.type, page = payload.page, perPage = payload.perPage, search = payload.search;
+          type = payload.type, page = payload.page, perPage = payload.perPage, search = payload.search, sort = payload.sort, direction = payload.direction;
           _context7.next = 7;
           return fetchData({
-            body: JSON.stringify(queries$2.get_general_master_type(type, page, perPage, search ? search : ''))
+            body: JSON.stringify(queries$2.get_general_master_type(type, page, perPage, search ? search : '', sort ? sort : '', direction ? '' : 'DESC'))
           }, __readDocumentUrl__);
 
         case 7:
@@ -37925,7 +38075,7 @@ var queries$1 = {
       }
     })];
   },
-  symptom_and_specialty_read: function symptom_and_specialty_read(search, page, perPage) {
+  symptom_and_specialty_read: function symptom_and_specialty_read(search, page, perPage, sort, direction) {
     return {
       db_name: dbName$1,
       entity: "SymptomsMapping",
@@ -37935,7 +38085,7 @@ var queries$1 = {
         count: perPage
       },
       return_fields: "merge(SymptomsMapping,{TotalCount:COUNT(".concat(search ? "FOR cnt IN SymptomsMapping filter UPPER(cnt.SymptomsName) LIKE '%".concat(search.toUpperCase(), "%' || UPPER(cnt.symptomsCode) LIKE '%").concat(search.toUpperCase(), "%'  RETURN cnt._key") : "FOR cnt IN SymptomsMapping  RETURN cnt._key", " ), specialty:(FOR cod IN CodeableConceptMaster filter cod._id in SymptomsMapping.specialty  RETURN merge(cod,{coding:document(cod.coding)}))})"),
-      sort: "SymptomsMapping.createddate"
+      sort: "".concat(sort === "Symptom Code" ? "SymptomsMapping.symptomsCode ".concat(direction) : "SymptomsMapping.SymptomsName ".concat(direction))
     };
   },
   symptom_and_specialty_single_read: function symptom_and_specialty_single_read(_key) {
@@ -38085,7 +38235,7 @@ var SYMPTOM_AND_SPECIALTY_READ = createAsyncThunk("symptomAndSpecialtySlice/symp
           payload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
           _ref4 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref4.rejectWithValue;
           _context2.prev = 2;
-          readqueries = queries$1.symptom_and_specialty_read(payload === null || payload === void 0 ? void 0 : payload.search, payload === null || payload === void 0 ? void 0 : payload.page, payload === null || payload === void 0 ? void 0 : payload.perPage);
+          readqueries = queries$1.symptom_and_specialty_read(payload === null || payload === void 0 ? void 0 : payload.search, payload === null || payload === void 0 ? void 0 : payload.page, payload === null || payload === void 0 ? void 0 : payload.perPage, payload !== null && payload !== void 0 && payload.sort ? payload === null || payload === void 0 ? void 0 : payload.sort : '', payload !== null && payload !== void 0 && payload.direction ? payload === null || payload === void 0 ? void 0 : payload.direction : '');
           _context2.next = 6;
           return fetchData({
             body: JSON.stringify(readqueries)
@@ -38320,7 +38470,7 @@ var symptomAndSpecialtyActions = {
 var symptomAndSpecialtySlice$1 = symptomAndSpecialtySlice.reducer;
 
 var queries = {
-  encounterType: function encounterType(page, perPage, search) {
+  encounterType: function encounterType(page, perPage, search, sort, direction) {
     return {
       "db_name": dbName$1,
       "entity": "AMPatientClass",
@@ -38329,9 +38479,9 @@ var queries = {
         "offset": page,
         "count": perPage
       },
-      "return_fields": "merge(AMPatientClass,{TotalCount:count(FOR cnt IN AMPatientClass FILTER (LIKE(cnt.shortDesc,'%".concat(search, "%',true)) && cnt.activestatus==true   return cnt._key), encType:document(AMPatientClass.encType).code},{encTypeDesc:document(AMPatientClass.encTypeDesc).display},{encClsType:document(AMPatientClass.encClsType).code},{encClsDesc:document(AMPatientClass.encClsDesc).display})"),
-      // "merge(AMPatientClass,{encClsByTypes:(for encClsByTypes in (AMPatientClass.encClsByTypes) return merge(encClsByTypes,{encClsType:document(encClsByTypes.encClsType)}))},{encType:document(AMPatientClass.encType)})"
-      "sort": "document(AMPatientClass.encTypeDesc).display"
+      "return_fields": "merge(AMPatientClass,{TotalCount:count(FOR cnt IN AMPatientClass FILTER (LIKE(cnt.shortDesc,'%".concat(search, "%',true)) && cnt.activestatus==true   return cnt._key), encClsByTypes:(for encClsByTypes in (AMPatientClass.encClsByTypes) return merge(encClsByTypes,{encClsType:document(encClsByTypes.encClsType)})) ,encType:document(AMPatientClass.encType)},{encTypeDesc:document(AMPatientClass.encTypeDesc).display},{encClsType:document(AMPatientClass.encClsType).code},{encClsDesc:document(AMPatientClass.encClsDesc).display})"),
+      //"return" : "merge(AMPatientClass,{encClsByTypes:(for encClsByTypes in (AMPatientClass.encClsByTypes) return merge(encClsByTypes,{encClsType:document(encClsByTypes.encClsType)}))},{encType:document(AMPatientClass.encType)})",
+      "sort": "".concat(sort === 'code' ? "AMPatientClass.encType ".concat(direction) : "AMPatientClass.shortDesc ".concat(direction))
     };
   },
   //STATUS CHANGE
@@ -38368,7 +38518,7 @@ var ENCOUNTER_TYPE_READ = createAsyncThunk("encouterTypeSlice/encouterTypeRead",
           payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
           _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
           _context.prev = 2;
-          queriesjson = queries.encounterType(payload === null || payload === void 0 ? void 0 : payload.page, payload === null || payload === void 0 ? void 0 : payload.perPage, payload !== null && payload !== void 0 && payload.search ? payload === null || payload === void 0 ? void 0 : payload.search : '');
+          queriesjson = queries.encounterType(payload === null || payload === void 0 ? void 0 : payload.page, payload === null || payload === void 0 ? void 0 : payload.perPage, payload !== null && payload !== void 0 && payload.search ? payload === null || payload === void 0 ? void 0 : payload.search : '', payload !== null && payload !== void 0 && payload.sort ? payload === null || payload === void 0 ? void 0 : payload.sort : "", payload !== null && payload !== void 0 && payload.direction ? payload === null || payload === void 0 ? void 0 : payload.direction : '');
           _context.next = 6;
           return fetchData({
             body: JSON.stringify(queriesjson)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primary_care_admin_binder",
-  "version": "0.1.67",
+  "version": "0.1.70",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",