Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

src/controllers/ProfileController.ts

@@ -2025,7 +2025,11 @@ export class ProfileController extends Controller {
           child3ShortName: child3Holder?.orgChild3ShortName ?? null,
           child4: child4Holder?.orgChild4Name ?? null,
           child4Id: child4Holder?.id ?? null,
-          // posMasterNo: posMasterNo,
+          posMasterNo: posMasterNo ?? null,
+          posTypeId: item.posTypeId,
+          posTypeName: item.posType?.posTypeName,
+          posLevelId: item.posLevelId,
+          posLevelName: item.posLevel?.posLevelName,
         };
       }),
     );

src/controllers/ProfileEmployeeController.ts

@@ -1303,6 +1303,9 @@ export class ProfileEmployeeController extends Controller {
         const child4Holder = item.current_holders?.find(
           (x) => x.orgRevisionId == findRevision.id,
         )?.orgChild4;
+        const posMasterNo = item.current_holders?.find(
+          (x) => x.orgRevisionId == findRevision.id,
+        )?.posMasterNo;
 
         return {
           id: item.id,
@@ -1337,6 +1340,11 @@ export class ProfileEmployeeController extends Controller {
           child4: child4Holder?.orgChild4Name ?? null,
           child4Id: child4Holder?.id ?? null,
           child4ShortName: child4Holder?.orgChild4ShortName ?? null,
+          posMasterNo: posMasterNo ?? null,
+          posTypeId: item.posTypeId,
+          posTypeName: item.posType?.posTypeName,
+          posLevelId: item.posLevelId,
+          posLevelName: item.posLevel?.posLevelName,
         };
       }),
     );