S-008

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

@@ -449,6 +449,7 @@ namespace IRaCIS.Core.Application.Service
                     IsPMConfirm = x.IsPMConfirm,
                     SubjectCode = x.Subject.Code,
                     ReadModuleId = x.Id,
+                    ModuleName=x.ModuleName,
                 });
 
 
@@ -553,7 +554,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<List<GetClinicalTableListOutDto>> GetClinicalTableList(GetClinicalTableListInDto inDto)
+        public async Task<(List<GetClinicalTableListOutDto>,object)> GetClinicalTableList(GetClinicalTableListInDto inDto)
         {
 
 			var readModule=await _readModuleRepository.Where(x => x.Id == inDto.ReadModuleId).FirstNotNullAsync();
@@ -585,6 +586,7 @@ namespace IRaCIS.Core.Application.Service
 			List<GetClinicalTableListOutDto> result = new List<GetClinicalTableListOutDto>();
             clinicalDataTrialSetIds.ForEach(x => {
                 GetClinicalTableListOutDto dto = new GetClinicalTableListOutDto();
+                dto.ModuleName = readModule.ModuleName;
                 dto.ClinicalDataSetName = confirmList.Where(y => y.ClinicalDataTrialSetId == x).Select(y => y.ClinicalDataSetName).First();
                 dto.QuestionList = questionList.Where(y => y.TrialClinicalId == x).OrderBy(y => y.ShowOrder).ToList();
                 dto.AnswerList = new List<Dictionary<string, string>>();
@@ -602,7 +604,10 @@ namespace IRaCIS.Core.Application.Service
 				});
                 result.Add(dto);
 			});
-			return result;
+            return (result, new
+            {
+                readModule.ModuleName,
+            });
 
         }
 
@@ -613,8 +618,9 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-		public async Task<List<GetClinicalDateListOutDto>> GetClinicalDateList(GetCRCBeConfirmListInDto inDto)
+		public async Task<(List<GetClinicalDateListOutDto>,object)> GetClinicalDateList(GetCRCBeConfirmListInDto inDto)
         {
+            var readModule = await _readModuleRepository.Where(x => x.Id == inDto.ReadModuleId).FirstNotNullAsync();
             var confirmList = (await this.GetCRCConfirmList(new GetCRCConfirmListInDto()
 			{
 				ReadModuleId = inDto.ReadModuleId,
@@ -633,7 +639,6 @@ namespace IRaCIS.Core.Application.Service
 
                 result.Add(new GetClinicalDateListOutDto()
                 {
-
                     ClinicalDataSetName = confirmList.Where(y => y.ClinicalDataTrialSetId == x).Select(y => y.ClinicalDataSetName).First(),
                     DateList = confirmList.Where(y => y.ClinicalDataTrialSetId == x).ToList()
 
@@ -641,7 +646,9 @@ namespace IRaCIS.Core.Application.Service
 
             });
 
-            return result;
+            return (result,new  {
+                readModule.ModuleName,
+            });
 		}
 
 		/// <summary>

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

@@ -145,6 +145,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 	public class GetClinicalTableListOutDto: GetClinicalQuestionAnswerListOutDto
 	{
 		public string ClinicalDataSetName { get; set; }
+
+        /// <summary>
+        /// 模块名称
+        /// </summary>
+        public string ModuleName { get; set; }
     }
 
 
@@ -210,6 +215,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public Guid SubjectId { get; set; }
 		public Guid ReadModuleId { get; set; }
 
+        /// <summary>
+        /// 模块名称
+        /// </summary>
+        public string ModuleName { get; set; }
+
         public bool IsPMConfirm { get; set; }
 
 		public ReadingSetType ReadingSetType { get; set; }