diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
index be072a3..f2dd375 100644
--- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
+++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
@@ -12455,7 +12455,7 @@ namespace APT.BaseData.Services.DomainServices
                 var currentDepart = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID);
                 if (currentDepart != null)
                 {
-                    if (currentDepart.DEPARTMENT_TYPE == 0)
+                    if (currentDepart.DEPARTMENT_TYPE == 10)
                     {
                         departIds.Add(currentDepart.ID);
                         if (user == null)
@@ -12467,7 +12467,7 @@ namespace APT.BaseData.Services.DomainServices
                             }
                         }
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 1)
+                    else if (currentDepart.DEPARTMENT_TYPE == 15)
                     {
                         departIds.Add(currentDepart.ID);
                         var classIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
@@ -12483,7 +12483,7 @@ namespace APT.BaseData.Services.DomainServices
                         //DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
                         //departIds.Add(currentDepart.ID);
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 2)
+                    else if (currentDepart.DEPARTMENT_TYPE == 20)
                     {
                         var parentId = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID)?.PARENT_ID;
                         departIds.Add((Guid)parentId);
@@ -12509,7 +12509,7 @@ namespace APT.BaseData.Services.DomainServices
                             }
                         }
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 3)
+                    else if (currentDepart.DEPARTMENT_TYPE == 5)
                     {
                         departIds.Add(currentDepart.ID);
                         user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
@@ -12556,18 +12556,18 @@ namespace APT.BaseData.Services.DomainServices
                         result.START_DATE = entity.START_DATE;
                         result.END_DATE = entity.END_DATE;
                         result.REQUIRE_ID = entity.REQUIRE_ID != null ? entity.REQUIRE_ID : requre?.ID;
-                        result.ISCOMPANY = currentDepart.DEPARTMENT_TYPE == 3 ? SKIsStoreEnum.Yes : SKIsStoreEnum.No;
+                        result.ISCOMPANY = currentDepart.DEPARTMENT_TYPE == 5 ? SKIsStoreEnum.Yes : SKIsStoreEnum.No;
                         var identityIds = identitys.Select(t => t.ID).ToList();
                         //Expression<Func<T_SK_RISK_IDENTIFY_DETAIL, bool>> expression2 = i => i.IS_DELETED == false && identityIds.Contains(i.RISK_IDENTIFY_ID);
                         //List<T_SK_RISK_IDENTIFY_DETAIL> list = this.GetOrderEntities(expression2, new BaseFilter(entity.ORG_ID)).ToList();
                         var list = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => identityIds.Contains(t.RISK_IDENTIFY_ID), new BaseFilter(entity.ORG_ID));
