primary_care_admin_binder 0.1.176 → 0.1.178

package/dist/index.cjs.js

@@ -8954,7 +8954,8 @@ var typeToKeyMap = {
 var tables = {
   "GEOGRAPHIC_MASTER": "SMGeographicMaster",
   "FREQUENCY_MASTER": "FrequencyMaster",
-  "GENERAL_MASTER": "CodingMaster"
+  "GENERAL_MASTER": "CodingMaster",
+  "ORGANIZATION_MASTER": "Organization"
 };
 
 var codingMasterFilter = function codingMasterFilter(type) {
@@ -9280,6 +9281,7 @@ var generateReadJSON$5 = function generateReadJSON(data) {
     names: nameslist !== null && nameslist !== void 0 ? nameslist : [{}],
     details: {
       practitoner_id: data === null || data === void 0 ? void 0 : data.practitionerid,
+      grcid: data !== null && data !== void 0 && data.grcid ? String(data === null || data === void 0 ? void 0 : data.grcid) : "",
       gender: {
         label: data === null || data === void 0 || (_data$gender = data.gender) === null || _data$gender === void 0 ? void 0 : _data$gender.display,
         _id: data === null || data === void 0 || (_data$gender2 = data.gender) === null || _data$gender2 === void 0 ? void 0 : _data$gender2._id
@@ -30560,11 +30562,11 @@ var ReadTreeDetailJson = function ReadTreeDetailJson(data, parentOrgName) {
 
   // Process specialty details
   var specialtyDetailsArr = ((_data$specialtyDetail = data.specialtyDetails) !== null && _data$specialtyDetail !== void 0 ? _data$specialtyDetail : []).map(function (val) {
-    var _val$specialty$descri, _val$specialty;
+    var _val$specialty, _val$specialty2, _val$specialty3;
     return {
       effFrom: val !== null && val !== void 0 && val.effFrom ? moment.unix(val.effFrom).format('DD-MM-YYYY') : '',
       effTo: val !== null && val !== void 0 && val.effTo ? moment.unix(val.effTo).format('DD-MM-YYYY') : '',
-      specialty: (_val$specialty$descri = val === null || val === void 0 || (_val$specialty = val.specialty) === null || _val$specialty === void 0 ? void 0 : _val$specialty.description) !== null && _val$specialty$descri !== void 0 ? _val$specialty$descri : ''
+      specialty: _typeof(val === null || val === void 0 ? void 0 : val.specialty) === 'object' ? (val === null || val === void 0 || (_val$specialty = val.specialty) === null || _val$specialty === void 0 ? void 0 : _val$specialty.display) || (val === null || val === void 0 || (_val$specialty2 = val.specialty) === null || _val$specialty2 === void 0 ? void 0 : _val$specialty2.description) || '' : (_val$specialty3 = val === null || val === void 0 ? void 0 : val.specialty) !== null && _val$specialty3 !== void 0 ? _val$specialty3 : ''
     };
   });
 
@@ -30735,8 +30737,10 @@ var generateJson$8 = {
       };
     });
     var specialtyDetailsArr = data === null || data === void 0 || (_data$specialtyDetail = data.specialtyDetails) === null || _data$specialtyDetail === void 0 ? void 0 : _data$specialtyDetail.map(function (val, i) {
+      var specId = (val === null || val === void 0 ? void 0 : val.dropdown.id) || (val === null || val === void 0 ? void 0 : val.dropdown.value);
+      var cleanSpecId = typeof specId === "string" && specId.includes("/") ? specId.split("/")[1] : specId;
       return {
-        specialty: val === null || val === void 0 ? void 0 : val.dropdown.id,
+        specialty: cleanSpecId,
         effFrom: moment(val === null || val === void 0 ? void 0 : val.effFrom, "DD-MM-YYYY").unix(),
         effTo: moment(val === null || val === void 0 ? void 0 : val.effTo, "DD-MM-YYYY").unix(),
         external: false
@@ -30784,7 +30788,7 @@ var generateJson$8 = {
     }
     return [_objectSpread2(_objectSpread2({
       appcode: dbName,
-      collection: "Organization",
+      collection: tables.ORGANIZATION_MASTER,
       is_metadata: true,
       metadata_dbname: metaDatadbName$1,
       metadataId: metaDataId$1
@@ -30826,8 +30830,21 @@ var generateJson$8 = {
   }
 };
 var unixToLocalDate = function unixToLocalDate(unixTimestamp) {
-  if (typeof unixTimestamp !== "number" || unixTimestamp <= 0) return null;
-  return moment.unix(unixTimestamp).local().toDate();
+  if (unixTimestamp === null || unixTimestamp === undefined || unixTimestamp === "") return null;
+  if (typeof unixTimestamp === "number" && unixTimestamp > 0) {
+    return moment.unix(unixTimestamp).local().toDate();
+  }
+  if (typeof unixTimestamp === "string") {
+    if (!isNaN(unixTimestamp) && Number(unixTimestamp) > 0) {
+      return moment.unix(Number(unixTimestamp)).local().toDate();
+    }
+    var m = moment(unixTimestamp, ["YYYY-MM-DD", "DD-MM-YYYY", moment.ISO_8601], true);
+    return m.isValid() ? m.toDate() : null;
+  }
+  if (unixTimestamp instanceof Date && !isNaN(unixTimestamp)) {
+    return unixTimestamp;
+  }
+  return null;
 };
 var generateReadJson$2 = {
   read_json: function read_json(data) {
@@ -30859,8 +30876,8 @@ var generateReadJson$2 = {
     var AliasArr = ((_data$alias = data.alias) !== null && _data$alias !== void 0 ? _data$alias : []).map(function (v) {
       var _v$aliasType$display, _v$aliasType$_id, _v$aliasDesc;
       return {
-        startdate: v !== null && v !== void 0 && v.aliasStart ? moment(v.aliasStart, "DD-MM-YYYY").toDate() : null,
-        enddate: v !== null && v !== void 0 && v.aliasEnd ? moment(v.aliasEnd, "DD-MM-YYYY").toDate() : null,
+        startdate: unixToLocalDate(v === null || v === void 0 ? void 0 : v.aliasStart),
+        enddate: unixToLocalDate(v === null || v === void 0 ? void 0 : v.aliasEnd),
         aliastype: v !== null && v !== void 0 && v.aliasType ? {
           title: (_v$aliasType$display = v.aliasType.display) !== null && _v$aliasType$display !== void 0 ? _v$aliasType$display : "",
           value: (_v$aliasType$_id = v.aliasType._id) !== null && _v$aliasType$_id !== void 0 ? _v$aliasType$_id : ""
@@ -30989,24 +31006,33 @@ var generateReadJson$2 = {
 
     // --- Specialty Details ---
     var specialtyDetailsArr = ((_data$specialtyDetail2 = data.specialtyDetails) !== null && _data$specialtyDetail2 !== void 0 ? _data$specialtyDetail2 : []).map(function (val) {
-      var _specialty$descriptio, _specialty$specialtyC, _specialty$_id, _specialty$code, _specialty$descriptio2, _specialty$_id2;
       var effFrom = unixToLocalDate(val === null || val === void 0 ? void 0 : val.effFrom);
       var effTo = unixToLocalDate(val === null || val === void 0 ? void 0 : val.effTo);
       var specialty = (val === null || val === void 0 ? void 0 : val.specialty) || {};
-      var label = specialty.description ? "".concat(specialty.description, " (").concat(specialty.specialtyCode || "", ")") : "";
+      var specialty_id = "";
+      var specialty_name = "";
+      var specialty_code = "";
+      if (typeof specialty === "string") {
+        specialty_id = specialty;
+      } else if (_typeof(specialty) === "object") {
+        specialty_id = specialty._id || specialty.id || "";
+        specialty_name = specialty.description || specialty.display || specialty.name || "";
+        specialty_code = specialty.specialtyCode || specialty.code || "";
+      }
+      var label = specialty_name ? "".concat(specialty_name, " (").concat(specialty_code || "", ")") : "";
       return {
         effFrom: effFrom ? effFrom : null,
         effTo: effTo ? effTo : null,
-        specialty: (_specialty$descriptio = specialty.description) !== null && _specialty$descriptio !== void 0 ? _specialty$descriptio : "",
-        code: (_specialty$specialtyC = specialty.specialtyCode) !== null && _specialty$specialtyC !== void 0 ? _specialty$specialtyC : "",
-        specialty_id: (_specialty$_id = specialty._id) !== null && _specialty$_id !== void 0 ? _specialty$_id : "",
+        specialty: specialty_name,
+        code: specialty_code,
+        specialty_id: specialty_id,
         fromDate: effFrom,
         toDate: effTo,
         dropdown: {
           label: label,
-          value: (_specialty$code = specialty.code) !== null && _specialty$code !== void 0 ? _specialty$code : "",
-          name: (_specialty$descriptio2 = specialty.description) !== null && _specialty$descriptio2 !== void 0 ? _specialty$descriptio2 : "",
-          id: (_specialty$_id2 = specialty._id) !== null && _specialty$_id2 !== void 0 ? _specialty$_id2 : ""
+          value: specialty_code,
+          name: specialty_name,
+          id: specialty_id
         }
       };
     });

package/package.json

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