diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs
index 4d70130..642d884 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHomeController.cs
@@ -1122,8 +1122,9 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                         //        }
                         //    }
                         //}
+                        var checkIds = ListSafeCheckYearMonthT.Select(t => t.SOURCEID).Distinct().ToList();
                         var loginDepart = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID);
-                        var listCheckType = GetEntities<MS.Domain.Entities.SK.T_SK_CHECK_TYPE>(e => true, null, null).ToList();
+                        var listCheckType = GetEntities<MS.Domain.Entities.SK.T_SK_CHECK_TYPE>(e => checkIds.Contains(e.ID), null, null).ToList();
                         if (loginDepart != null)
                         {
                             listCheckType = listCheckType.Where(t => t.PRODUCTION_UNIT_ID == loginDepart.PRODUCTION_UNIT_ID).ToList();
diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
index 79df9a8..701e962 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
@@ -427,7 +427,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
                         switch (type)
                         {
                             case "0":
-                                departs = departments.Where(t => t.DEPARTMENT_TYPE == 10 || (t.DEPARTMENT_STATUS == 2 && t.DEPARTMENT_TYPE == 5)).OrderBy(m => m.PARENT_ID).ThenBy(k => k.NUM).ToList();
+                                departs = departments.Where(t => t.DEPARTMENT_TYPE == 10 || t.DEPARTMENT_STATUS).OrderBy(m => m.PARENT_ID).ThenBy(k => k.NUM).ToList();
                                 break;
                             case "1":
                                 departs = departments.Where(t => t.DEPARTMENT_TYPE == 15).OrderBy(k => k.Nav_Parent?.NUM).ThenBy(k => k.NUM).ToList();
@@ -456,11 +456,11 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
                             var overfinish = tasks.Count(t => t.NOTICE_STATUS == 2 && departIds.Contains((Guid)t.DEPARTMENT_ID));
                             var overUnfinish = tasks.Count(t => t.NOTICE_STATUS == 0 && departIds.Contains((Guid)t.DEPARTMENT_ID) && t.TASK_ENDDT < DateTime.Now);
                             var unfinish = tasks.Count(t => t.NOTICE_STATUS == 0 && departIds.Contains((Guid)t.DEPARTMENT_ID) && t.TASK_ENDDT >= DateTime.Now);
-                            count = count - unfinish;
+                            //count = count - unfinish;
                             //var unfinish = count - finish - overfinish - overUnfinish;
-                            var temp1 = count == 0 ? 100 : (double)(finish + overfinish) / count * 100;
+                            var temp1 = count == 0 ? 100 : (double)(finish + overfinish) / (count - unfinish) * 100;
                             var finishRate = temp1.ToString("0") + "%";
-                            var temp2 = count == 0 ? 100 : (double)finish / count * 100;
+                            var temp2 = count == 0 ? 100 : (double)finish / (count - unfinish) * 100;
                             var normalFinishRate = temp2.ToString("0") + "%";
                             T_BI_FORM_RUN_ANALYSIS analysis = new T_BI_FORM_RUN_ANALYSIS();
                             analysis.MOUDLE_NAME = item.NAME;