-                        var detailList = list.GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID });
+                        var detailList = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME,  m.RISK_DESCRIPTION, m.TYPE_ID });
                         if (detailList.Any())
                         {
                             foreach (var item in detailList)
                             {
-                                var mark = librarys.FirstOrDefault(m => m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID);
-                                var temp = list.Where(m => m.AREA_ID == item.Key.AREA_ID && m.MineType == item.Key.MineType && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_NAME_ID == item.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList();
+                                var mark = librarys.FirstOrDefault(m => m.AREA_ID == item.Key.AREA_ID && m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.RISK_NAME == item.Key.RISK_NAME  && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID);
+                                var temp = list.Where(m => m.AREA_ID == item.Key.AREA_ID && m.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && m.RISK_NAME == item.Key.RISK_NAME && m.RISK_DESCRIPTION == item.Key.RISK_DESCRIPTION && m.TYPE_ID == item.Key.TYPE_ID).ToList();
                                 var identifyIds = temp.Select(t => t.RISK_IDENTIFY_ID).ToList();
                                 //本组是否存在有效数据
                                 var tempYes = temp.FirstOrDefault(t => t.ENABLE_STATUS == SKEnableStatusEnum.Yes);
@@ -12583,11 +12583,9 @@ namespace APT.BaseData.Services.DomainServices
                                 T_SK_RISK_IDENTIFY_RESULT_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
                                 ideDetail.ORG_ID = entity.ORG_ID;
                                 ideDetail.RISK_IDENTIFY_RESULT_ID = result.ID;
-                                ideDetail.MineType = item.Key.MineType;
                                 ideDetail.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
                                 ideDetail.AREA_ID = item.Key.AREA_ID;
                                 ideDetail.RISK_NAME = item.Key.RISK_NAME;
-                                ideDetail.RISK_NAME_ID = item.Key.RISK_NAME_ID;
                                 ideDetail.RISK_DESCRIPTION = item.Key.RISK_DESCRIPTION;
                                 ideDetail.TYPE_ID = item.Key.TYPE_ID;
                                 ideDetail.MEASURE = tempYes != null ? tempYes.MEASURE : temp[0]?.MEASURE;
@@ -12606,15 +12604,15 @@ namespace APT.BaseData.Services.DomainServices
                                         foreach (var ite in departTemps)
                                         {
                                             var departType = "公司级";
-                                            if (ite == 0)
+                                            if (ite == 10)
                                             {
                                                 departType = "部门级";
                                             }
-                                            if (ite == 1)
+                                            if (ite == 15)
                                             {
                                                 departType = "车间级";
                                             }
-                                            if (ite == 2)
+                                            if (ite == 20)
                                             {
                                                 departType = "班组级";
                                             }
@@ -12742,7 +12740,7 @@ namespace APT.BaseData.Services.DomainServices
                             userId = user.ID;
                         }
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 0)
+                    else if (currentDepart.DEPARTMENT_TYPE == 10)
                     {
                         departIds.Add(currentDepart.ID);
                         var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
@@ -12758,7 +12756,7 @@ namespace APT.BaseData.Services.DomainServices
                             }
                         }
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 1)
+                    else if (currentDepart.DEPARTMENT_TYPE == 15)
                     {
                         //departIds.Add(currentDepart.ID);
                         var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID;
@@ -12791,7 +12789,7 @@ namespace APT.BaseData.Services.DomainServices
                         //DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
                         //departIds.Add(currentDepart.ID);
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 2)
+                    else if (currentDepart.DEPARTMENT_TYPE == 20)
                     {
                         var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
                         if (parentId != null)
@@ -12825,7 +12823,7 @@ namespace APT.BaseData.Services.DomainServices
                             }
                         }
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 3)
+                    else if (currentDepart.DEPARTMENT_TYPE == 5)
                     {
                         departIds.Add(currentDepart.ID);
                         user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
@@ -12887,20 +12885,20 @@ namespace APT.BaseData.Services.DomainServices
                     //Expression<Func<T_SK_RISK_IDENTIFY_RESULT_DETAIL, bool>> expression2 = i => i.IS_DELETED == false && resultIds.Contains(i.RISK_IDENTIFY_RESULT_ID);
                     //List<T_SK_RISK_IDENTIFY_RESULT_DETAIL> details = this.GetOrderEntities(expression2, new BaseFilter(entity.ORG_ID), new string[] { "Nav_DetailMeasures", "Nav_DetailDeparts", "Nav_DetailPosts" }).ToList();
                     var details = GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(i => resultIds.Contains(i.RISK_IDENTIFY_RESULT_ID) && i.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_DetailMeasures", "Nav_DetailDeparts", "Nav_DetailPosts");
-                    var detailList = details.GroupBy(m => new { m.AREA_ID, m.MineType,m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID });
+                    var detailList = details.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME,  m.RISK_DESCRIPTION, m.TYPE_ID });
                     if (detailList.Any())
                     {
                         foreach (var de in detailList)
                         {
-                            var temp = details.FirstOrDefault(m =>m.PRODUCTION_UNIT_ID == de.Key.PRODUCTION_UNIT_ID && m.AREA_ID == de.Key.AREA_ID && m.MineType == de.Key.MineType && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_NAME_ID == de.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID);
+                            var temp = details.FirstOrDefault(m =>m.PRODUCTION_UNIT_ID == de.Key.PRODUCTION_UNIT_ID && m.AREA_ID == de.Key.AREA_ID && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID);
                             T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL ideDetail = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL();
                             ideDetail.ORG_ID = entity.ORG_ID;
                             ideDetail.IDENTIFY_RESULT_SUMMARY_ID = sum.ID;
-                            ideDetail.MineType = de.Key.MineType;
+                            //ideDetail.MineType = de.Key.MineType;
                             ideDetail.PRODUCTION_UNIT_ID = de.Key.PRODUCTION_UNIT_ID;
                             ideDetail.AREA_ID = de.Key.AREA_ID;
                             ideDetail.RISK_NAME = de.Key.RISK_NAME;
-                            ideDetail.RISK_NAME_ID = de.Key.RISK_NAME_ID;
+                            //ideDetail.RISK_NAME_ID = de.Key.RISK_NAME_ID;
                             ideDetail.RISK_DESCRIPTION = de.Key.RISK_DESCRIPTION;
                             ideDetail.TYPE_ID = de.Key.TYPE_ID;
                             ideDetail.MEASURE = temp?.MEASURE;
@@ -12914,7 +12912,7 @@ namespace APT.BaseData.Services.DomainServices
                     }
                     var param = "部门级";
                     var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE;
-                    if (dminetype == 3 || (dminetype == 0 && sum.ISCOMPANY == SKIsStoreEnum.Yes))
+                    if (dminetype == 5 || (dminetype == 10 && sum.ISCOMPANY == SKIsStoreEnum.Yes))
                     {
                         param = "公司级";
                     }
@@ -13024,7 +13022,7 @@ namespace APT.BaseData.Services.DomainServices
                     }
                     else
                     {
-                        if (currentDepart.DEPARTMENT_TYPE == 0)
+                        if (currentDepart.DEPARTMENT_TYPE == 10)
                         {
                             departIds.Add(currentDepart.ID);
                             var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
@@ -13032,7 +13030,7 @@ namespace APT.BaseData.Services.DomainServices
                             var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
                             departIds.AddRange(classIds);
                         }
-                        else if (currentDepart.DEPARTMENT_TYPE == 1)
+                        else if (currentDepart.DEPARTMENT_TYPE == 15)
                         {
                             //departIds.Add(currentDepart.ID);
                             var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID;
@@ -13045,7 +13043,7 @@ namespace APT.BaseData.Services.DomainServices
                                 departIds.AddRange(classIds);
                             }
                         }
