Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -2385,6 +2385,11 @@
             名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.ClinicalDataSetEnName">
+            <summary>
+            英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.ClinicalDataLevel">
             <summary>
             临床级别
@@ -2435,6 +2440,11 @@
             名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.ClinicalDataSetEnName">
+            <summary>
+            英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.ClinicalDataLevel">
             <summary>
             临床级别
@@ -2525,11 +2535,21 @@
             名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataQuery.ClinicalDataSetEnName">
+            <summary>
+            英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSystemIndto.ClinicalDataSetName">
             <summary>
             名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSystemIndto.ClinicalDataSetEnName">
+            <summary>
+            英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSystemIndto.ClinicalDataLevel">
             <summary>
             临床级别
@@ -2550,6 +2570,11 @@
             名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataTrialIndto.ClinicalDataSetEnName">
+            <summary>
+            英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataTrialIndto.ClinicalDataLevel">
             <summary>
             临床级别
@@ -2940,6 +2965,11 @@
             名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataOutDto.ClinicalDataSetEnName">
+            <summary>
+            英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataOutDto.ClinicalUploadType">
             <summary>
             上传方式
@@ -3065,6 +3095,11 @@
             项目配置临床类型Name
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.ClinicalDataSetEnName">
+            <summary>
+            英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.ClinicalDataTrialSetId">
             <summary>
             下拉ID
@@ -3180,6 +3215,11 @@
             名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectOutDto.ClinicalDataSetEnName">
+            <summary>
+            英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectOutDto.ClinicalDataLevel">
             <summary>
             临床级别
@@ -4520,6 +4560,11 @@
             问题名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingMedicineQuestion.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingMedicineQuestion.TypeValue">
             <summary>
             类型值
@@ -4585,6 +4630,11 @@
             肿瘤学原因
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.JudgeQuestionAnswerInfo.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.JudgeQuestionAnswerInfo.ShowOrder">
             <summary>
             排序
@@ -7756,11 +7806,21 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery">
             <summary>ReadingMedicineSystemQuestionQuery  列表查询参数模型</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery.ReadingCategory">
             <summary>
             任务类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionOutDto.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionOutDto.TypeValue">
             <summary>
             类型值
@@ -7809,6 +7869,11 @@
             问题名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionAddOrEdit.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionAddOrEdit.IsRequired">
             <summary>
             是否是必须
@@ -7859,6 +7924,11 @@
             问题名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.GetMedicineQuestionPreviewOutDto.TypeValue">
             <summary>
             类型值
@@ -7902,6 +7972,11 @@
             项目Id
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionQuery.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionQuery.ReadingCategory">
             <summary>
             任务类型
@@ -7910,6 +7985,11 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit">
             <summary> ReadingMedicineTrialQuestionAddOrEdit  列表查询参数模型</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.ReadingMedicineTrialQuestionAddOrEdit.ReadingCategory">
             <summary>
             任务类型
@@ -8283,36 +8363,76 @@
             
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.QCQuestionView.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Contracts.QCQuestionConfigureView">
             <summary> QCQuestionConfigureView  列表视图模型 </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.QCQuestionConfigureView.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Contracts.QCQuestionQuery">
             <summary>QCQuestionQuery  列表查询参数模型</summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.QCQuestionQuery.QuestionName">
             <summary> QuestionName</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.QCQuestionQuery.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.QCQuestionQuery.Type">
             <summary> TypeValue</summary>
         </member>
         <member name="T:IRaCIS.Core.Application.Contracts.QCQuestionAddOrEdit">
             <summary> QCQuestionAddOrEdit  列表查询参数模型</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.QCQuestionAddOrEdit.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Contracts.TrialQCQuestionConfigureView">
             <summary> TrialQCQuestionConfigureView  列表视图模型 </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionConfigureView.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionSelect.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery">
             <summary>TrialQCQuestionQuery  列表查询参数模型</summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery.QuestionName">
             <summary> QuestionName</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionQuery.Type">
             <summary> TypeValue</summary>
         </member>
         <member name="T:IRaCIS.Core.Application.Contracts.TrialQCQuestionAddOrEdit">
             <summary> TrialQCQuestionAddOrEdit  列表查询参数模型</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialQCQuestionConfigureBatchAdd.QuestionEnName">
