diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
index 98e876aa..9821fb26 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
@@ -157,7 +157,6 @@ namespace BMA.EHR.Placement.Service.Controllers
                 var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
                 var _res = await client.SendAsync(_req);
                 var _result = await _res.Content.ReadAsStringAsync();
-
                 if (_res.IsSuccessStatusCode)
                 {
                     var org = JsonConvert.DeserializeObject<OrgRequestAct>(_result);
@@ -171,6 +170,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                         var data1 = await _context.PlacementProfiles
                         .Where(x => x.Placement.Id == examId)
                         .Where(x => x.Draft == true)
+                        .Where(x => x.PlacementStatus != "UN-CONTAIN")
                         .Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id)))))
                         .Select(x => new
                         {
@@ -282,9 +282,8 @@ namespace BMA.EHR.Placement.Service.Controllers
                         }
                         return Success(result1);
                     }
-                    else
+                    if (org.result.isOfficer == true)
                     {
-
                         var data = await _context.PlacementProfiles.Where(x => x.Placement.Id == examId).Select(x => new
                         {
                             Id = x.Id,
@@ -616,70 +615,68 @@ namespace BMA.EHR.Placement.Service.Controllers
         [HttpGet("pass/stat/{examId:length(36)}")]
         public async Task<ActionResult<ResponseObject>> GetDashboardByPlacement(Guid examId)
         {
-            if (PlacementAdmin == true)
-            {
-                var placement = await _context.Placements
-                    .Where(x => x.Id == examId)
-                    .Select(x => new
-                    {
-                        Total = x.PlacementProfiles.Count(),
-                        UnContain = x.PlacementProfiles.Where(p => p.PlacementStatus.Trim().ToUpper() == "UN-CONTAIN").Count(),
-                        PrepareContain = x.PlacementProfiles.Where(p => p.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN").Count(),
-                        Report = x.PlacementProfiles.Where(p => p.PlacementStatus.Trim().ToUpper() == "REPORT").Count(),
-                        Done = x.PlacementProfiles.Where(p => p.PlacementStatus.Trim().ToUpper() == "DONE").Count(),
-                        Disclaim = x.PlacementProfiles.Where(p => p.PlacementStatus.Trim().ToUpper() == "DISCLAIM").Count(),
-                    }).FirstOrDefaultAsync();
-                if (placement == null)
-                    return Error(GlobalMessages.DataNotFound, 404);
 
-                return Success(placement);
-            }
-            else
+
+            var rootId = "";
+            var child1Id = "";
+            var child2Id = "";
+            var child3Id = "";
+            var child4Id = "";
+            var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position-act";
+            using (var client = new HttpClient())
             {
-                var rootId = "";
-                var child1Id = "";
-                var child2Id = "";
-                var child3Id = "";
-                var child4Id = "";
-                var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
-                using (var client = new HttpClient())
+                client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
+                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
+                var _res = await client.SendAsync(_req);
+                var _result = await _res.Content.ReadAsStringAsync();
+
+                if (_res.IsSuccessStatusCode)
                 {
-                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
-                    var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
-                    var _res = await client.SendAsync(_req);
-                    var _result = await _res.Content.ReadAsStringAsync();
+                    var org = JsonConvert.DeserializeObject<OrgRequestAct>(_result);
+                    if (org.result.isOfficer == false)
+                    {
+                        rootId = org.result.rootId == null ? "" : org.result.rootId;
+                        child1Id = org.result.child1Id == null ? "" : org.result.child1Id;
+                        child2Id = org.result.child2Id == null ? "" : org.result.child2Id;
+                        child3Id = org.result.child3Id == null ? "" : org.result.child3Id;
+                        child4Id = org.result.child4Id == null ? "" : org.result.child4Id;
+                        var placement = await _context.Placements
+                            .Where(x => x.Id == examId)
+                            .Select(x => new
+                            {
+                                Total = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Count(),
+                                UnContain = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "UN-CONTAIN").Count(),
+                                PrepareContain = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN").Count(),
+                                Report = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "REPORT").Count(),
+                                Done = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "DONE").Count(),
+                                Disclaim = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "DISCLAIM").Count(),
+                            }).FirstOrDefaultAsync();
+                        if (placement == null)
+                            return Error(GlobalMessages.DataNotFound, 404);
 
-                    var org = JsonConvert.DeserializeObject<OrgRequest>(_result);
-
-                    if (org == null || org.result == null)
-                        return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
-                    rootId = org.result.rootId == null ? "" : org.result.rootId;
-                    child1Id = org.result.child1Id == null ? "" : org.result.child1Id;
-                    child2Id = org.result.child2Id == null ? "" : org.result.child2Id;
-                    child3Id = org.result.child3Id == null ? "" : org.result.child3Id;
-                    child4Id = org.result.child4Id == null ? "" : org.result.child4Id;
-                    // var profileOrg = await _context.Profiles.FirstOrDefaultAsync(x => x.KeycloakId == Guid.Parse(UserId ?? "00000000-0000-0000-0000-000000000000"));
-                    // if (profileOrg == null)
-                    // return Error(GlobalMessages.DataNotFound, 404);
-                    // var ocIdList = _documentService.GetAllIdByRoot(profileOrg.OcId);
-                    var placement = await _context.Placements
-                        .Where(x => x.Id == examId)
-                        .Select(x => new
-                        {
-                            Total = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Count(),
-                            UnContain = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "UN-CONTAIN").Count(),
-                            PrepareContain = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN").Count(),
-                            Report = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "REPORT").Count(),
-                            Done = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "DONE").Count(),
-                            Disclaim = x.PlacementProfiles.Where(x => x.Draft == true).Where(x => rootId == "" ? true : (child1Id == "" ? x.rootId == rootId : (child2Id == "" ? x.child1Id == child1Id : (child3Id == "" ? x.child2Id == child2Id : (child4Id == "" ? x.child3Id == child3Id : x.child4Id == child4Id))))).Where(p => p.PlacementStatus.Trim().ToUpper() == "DISCLAIM").Count(),
-                        }).FirstOrDefaultAsync();
-                    if (placement == null)
-                        return Error(GlobalMessages.DataNotFound, 404);
-
-                    return Success(placement);
+                        return Success(placement);
+                    }
+                    if (org.result.isOfficer == true)
+                    {
+                        var placement = await _context.Placements
+                            .Where(x => x.Id == examId)
+                            .Select(x => new
+                            {
+                                Total = x.PlacementProfiles.Count(),
+                                UnContain = x.PlacementProfiles.Where(p => p.PlacementStatus.Trim().ToUpper() == "UN-CONTAIN").Count(),
+                                PrepareContain = x.PlacementProfiles.Where(p => p.PlacementStatus.Trim().ToUpper() == "PREPARE-CONTAIN").Count(),
+                                Report = x.PlacementProfiles.Where(p => p.PlacementStatus.Trim().ToUpper() == "REPORT").Count(),
+                                Done = x.PlacementProfiles.Where(p => p.PlacementStatus.Trim().ToUpper() == "DONE").Count(),
+                                Disclaim = x.PlacementProfiles.Where(p => p.PlacementStatus.Trim().ToUpper() == "DISCLAIM").Count(),
+                            }).FirstOrDefaultAsync();
+                        if (placement == null)
+                            return Error(GlobalMessages.DataNotFound, 404);
+                        return Success(placement);
+                    }
                 }
             }
+            return Success(new List<dynamic>());
         }
 
         [HttpPost("pass/deferment"), DisableRequestSizeLimit]