-                        else if (currentDepart.DEPARTMENT_TYPE == 2)
+                        else if (currentDepart.DEPARTMENT_TYPE == 20)
                         {
                             //var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
                             //departIds.Add((Guid)parentId);
@@ -13063,7 +13061,7 @@ namespace APT.BaseData.Services.DomainServices
                                 }
                             }
                         }
-                        else if (currentDepart.DEPARTMENT_TYPE == 3)
+                        else if (currentDepart.DEPARTMENT_TYPE == 5)
                         {
                             departIds.Add(currentDepart.ID);
                         }
@@ -13103,15 +13101,13 @@ namespace APT.BaseData.Services.DomainServices
                             {
                                 if (de != null)
                                 {
-                                    var departTemp = librarys.FirstOrDefault(t =>t.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && t.MineType == de.MineType && t.AREA_ID == de.AREA_ID && t.RISK_NAME == de.RISK_NAME && t.RISK_NAME_ID == de.RISK_NAME_ID && t.RISK_DESCRIPTION == de.RISK_DESCRIPTION && t.TYPE_ID == de.TYPE_ID);
+                                    var departTemp = librarys.FirstOrDefault(t =>t.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && t.AREA_ID == de.AREA_ID && t.RISK_NAME == de.RISK_NAME && t.RISK_DESCRIPTION == de.RISK_DESCRIPTION && t.TYPE_ID == de.TYPE_ID);
                                     T_SK_RISK_EVALUATION_DETAIL detail = new T_SK_RISK_EVALUATION_DETAIL();
                                     detail.ORG_ID = entity.ORG_ID;
-                                    detail.RISK_EVALUATION_ID = result.ID;
-                                    detail.MineType = de.MineType;
+                                    detail.RISK_EVALUATION_ID = result.ID;
                                     detail.PRODUCTION_UNIT_ID = de.PRODUCTION_UNIT_ID;
                                     detail.AREA_ID = de.AREA_ID;
                                     detail.RISK_NAME = de.RISK_NAME;
-                                    detail.RISK_NAME_ID = de.RISK_NAME_ID;
                                     detail.RISK_DESCRIPTION = de.RISK_DESCRIPTION;
                                     detail.TYPE_ID = de.TYPE_ID;
                                     detail.EVALUATE_L = departTemp == null ? 0 : departTemp.EVALUATE_L;
@@ -13281,7 +13277,7 @@ namespace APT.BaseData.Services.DomainServices
                 var currentDepart = departs.FirstOrDefault(t => t.ID == entity.APPLY_DEPARTMENT_ID);
                 if (currentDepart != null)
                 {
-                    if (currentDepart.DEPARTMENT_TYPE == 0)
+                    if (currentDepart.DEPARTMENT_TYPE == 10)
                     {
                         departIds.Add(currentDepart.ID);
                         var shopIds = departs.Where(t => t.PARENT_ID == currentDepart.ID).Select(t => t.ID).ToList();
@@ -13289,7 +13285,7 @@ namespace APT.BaseData.Services.DomainServices
                         var classIds = departs.Where(t => t.PARENT_ID != null && shopIds.Contains(t.PARENT_ID.Value)).Select(t => t.ID).ToList();
                         departIds.AddRange(classIds);
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 1)
+                    else if (currentDepart.DEPARTMENT_TYPE == 15)
                     {
                         //departIds.Add(currentDepart.ID);
                         var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID).PARENT_ID;
@@ -13304,7 +13300,7 @@ namespace APT.BaseData.Services.DomainServices
                         //DepartmentService.GetDepartmentIds(entity.ORG_ID.Value, new List<Guid>() { currentDepart.ID }, ref departIds);
                         //departIds.Add(currentDepart.ID);
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 2)
+                    else if (currentDepart.DEPARTMENT_TYPE == 20)
                     {
                         var parentId = departs.FirstOrDefault(t => t.ID == currentDepart.ID)?.PARENT_ID;
                         if (parentId != null)
@@ -13320,7 +13316,7 @@ namespace APT.BaseData.Services.DomainServices
                             }
                         }
                     }