+            <summary>
+            问题英文名称
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Contracts.NoneDicomStudyService">
             <summary>
             NoneDicomStudyService

IRaCIS.Core.Application/Resources/en-US.json

@@ -3,6 +3,11 @@
   "RequiredAttribute": "{0} is required",
 
   //-------------------------------------------------------------------------------------Reading-----------------------------------------------------------------
+  //ClinicalDataSetService
+  "ClinicalDataSet_DupTypeFail": "There are duplicate clinical data of the same type. The operation failed.",
+  //ReadingClinicalDataService
+  "ReadingClinicalData_DupTypeFail": "There are duplicate clinical data of the same type. The operation failed.",
+  "ReadingClinicalData_Unchecked": "The current clinical data status is not verified and signing is not allowed!",
   //ReadingGlobalTaskService
   "ReadingGlobal_NotGlobal": "System call error. The current read is not a global review read.",
   //ReadingImageTaskService

IRaCIS.Core.Application/Resources/zh-CN.json

@@ -3,6 +3,11 @@
   "RequiredAttribute": "{0} 字段是必须的",
 
   // ------------------------------------------------------------Reading--------------------------------------------------------------------
+  //ClinicalDataSetService
+  "ClinicalDataSet_DupTypeFail": "存在同类型的临床数据,操作失败",
+  //ReadingClinicalDataService
+  "ReadingClinicalData_DupTypeFail": "存在同类型的临床数据,操作失败",
+  "ReadingClinicalData_Unchecked": "当前临床数据状态不是已核查状态，不允许签名！",
   //ReadingGlobalTaskService
   "ReadingGlobal_NotGlobal": "系统调用错误，当前任务不是全局阅片任务。",
   //ReadingImageTaskService

IRaCIS.Core.Application/Service/QC/DTO/QCQuestionConfigureViewModel.cs

@@ -20,6 +20,11 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public Guid Id { get; set; }
         public string QuestionName { get; set; } = String.Empty;
+
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
 		public bool IsRequired { get; set; }
         public bool IsEnable { get; set; }
         public string Type { get; set; } = String.Empty;
@@ -43,6 +48,11 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public Guid Id { get; set; }
         public string QuestionName { get; set; } = String.Empty;
+
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
 		public bool IsRequired { get; set; }
         public bool IsEnable { get; set; }
         public string Type { get; set; } = String.Empty;
@@ -67,6 +77,11 @@ namespace IRaCIS.Core.Application.Contracts
         ///<summary> QuestionName</summary>
         public string QuestionName { get; set; } = String.Empty;
 
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
+
 		///<summary> TypeValue</summary>
 		public string Type { get; set; } = String.Empty;
 
@@ -84,6 +99,11 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public Guid? Id { get; set; }
         public string QuestionName { get; set; } = String.Empty;
+
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
 		public bool IsRequired { get; set; }
         public bool IsEnable { get; set; }
         public string Type { get; set; } = String.Empty;

IRaCIS.Core.Application/Service/QC/DTO/TrialQCQuestionConfigureViewModel.cs

@@ -13,6 +13,11 @@ namespace IRaCIS.Core.Application.Contracts
         public Guid Id { get; set; }
         public Guid TrialId { get; set; }
         public string QuestionName { get; set; } = string.Empty;
+
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
 		public bool IsRequired { get; set; }
         public bool IsEnable { get; set; }
         public string Type { get; set; } = string.Empty;
@@ -54,6 +59,11 @@ namespace IRaCIS.Core.Application.Contracts
         public Guid Id { get; set; }
         public string QuestionName { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
+
 		public Guid? ParentId { get; set; }
         public int ShowOrder { get; set; }
 
@@ -68,6 +78,11 @@ namespace IRaCIS.Core.Application.Contracts
         ///<summary> QuestionName</summary>
         public string QuestionName { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
+
 		///<summary> TypeValue</summary>
 		public string Type { get; set; }=String.Empty;
 
@@ -90,6 +105,11 @@ namespace IRaCIS.Core.Application.Contracts
       
         public Guid? Id { get; set; }
         public string QuestionName { get; set; } = string.Empty;
+
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
 		public bool IsRequired { get; set; }
         public bool IsEnable { get; set; }
         public string Type { get; set; } = string.Empty;

IRaCIS.Core.Application/Service/QC/QCQuestionService.cs

@@ -4,6 +4,8 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
+using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Infra.EFCore.Common;
 using IRaCIS.Core.Infrastructure;
 using Microsoft.AspNetCore.Mvc;
 
@@ -46,7 +48,8 @@ namespace IRaCIS.Core.Application.Contracts
                     ShowOrder = x.ShowOrder,
                     Id = x.Id,
                     ParentId = x.ParentId,
-                    QuestionName = x.QuestionName,
+                    QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
+
                     TypeValue = x.TypeValue,
 
                 }).ToListAsync();
