From 049b14ae977f7052e3552851b541612e6cacc107 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 27 Aug 2024 15:18:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Inspection/FrontAuditConfigService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index ead87e94b..194d3e036 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(); From fa2a0e7482400dfabe501dc6468422a35591fd97 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 27 Aug 2024 15:36:19 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Inspection/FrontAuditConfigService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index 194d3e036..d587d2ab5 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs @@ -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() ); } } From 7a496e114b8aaa1fc549503854db9613dd176bf7 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 27 Aug 2024 16:09:55 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Inspection/FrontAuditConfigService.cs | 12 ++++++++++++ IRaCIS.Core.Domain.Share/Management/SystemNotice.cs | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index d587d2ab5..0daca93b3 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs @@ -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..d5a13af7c 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 = 4, } From e87185a9068b162a36ec26e7ea6b36a656194566 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 27 Aug 2024 16:17:11 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Domain.Share/Management/SystemNotice.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs b/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs index d5a13af7c..2ca23ea9f 100644 --- a/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs +++ b/IRaCIS.Core.Domain.Share/Management/SystemNotice.cs @@ -83,7 +83,7 @@ namespace IRaCIS.Core.Domain.Share.Management ///LineSpilt /// [DisplayAttribute(Name = "LineSpilt")] - LineSpilt = 4, + LineSpilt = 5, } From 3b6da279f8ae5d59a37e54d41b7e8ed68c37f03f Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 27 Aug 2024 16:20:15 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Inspection/FrontAuditConfigService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index 0daca93b3..aff06bd50 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs @@ -867,7 +867,7 @@ namespace IRaCIS.Core.Application.Service { value = _userInfo.IsEn_Us ? b.Value : b.ValueCN }).Select(x => x.value).ToListAsync(); - jsonDataDic[item.Key] = string.Join(",", codeList); + jsonDataDic[item.Key] = string.Join("|", codeList); } //通过字典项的code 翻译 枚举或者 bool From 2caa7933ee65141d4a63c53e2f2d234d1392b92d Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 27 Aug 2024 16:45:47 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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;