-                    else if (currentDepart.DEPARTMENT_TYPE == 3)
+                    else if (currentDepart.DEPARTMENT_TYPE == 5)
                     {
                         departIds.Add(currentDepart.ID);
                         user = users.FirstOrDefault(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安环部安全员"));
@@ -13329,7 +13325,7 @@ namespace APT.BaseData.Services.DomainServices
                             userId = user.ID;
                         }
                     }
-                    var departId = departs.FirstOrDefault(t => departIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 0);
+                    var departId = departs.FirstOrDefault(t => departIds.Contains(t.ID) && t.DEPARTMENT_TYPE == 10);
                     if (departId != null)
                     {
                         user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId.ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
@@ -13376,20 +13372,18 @@ namespace APT.BaseData.Services.DomainServices
                     result.ISCOMPANY = entity.ISCOMPANY;
                     var resultIds = results.Select(t => t.ID).ToList();
                     var details = GetEntities<T_SK_RISK_EVALUATION_DETAIL>(i => resultIds.Contains(i.RISK_EVALUATION_ID), new BaseFilter(entity.ORG_ID), "Nav_DetailMeasures", "Nav_DetailDeparts");
-                    var detailList = details.GroupBy(m => new { m.AREA_ID,m.PRODUCTION_UNIT_ID, m.MineType, m.RISK_NAME, m.RISK_NAME_ID, m.RISK_DESCRIPTION, m.TYPE_ID });
+                    var detailList = details.GroupBy(m => new { m.AREA_ID,m.PRODUCTION_UNIT_ID,  m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID });
                     if (detailList.Any())
                     {
                         foreach (var de in detailList)
                         {
-                            var temp = details.FirstOrDefault(m =>m.PRODUCTION_UNIT_ID == de.Key.PRODUCTION_UNIT_ID && m.AREA_ID == de.Key.AREA_ID && m.MineType == de.Key.MineType && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_NAME_ID == de.Key.RISK_NAME_ID && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID);
+                            var temp = details.FirstOrDefault(m =>m.PRODUCTION_UNIT_ID == de.Key.PRODUCTION_UNIT_ID && m.AREA_ID == de.Key.AREA_ID && m.RISK_NAME == de.Key.RISK_NAME && m.RISK_DESCRIPTION == de.Key.RISK_DESCRIPTION && m.TYPE_ID == de.Key.TYPE_ID);
                             T_SK_RISK_EVALUATION_SUMMARY_DETAIL detail = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL();
                             detail.ORG_ID = entity.ORG_ID;
                             detail.RISK_EVALUATION_SUMMARY_ID = result.ID;
                             detail.PRODUCTION_UNIT_ID = de.Key.PRODUCTION_UNIT_ID;
-                            detail.MineType = de == null ? SKProductionUnit.Mine : de.Key.MineType;
                             detail.AREA_ID = de.Key.AREA_ID;
                             detail.RISK_NAME = de.Key.RISK_NAME;
-                            detail.RISK_NAME_ID = de.Key.RISK_NAME_ID;
                             detail.RISK_DESCRIPTION = de.Key.RISK_DESCRIPTION;
                             detail.TYPE_ID = de.Key.TYPE_ID;
                             detail.EVALUATE_L = temp.EVALUATE_L;
@@ -13445,10 +13439,10 @@ namespace APT.BaseData.Services.DomainServices
                                 }
                             }
                         }