@@ -93,7 +96,7 @@ namespace IRaCIS.Core.Application.Contracts
 
             var QCQuestionQueryable = _qcQuestionRepository
                 .WhereIf(queryQCQuestionConfigure.IsEnable != null,x=>x.IsEnable== queryQCQuestionConfigure.IsEnable)
-                .WhereIf(!string.IsNullOrWhiteSpace(queryQCQuestionConfigure.QuestionName), t => t.QuestionName.Contains(queryQCQuestionConfigure.QuestionName))
+                .WhereIf(!string.IsNullOrWhiteSpace(queryQCQuestionConfigure.QuestionName), t => t.QuestionName.Contains(queryQCQuestionConfigure.QuestionName) || t.QuestionEnName.Contains(queryQCQuestionConfigure.QuestionName))
                 .WhereIf(!string.IsNullOrWhiteSpace(queryQCQuestionConfigure.Type), t => t.Type.Contains(queryQCQuestionConfigure.Type))
                 .WhereIf(queryQCQuestionConfigure.IsDefeaultViewParent==true,t=>t.ParentId==null)
                 .OrderBy(t=>t.ShowOrder)
@@ -145,11 +148,20 @@ namespace IRaCIS.Core.Application.Contracts
             var question = new List<QCQuestionView>();
             if (inDto.TrialId!= null)
             {
-                question = await _trialQCQuestionRepository.Where(x => x.TrialId == inDto.TrialId&&x.IsEnable).OrderBy(x => x.ShowOrder).ProjectTo<QCQuestionView>(_mapper.ConfigurationProvider).ToListAsync();
+                question = await _trialQCQuestionRepository.Where(x => x.TrialId == inDto.TrialId&&x.IsEnable).OrderBy(x => x.ShowOrder).ProjectTo<QCQuestionView>
+					(_mapper.ConfigurationProvider, new
+					{
+						isEn_Us = _userInfo.IsEn_Us
+
+					}).ToListAsync();
             }
             else
             {
-                question=await _qcQuestionRepository.Where(x=>x.IsEnable).OrderBy(x => x.ShowOrder).ProjectTo<QCQuestionView>(_mapper.ConfigurationProvider).ToListAsync();
+                question=await _qcQuestionRepository.Where(x=>x.IsEnable).OrderBy(x => x.ShowOrder).ProjectTo<QCQuestionView>(_mapper.ConfigurationProvider, new
+				{
+					isEn_Us = _userInfo.IsEn_Us
+
+				}).ToListAsync();
             }
 
 

IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs

@@ -39,7 +39,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
             var trialQCQuestionQueryable = _trialQcQuestionRepository.Where(t => t.TrialId == queryTrialQCQuestionConfigure.TrialId)
-               .WhereIf(!string.IsNullOrWhiteSpace(queryTrialQCQuestionConfigure.QuestionName), t => t.QuestionName.Contains(queryTrialQCQuestionConfigure.QuestionName))
+               .WhereIf(!string.IsNullOrWhiteSpace(queryTrialQCQuestionConfigure.QuestionName), t => t.QuestionName.Contains(queryTrialQCQuestionConfigure.QuestionName)|| t.QuestionEnName.Contains(queryTrialQCQuestionConfigure.QuestionName))
                .WhereIf(!string.IsNullOrWhiteSpace(queryTrialQCQuestionConfigure.Type), t => t.Type.Contains(queryTrialQCQuestionConfigure.Type))
                 .WhereIf(queryTrialQCQuestionConfigure.IsEnable != null, t => t.IsEnable == queryTrialQCQuestionConfigure.IsEnable)
                 .WhereIf(queryTrialQCQuestionConfigure.IsRequired != null, t => t.IsRequired == queryTrialQCQuestionConfigure.IsRequired)
