diff --git a/src/controllers/EmployeePosTypeController.ts b/src/controllers/EmployeePosTypeController.ts
index aedabafe..a7600a10 100644
--- a/src/controllers/EmployeePosTypeController.ts
+++ b/src/controllers/EmployeePosTypeController.ts
@@ -141,10 +141,11 @@ export class EmployeePosTypeController extends Controller {
   async deleteType(@Path() id: string, @Request() request: RequestWithUser) {
     let result: any;
     try {
-      result = await this.employeePosTypeRepository.findOne({
-        where: { id: id },
-      });
-      await this.employeePosTypeRepository.remove(result, { data: request });
+      // result = await this.employeePosTypeRepository.findOne({
+      //   where: { id: id },
+      // });
+      // await this.employeePosTypeRepository.remove(result, { data: request });
+      result = await this.employeePosTypeRepository.delete({ id: id });
     } catch {
       throw new HttpError(
         HttpStatusCode.NOT_FOUND,
diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts
index 12da3cec..d460aaef 100644
--- a/src/controllers/OrganizationDotnetController.ts
+++ b/src/controllers/OrganizationDotnetController.ts
@@ -2113,12 +2113,12 @@ export class OrganizationDotnetController extends Controller {
         id: profile.id,
         avatar: profile.avatar,
         avatarName: profile.avatarName,
-        rank: profile.rank,
-        prefix: profile.prefix,
-        firstName: profile.firstName,
-        lastName: profile.lastName,
-        citizenId: profile.citizenId,
-        position: profile.position,
+        rank: profile.rank ?? "",
+        prefix: profile.prefix ?? "",
+        firstName: profile.firstName ?? "",
+        lastName: profile.lastName ?? "",
+        citizenId: profile.citizenId ?? "",
+        position: profile.position ?? "",
         posLevelId: profile.posLevelId,
         posTypeId: profile.posTypeId,
         email: profile.email,
@@ -2137,10 +2137,10 @@ export class OrganizationDotnetController extends Controller {
         reasonSameDate: profile.reasonSameDate,
         telephoneNumber: profile.telephoneNumber,
         nationality: profile.nationality,
-        gender: profile.gender,
-        relationship: profile.relationship,
-        religion: profile.religion,
-        bloodGroup: profile.bloodGroup,
+        gender: profile.gender ?? "",
+        relationship: profile.relationship ?? "",
+        religion: profile.religion ?? "",
+        bloodGroup: profile.bloodGroup ?? "",
         registrationAddress: profile.registrationAddress,
         registrationProvinceId: profile.registrationProvinceId,
         registrationDistrictId: profile.registrationDistrictId,
@@ -2152,8 +2152,8 @@ export class OrganizationDotnetController extends Controller {
         currentZipCode: profile.currentZipCode,
         dutyTimeId: profile.dutyTimeId,
         dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
-        posLevel: profile.posLevel?.posLevelName ?? null,
-        posType: profile.posType?.posTypeName ?? null,
+        posLevel: profile.posLevel?.posLevelName ?? "",
+        posType: profile.posType?.posTypeName ?? "",
         profileSalary: profile.profileSalary,
         profileInsignia: profile.profileInsignias.map((x) => {
           return { ...x, insignia: x.insignia.name };
@@ -2174,7 +2174,7 @@ export class OrganizationDotnetController extends Controller {
               x.orgRevision?.orgRevisionIsDraft == false &&
               x.orgRevision?.orgRevisionIsCurrent == true,
           )?.orgRootId ?? null,
-        posNo: shortName,
+        posNo: shortName ?? "",
       };
     });
 
@@ -2251,12 +2251,12 @@ export class OrganizationDotnetController extends Controller {
         id: profile.id,
         avatar: profile.avatar,
         avatarName: profile.avatarName,
-        rank: profile.rank,
-        prefix: profile.prefix,
-        firstName: profile.firstName,
-        lastName: profile.lastName,
-        citizenId: profile.citizenId,
-        position: profile.position,
+        rank: profile.rank ?? "",
+        prefix: profile.prefix ?? "",
+        firstName: profile.firstName ?? "",
+        lastName: profile.lastName ?? "",
+        citizenId: profile.citizenId ?? "",
+        position: profile.position ?? "",
         posLevelId: profile.posLevelId,
         email: profile.email,
         phone: profile.phone,
@@ -2274,10 +2274,10 @@ export class OrganizationDotnetController extends Controller {
         reasonSameDate: profile.reasonSameDate,
         telephoneNumber: profile.telephoneNumber,
         nationality: profile.nationality,
-        gender: profile.gender,
-        relationship: profile.relationship,
-        religion: profile.religion,
-        bloodGroup: profile.bloodGroup,
+        gender: profile.gender ?? "",
+        relationship: profile.relationship ?? "",
+        religion: profile.religion ?? "",
+        bloodGroup: profile.bloodGroup ?? "",
         registrationAddress: profile.registrationAddress,
         registrationProvinceId: profile.registrationProvinceId,
         registrationDistrictId: profile.registrationDistrictId,
@@ -2289,8 +2289,8 @@ export class OrganizationDotnetController extends Controller {
         currentZipCode: profile.currentZipCode,
         //   dutyTimeId: profile.dutyTimeId,
         //   dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
-        posLevel: profile.posLevel?.posLevelName ?? null,
-        posType: profile.posType?.posTypeName ?? null,
+        posLevel: profile.posLevel?.posLevelName ?? "",
+        posType: profile.posType?.posTypeName ?? "",
         profileSalary: profile.profileSalary,
         profileInsignia: profile.profileInsignias.map((x) => {
           return { ...x, insignia: x.insignia.name };
@@ -2298,7 +2298,7 @@ export class OrganizationDotnetController extends Controller {
         amount: profile.amount,
         positionSalaryAmount: profile.positionSalaryAmount,
         mouthSalaryAmount: profile.mouthSalaryAmount,
-        profileType: "OFFICER",
+        profileType: "EMPLOYEE",
         root:
           profile?.current_holders?.find(
             (x) =>
@@ -2311,7 +2311,7 @@ export class OrganizationDotnetController extends Controller {
               x.orgRevision?.orgRevisionIsDraft == false &&
               x.orgRevision?.orgRevisionIsCurrent == true,
           )?.orgRootId ?? null,
-        posNo: shortName,
+        posNo: shortName ?? "",
       };
     });
 
diff --git a/src/controllers/OrganizationUnauthorizeController.ts b/src/controllers/OrganizationUnauthorizeController.ts
index 216e2f8f..efa49a38 100644
--- a/src/controllers/OrganizationUnauthorizeController.ts
+++ b/src/controllers/OrganizationUnauthorizeController.ts
@@ -947,6 +947,7 @@ export class OrganizationUnauthorizeController extends Controller {
     if (val >= 70 && val <= 79) return "ดี";
     if (val >= 80 && val <= 89) return "ดีมาก";
     if (val >= 90 && val <= 100) return "ดีเด่น";
+    if (val > 101 ) return "ดีเด่น";
     else return "-";
   }
 
diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 580e513d..c8f351ee 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -4857,6 +4857,9 @@ export class ProfileController extends Controller {
         nodeId: null,
         type: profile.employeeClass,
         salary: profile.amount,
+        posNo : root?.orgRootShortName && posMaster?.posMasterNo 
+          ? `${root?.orgRootShortName}${posMaster?.posMasterNo}`
+          : ""
       };
       if (_profile.child4Id != null) {
         _profile.node = 4;
@@ -4998,6 +5001,9 @@ export class ProfileController extends Controller {
       nodeId: null,
       salary: profile ? profile.amount : null,
       amountSpecial: profile ? profile.amountSpecial : null,
+      posNo : root?.orgRootShortName && posMaster?.posMasterNo 
+          ? `${root?.orgRootShortName}${posMaster?.posMasterNo}`
+          : ""
     };
 
     if (_profile.child4Id != null) {
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index 60f75640..02cf1e6e 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -2153,6 +2153,9 @@ export class ProfileEmployeeController extends Controller {
       nodeId: null,
       salary: profile ? profile.amount : null,
       amountSpecial: profile ? profile.amountSpecial : null,
+      posNo : root?.orgRootShortName && posMaster?.posMasterNo 
+          ? `${root?.orgRootShortName}${posMaster?.posMasterNo}`
+          : ""
     };
     return new HttpSuccess(_profile);
   }