-                    }
+                    }
                     var param = "部门级";
-                    var dminetype = details.FirstOrDefault().MineType;
-                    if (dminetype == SKProductionUnit.All)
+                    var dminetype = departs.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID).DEPARTMENT_TYPE;
+                    if (dminetype == 5 || (dminetype == 10 && result.ISCOMPANY == SKIsStoreEnum.Yes))
                     {
                         param = "公司级";
                     }
@@ -13470,8 +13464,10 @@ namespace APT.BaseData.Services.DomainServices
                             result.STATUS = PFStandardStatus.Archived;
                             if (user != null && resultDetails != null && resultDetails.Any())
                             {
-                                var mineType = departs.FirstOrDefault(t => t.ID == result.APPLY_DEPARTMENT_ID)?.MineType;
-                                var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.MineType == (SKProductionUnit)mineType, new BaseFilter(entity.ORG_ID));
+                                var mineType = departs.FirstOrDefault(t => t.ID == result.APPLY_DEPARTMENT_ID)?.MineType;
+                                var dmineType = ((FMProductionUnit)mineType).GetDescription();
+                                var productionId = this.GetEntity<T_FM_USER_PRODUCTION_UNIT_SET>(t => t.NAME == dmineType)?.ID;
+                                var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID));
                                 var libraryIds = librarys.Select(t => t.ID).ToList();
                                 var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
                                 var libraryDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
@@ -13493,12 +13489,12 @@ namespace APT.BaseData.Services.DomainServices
                                     detail.ORG_ID = item.ORG_ID;
                                     detail.DOUBLE_PREVENT_MECHANISM_ID = dou.ID;
                                     detail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
-                                    detail.MineType = item.MineType;
+                                    //detail.MineType = item.MineType;
                                     detail.AREA_ID = item.AREA_ID;
                                     detail.TYPE_ID = item.TYPE_ID;
                                     detail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
                                     detail.RISK_NAME = item.RISK_NAME;