@@ -81,7 +81,11 @@ namespace IRaCIS.Core.Application.Contracts
             var initList = await _trialQcQuestionRepository.Where(t => t.TrialId == trialQCQuestionFilterSelect.TrialId)
                  .WhereIf(trialQCQuestionFilterSelect.TypeArray.Count() > 0, t => trialQCQuestionFilterSelect.TypeArray.Contains(t.Type))
                 .WhereIf(trialQCQuestionFilterSelect.Id != null, t => t.Id != trialQCQuestionFilterSelect.Id && t.ParentId != trialQCQuestionFilterSelect.Id)
-                .OrderBy(t => t.ShowOrder).ProjectTo<TrialQCQuestionSelect>(_mapper.ConfigurationProvider).ToListAsync();
+                .OrderBy(t => t.ShowOrder).ProjectTo<TrialQCQuestionSelect>(_mapper.ConfigurationProvider, new
+				{
+					isEn_Us = _userInfo.IsEn_Us
+
+				}).ToListAsync();
 
             //父亲的序号肯定要比自己小
             if (trialQCQuestionFilterSelect.Id != null)

IRaCIS.Core.Application/Service/QC/_MapConfig.cs

@@ -252,6 +252,7 @@ namespace IRaCIS.Core.Application.Service
 
 
           
+
 			string token = string.Empty;
             //一致性核查
             CreateMap<CheckDBModel, CheckViewModel>();
@@ -302,10 +303,13 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<TrialQCQuestionConfigureBatchAdd, TrialQCQuestion>();
 
-            CreateMap<TrialQCQuestion, TrialQCQuestionSelect>();
+            CreateMap<TrialQCQuestion, TrialQCQuestionSelect>()
+					 .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
 
-            CreateMap<TrialQCQuestion, QCQuestionView>();
+            CreateMap<TrialQCQuestion, QCQuestionView>()
-            CreateMap<QCQuestion, QCQuestionView>();
+					 .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName)); 
+            CreateMap<QCQuestion, QCQuestionView>()
+					 .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName)); 
 
 
             CreateMap<QCQuestion, QCQuestionConfigureView>()

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs

@@ -53,11 +53,12 @@ namespace IRaCIS.Application.Services
 
             var existsQuery = _clinicalDataSystemSetRepository
               .WhereIf(indto.Id != null, x => x.Id != indto.Id)
-              .Where(x => x.ClinicalDataSetName == indto.ClinicalDataSetName);
+              .Where(x => x.ClinicalDataSetName == indto.ClinicalDataSetName||x.ClinicalDataSetEnName==indto.ClinicalDataSetEnName);
 
             if (await existsQuery.AnyAsync())
             {
-                return ResponseOutput.NotOk("存在同类型的临床数据,操作失败");
+                //---存在同类型的临床数据,操作失败
+                return ResponseOutput.NotOk(_localizer["ClinicalDataSet_DupTypeFail"]);
             }
 
             indto.CriterionEnumListStr= $"|{String.Join('|', indto.CriterionEnumList)}|";
