diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index ead87e94b..aff06bd50 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs @@ -525,7 +525,7 @@ namespace IRaCIS.Core.Application.Service Identification = string.Empty, ForeignKeyValue = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyValue ?? lst.Max(x => x.ForeignKeyValue), ForeignKeyText = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyText ?? lst.Max(x => x.ForeignKeyText), - ForeignKeyEnText = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyTable ?? lst.Max(x => x.ForeignKeyEnText), + ForeignKeyEnText = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyEnText ?? lst.Max(x => x.ForeignKeyEnText), ForeignKeyTable = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyTable ?? lst.Max(x => x.ForeignKeyTable), }).ToList(); @@ -836,8 +836,8 @@ namespace IRaCIS.Core.Application.Service parent = b }).SelectMany(a => a.parent, (m, n) => new { - value = n.ValueCN - }).Select(x => x.value).ToListAsync() + value = _userInfo.IsEn_Us ? n.Value : n.ValueCN + }).Select(x => x.value).ToListAsync() ); } } @@ -858,6 +858,18 @@ namespace IRaCIS.Core.Application.Service value = _userInfo.IsEn_Us ? b.Value : b.ValueCN }).Select(x => x.value).FirstOrDefaultAsync(); } + // + else if (item.Type.ToLower() == FrontAudit.LineSpilt.GetDescription().ToLower()) + { + var data = value.ToString().Split('|').ToList(); + + var codeList= await _dictionaryRepository.Where(x => x.Code == item.Code).Join(_dictionaryRepository.Where(x => data.Contains(x.Code)), a => a.Id, b => b.ParentId, (a, b) => new + { + value = _userInfo.IsEn_Us ? b.Value : b.ValueCN + }).Select(x => x.value).ToListAsync(); + jsonDataDic[item.Key] = string.Join("|", codeList); + + } //通过字典项的code 翻译 枚举或者 bool else { diff --git a/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs b/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs index 1e8672066..2ca23ea9f 100644 --- a/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs +++ b/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs @@ -77,6 +77,13 @@ namespace IRaCIS.Core.Domain.Share.Management /// [DisplayAttribute(Name = "DictionaryType")] DictionaryType = 4, + + + /// + ///LineSpilt + /// + [DisplayAttribute(Name = "LineSpilt")] + LineSpilt = 5, } diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index be961736e..d5f83d4f4 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -146,10 +146,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common .Where(t => t.TrialId == entity.Id && t.IsConfirm).OrderBy(t => t.ShowOrder).Select(t => t.CriterionName).ToList(); //临床数据配置 - var clinicalDataSetNameList = await _dbContext.ClinicalDataTrialSet.Where(t => t.TrialId == entity.Id && t.IsConfirm).Select(t => t.ClinicalDataSetName).ToListAsync(); + var clinicalDataSetNameList = await _dbContext.ClinicalDataTrialSet.Where(t => t.TrialId == entity.Id && t.IsConfirm).Select(t =>_userInfo.IsEn_Us?t.ClinicalDataSetEnName: t.ClinicalDataSetName).ToListAsync(); var memoryClinicalDataSetNameList = entitys.Where(x => x.Entity.GetType() == typeof(ClinicalDataTrialSet)).Select(t => t.Entity as ClinicalDataTrialSet) - .Where(t => t.TrialId == entity.Id && t.IsConfirm).Select(t => t.ClinicalDataSetName).ToList(); + .Where(t => t.TrialId == entity.Id && t.IsConfirm).Select(t => _userInfo.IsEn_Us ? t.ClinicalDataSetEnName : t.ClinicalDataSetName).ToList(); Guid id = entity.Id;