-                                    detail.RISK_NAME_ID = item.RISK_NAME_ID;
+                                    //detail.RISK_NAME_ID = item.RISK_NAME_ID;
                                     detail.EVALUATE_L = item.EVALUATE_L;
                                     detail.EVALUATE_E = item.EVALUATE_E;
                                     detail.EVALUATE_C = item.EVALUATE_C;
@@ -13509,7 +13505,7 @@ namespace APT.BaseData.Services.DomainServices
                                     detail.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
                                     detail.EMERGENCY = item.EMERGENCY;
                                     douDetails.Add(detail);
-                                    var libraryFirst = librarys.FirstOrDefault(t => t.MineType == item.MineType && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_NAME_ID == item.RISK_NAME_ID && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
+                                    var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
                                     if (libraryFirst != null)
                                     {
                                         var ldeparts = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();
@@ -13644,7 +13640,7 @@ namespace APT.BaseData.Services.DomainServices
                             BantchSaveEntityNoCommit(contentHiddenss);
                         if (contentDepartPosts != null && contentDepartPosts.Count > 0)
                             BantchSaveEntityNoCommit(contentDepartPosts);
-                    }, null, null, null, null, null, "SK039_SHOWPRINT", null, "安全风险评估汇总表审批(" + dminetype.GetDescription() + ")");
+                    }, null, null, null, null, null, "SK039_SHOWPRINT", null, "安全风险评估汇总表审批(" + param + ")");
                     return true;
                     //notice = NotificationTaskService.InsertUserNoticeTaskModel("安全风险评估汇总表(" + param + ")", result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK041");
 
@@ -13738,8 +13734,10 @@ namespace APT.BaseData.Services.DomainServices
                 if (entity.APPLY_USER_ID != null && entity.Nav_Details != null && entity.Nav_Details.Any())
                 {
                     var user = this.GetEntity<T_FM_USER>(t => t.ID == entity.APPLY_USER_ID);
-                    var mineType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID)?.MineType;
-                    var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.MineType == (SKProductionUnit)mineType, new BaseFilter(entity.ORG_ID));
+                    var mineType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID)?.MineType;
+                    var dmineType = ((FMProductionUnit)mineType).GetDescription();
+                    var productionId = this.GetEntity<T_FM_USER_PRODUCTION_UNIT_SET>(t => t.NAME == dmineType)?.ID;
+                    var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID));
                     var libraryIds = librarys.Select(t => t.ID).ToList();
                     var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
                     var libraryDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
@@ -13761,12 +13759,12 @@ namespace APT.BaseData.Services.DomainServices
                         detail.ORG_ID = item.ORG_ID;
                         detail.DOUBLE_PREVENT_MECHANISM_ID = dou.ID;
                         detail.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
-                        detail.MineType = item.MineType;
+                        //detail.MineType = item.MineType;
                         detail.AREA_ID = item.AREA_ID;
                         detail.TYPE_ID = item.TYPE_ID;
                         detail.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
                         detail.RISK_NAME = item.RISK_NAME;
-                        detail.RISK_NAME_ID = item.RISK_NAME_ID;
+                        //detail.RISK_NAME_ID = item.RISK_NAME_ID;
                         detail.EVALUATE_L = item.EVALUATE_L;
                         detail.EVALUATE_E = item.EVALUATE_E;
                         detail.EVALUATE_C = item.EVALUATE_C;
@@ -13774,7 +13772,7 @@ namespace APT.BaseData.Services.DomainServices
                         detail.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
                         detail.EMERGENCY = item.EMERGENCY;
                         details.Add(detail);
-                        var libraryFirst = librarys.FirstOrDefault(t => t.MineType == item.MineType && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_NAME_ID == item.RISK_NAME_ID && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
+                        var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
                         if (libraryFirst != null)
                         {
                             var departs = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();