@@ -124,11 +125,12 @@ namespace IRaCIS.Application.Services
         {
             var existsQuery = _clinicalDataTrialSetRepository
              .WhereIf(indto.Id != null, x => x.Id != indto.Id)
-             .Where(x => x.ClinicalDataSetName == indto.ClinicalDataSetName && x.TrialId == indto.TrialId);
+             .Where(x => (x.ClinicalDataSetName == indto.ClinicalDataSetName||x.ClinicalDataSetEnName==indto.ClinicalDataSetEnName) && x.TrialId == indto.TrialId);
 
             if (await existsQuery.AnyAsync())
             {
-                return ResponseOutput.NotOk("存在同类型的临床数据,操作失败");
+                //---存在同类型的临床数据,操作失败
+                return ResponseOutput.NotOk(_localizer["ClinicalDataSet_DupTypeFail"]);
             }
 
             //indto.CriterionEnumListStr = $"|{String.Join('|', indto.CriterionEnumList)}|";
@@ -272,6 +274,7 @@ namespace IRaCIS.Application.Services
                     ClinicalDataSetName = x.ClinicalDataSetName,
                     ClinicalDataLevel = x.ClinicalDataLevel,
                     ClinicalUploadType = x.ClinicalUploadType,
+                    ClinicalDataSetEnName=x.ClinicalDataSetEnName,
                     UploadRole = x.UploadRole,
                     FileName = x.FileName,
                     Path = x.Path,

IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs

@@ -83,7 +83,8 @@ namespace IRaCIS.Application.Services
 
             if (await existsQuery.AnyAsync())
             {
-                return ResponseOutput.NotOk("存在同类型的临床数据");
+                //---存在同类型的临床数据,操作失败
+                return ResponseOutput.NotOk(_localizer["ReadingClinicalData_DupTypeFail"]);
             }
             var clinicalDataTrialSet = (await _clinicalDataTrialSetRepository.Where(x => x.Id == indto.ClinicalDataTrialSetId).FirstOrDefaultAsync()).IfNullThrowException();
 
@@ -191,8 +192,9 @@ namespace IRaCIS.Application.Services
                 .Select(x => new GetCRCClinicalDataOutDto()
                 {
                     Id = x.Id,
-                    ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
+                    ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetName, _userInfo.IsEn_Us) ,
                     ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
+                    ClinicalDataSetEnName=x.ClinicalDataTrialSet.ClinicalDataSetEnName,
                     ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id,
                     FileName = x.ClinicalDataTrialSet.FileName,
                     UploadRole = x.ClinicalDataTrialSet.UploadRole,
@@ -280,7 +282,8 @@ namespace IRaCIS.Application.Services
 
             if (data.ReadingClinicalDataState != ReadingClinicalDataStatus.HaveChecked)
             {
-                throw new BusinessValidationFailedException("当前临床数据状态不是已核查状态，不允许签名！");
+                //---当前临床数据状态不是已核查状态，不允许签名！
+                throw new BusinessValidationFailedException(_localizer["ReadingClinicalData_Unchecked"]);
             }
             data.IsSign = true;
             data.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveSigned;
@@ -482,7 +485,8 @@ namespace IRaCIS.Application.Services
                 .Select(x => new GetTrialClinicalDataSelectOutDto()
                 {
                     ClinicalDataLevel = x.ClinicalDataLevel,
-                    ClinicalDataSetName = x.ClinicalDataSetName,
+                    ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us),
+                    ClinicalDataSetEnName=x.ClinicalDataSetEnName,
                     ClinicalUploadType = x.ClinicalUploadType,
                     FileName = x.FileName,
                     Path = x.Path,
@@ -625,7 +629,8 @@ namespace IRaCIS.Application.Services
                      ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
                      SubjectId = x.SubjectId,
                      ReadingId = x.ReadingId,
-                     ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
+                     ClinicalDataSetEnName=x.ClinicalDataTrialSet.ClinicalDataSetEnName,
+                     ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetEnName, _userInfo.IsEn_Us),
                      ClinicalDataTrialSetId = x.ClinicalDataTrialSetId,
                      IsSign = x.IsSign,
                      ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
@@ -694,7 +699,8 @@ namespace IRaCIS.Application.Services
                   ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
                   SubjectId = x.SubjectId,
                   ReadingId = x.ReadingId,
-                  ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
+                  ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetEnName, _userInfo.IsEn_Us),
+				  ClinicalDataSetEnName =x.ClinicalDataTrialSet.ClinicalDataSetEnName,
                   ClinicalDataTrialSetId = x.ClinicalDataTrialSetId,
                   IsSign = x.IsSign,
                   ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,

IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs

@@ -19,6 +19,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ClinicalDataSetName { get; set; }
 
+		/// <summary>
+		/// 英文名称
+		/// </summary>
+		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 临床级别
 		/// </summary>
@@ -83,6 +88,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ClinicalDataSetName { get; set; }
 
+		/// <summary>
+		/// 英文名称
+		/// </summary>
+		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 临床级别
 		/// </summary>
@@ -216,6 +226,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ClinicalDataSetName { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 英文名称
+		/// </summary>
+		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+
 	}
     public class GetTrialClinicalDataSystemIndto
     {
@@ -224,6 +239,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ClinicalDataSetName { get; set; } = String.Empty;
 
+		/// <summary>
+		/// 英文名称
+		/// </summary>
+		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 临床级别
 		/// </summary>
@@ -259,6 +279,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ClinicalDataSetName { get; set; } = String.Empty;
 
+		/// <summary>
+		/// 英文名称
+		/// </summary>
+		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 临床级别
 		/// </summary>

IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs

@@ -76,6 +76,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string ClinicalDataSetName { get; set; }
 
+		/// <summary>
+		/// 英文名称
+		/// </summary>
+		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+
 
 		/// <summary>
 		/// 上传方式
@@ -311,6 +316,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string ClinicalDataSetName { get; set; }
 
+		/// <summary>
+		/// 英文名称
+		/// </summary>
+		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 下拉ID
 		/// </summary>
@@ -472,6 +482,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string ClinicalDataSetName { get; set; }
 
+		/// <summary>
+		/// 英文名称
+		/// </summary>
+		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 临床级别
 		/// </summary>

IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs

@@ -540,6 +540,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string QuestionName { get; set; }
 
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 类型值
 		/// </summary>
@@ -658,6 +663,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string QuestionName { get; set; }
 
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
+
 		public string Answer { get; set; }
 
         /// <summary>

IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs

@@ -22,6 +22,12 @@ namespace IRaCIS.Core.Application.ViewModel
         public string Type { get; set; } = string.Empty;
         public string ParentTriggerValue { get; set; } = string.Empty;
         public string QuestionName { get; set; } = string.Empty;
+
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
+
 		public string TypeValue { get; set; } = string.Empty;
 
 
@@ -50,6 +56,11 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string QuestionName { get; set; }
 
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 类型值
 		/// </summary>
@@ -163,6 +174,11 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public string QuestionName { get; set; }
 
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 是否是必须
 		/// </summary>
@@ -248,7 +264,10 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public string QuestionName { get; set; }
 
-
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
 
 		/// <summary>
 		/// 类型值
@@ -309,6 +328,11 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string QuestionName { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
+
 		public string TypeValue { get; set; } = string.Empty;
 
         /// <summary>
@@ -329,6 +353,11 @@ namespace IRaCIS.Core.Application.ViewModel
         public string Type { get; set; }
         public string? ParentTriggerValue { get; set; } = string.Empty;
         public string QuestionName { get; set; }
+
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
 		public string TypeValue { get; set; }
         public Guid TrialId { get; set; }
 

IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs

@@ -357,10 +357,11 @@ namespace IRaCIS.Core.Application.Service
                                 {
                                     Id = data.Id,
                                     Type = data.Type,
-                                    ParentTriggerValue = data.ParentTriggerValue,
+                                    ParentTriggerValue = data.ParentTriggerValue   ,
+                                    QuestionEnName=data.QuestionEnName,
                                     IsEnable = data.IsEnable,
                                     IsConfirm = data.IsConfirm,
-                                    QuestionName = data.QuestionName,
+                                    QuestionName = data.QuestionName.LanguageName(data.QuestionEnName, _userInfo.IsEn_Us),
                                     IsRequired = data.IsRequired,
                                     ShowOrder = data.ShowOrder,
                                     ParentId = data.ParentId,

IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs

@@ -52,7 +52,7 @@ namespace IRaCIS.Core.Application.Service
 			var query = _readingMedicineSystemQuestionRepository.AsQueryable()
 				  .WhereIf(!inDto.TypeValue.IsNullOrEmpty(), x => x.TypeValue.Contains(inDto.TypeValue))
 				  .WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue))
-				  .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
+				  .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName) || x.QuestionEnName.Contains(inDto.QuestionName))
 				  .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
 				  .WhereIf(inDto.ReadingCategory != null, x => x.ReadingCategory == inDto.ReadingCategory)
 				  .WhereIf(inDto.CurrentCriterionType!=null,x=>x.CriterionTypeEnum==null||x.CriterionTypeEnum==inDto.CurrentCriterionType)
@@ -85,7 +85,8 @@ namespace IRaCIS.Core.Application.Service
 				.Select(x => new GetReadingMedicineTrialOtherQuestionOutDto()
 				{
 					Id = x.Id,
-					QuestionName = x.QuestionName,
+					QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
+					QuestionEnName =x.QuestionEnName,
 					TypeValue = x.TypeValue,
 					ReadingCategory = x.ReadingCategory,
 				}).ToListAsync();
@@ -152,7 +153,7 @@ namespace IRaCIS.Core.Application.Service
 				   .Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)
 				   .WhereIf(!inDto.TypeValue.IsNullOrEmpty(), x => x.TypeValue.Contains(inDto.TypeValue))
 				   .WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue))
-				   .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
+				   .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName)|| x.QuestionEnName.Contains(inDto.QuestionName))
 				   .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
 				   	.WhereIf(inDto.ReadingCategory != null, x => x.ReadingCategory == inDto.ReadingCategory)
 				   .ProjectTo<ReadingMedicineTrialQuestionView>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder);
@@ -190,7 +191,8 @@ namespace IRaCIS.Core.Application.Service
 				.Select(x => new GetReadingMedicineTrialOtherQuestionOutDto()
 				{
 					Id = x.Id,
-					QuestionName = x.QuestionName,
+					QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
+					QuestionEnName=x.QuestionEnName,
 					TypeValue = x.TypeValue,
 					ReadingCategory = x.ReadingCategory,
 				}).ToListAsync();
@@ -209,7 +211,13 @@ namespace IRaCIS.Core.Application.Service
 		{
 			var trialQuestionList = await _readingMedicineTrialQuestionRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)
 					.WhereIf(inDto.ReadingCategory != null, x => x.ReadingCategory == inDto.ReadingCategory)
-				 .ProjectTo<GetMedicineQuestionPreviewOutDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
+
+					  .ProjectTo<GetMedicineQuestionPreviewOutDto>(_mapper.ConfigurationProvider, new
+					  {
+						  isEn_Us = _userInfo.IsEn_Us
+
+					  })
+				      .OrderBy(x => x.ShowOrder).ToListAsync();
 
 			List<GetMedicineQuestionPreviewOutDto> readingQuestionList = trialQuestionList.Where(x => x.ParentId == null).ToList();
 			readingQuestionList.ForEach(x =>
@@ -458,8 +466,9 @@ namespace IRaCIS.Core.Application.Service
 					Id = NewId.NextGuid(),
 					ShowOrder = x.ShowOrder,
 					IsEnable = x.IsEnable,
+					QuestionEnName=x.QuestionEnName,
 					IsRequired = x.IsRequired,
-					QuestionName = x.QuestionName,
+					QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
 					TrialReadingCriterionId=inDto.TrialReadingCriterionId,
 					Type = x.Type,
 					ParentId=x.ParentId,

IRaCIS.Core.Application/Service/Reading/_MapConfig.cs

@@ -237,7 +237,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<ReadingMedicineTrialQuestion, ReadingMedicineTrialQuestionView>()
                 .ForMember(x=>x.ParentShowOrder,y=>y.MapFrom(n=>n.ParentQuestion.ShowOrder));
 
-            CreateMap<ReadingMedicineTrialQuestion, GetMedicineQuestionPreviewOutDto>();
+            CreateMap<ReadingMedicineTrialQuestion, GetMedicineQuestionPreviewOutDto>()
+					 .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
 
 
             CreateMap<TaskMedicalReview, MedicalReviewInfo>()

IRaCIS.Core.Domain/QC/QCQuestion.cs

@@ -19,6 +19,11 @@ namespace IRaCIS.Core.Domain.Models
 		[Required]
 		public string QuestionName { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// IsRequired
 		/// </summary>

IRaCIS.Core.Domain/QC/TrialQCQuestion.cs

@@ -29,6 +29,11 @@ namespace IRaCIS.Core.Domain.Models
 		[Required]
 		public string QuestionName { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// IsRequired
 		/// </summary>

IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs

@@ -26,6 +26,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public string ClinicalDataSetName { get; set; }
 
+		/// <summary>
+		/// 英文名称
+		/// </summary>
+		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 临床级别
 		/// </summary>

IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs

@@ -26,6 +26,11 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
         public string ClinicalDataSetName { get; set; }
 
+		/// <summary>
+		/// 英文名称
+		/// </summary>
+		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 临床级别
 		/// </summary>

IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs

@@ -34,6 +34,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public string QuestionName { get; set; }
 
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 是否是必须
 		/// </summary>

IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs

@@ -36,6 +36,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public string QuestionName { get; set; }
 
+		/// <summary>
+		/// 问题英文名称
+		/// </summary>
+		public string QuestionEnName { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 修改人
 		/// </summary>