修改一版

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

@@ -2175,6 +2175,20 @@
             <param name="addOrEditReadingMedicineTrialQuestion"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService.GetReadingMedicineTrialOtherQuestion(IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionInDto)">
+            <summary>
+            获取项目的其他医学审核问题
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService.AddTrialDataFromSystem(IRaCIS.Core.Application.ViewModel.AddTrialDataFromSystemInDto)">
+            <summary>
+            从系统里面选择问题添加到项目里面
+            </summary>
+            <param name="InDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingMedicineQuestionService.DeleteReadingMedicineTrialQuestion(System.Guid)">
             <summary>
             删除项目的医学审核问题
@@ -2527,6 +2541,11 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionQuery">
             <summary>ReadingMedicineSystemQuestionQuery  列表查询参数模型</summary>
         </member>
+        <member name="T:IRaCIS.Core.Application.ViewModel.GetReadingMedicineTrialOtherQuestionInDto">
+            <summary>
+            获取项目的其他问题
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.ReadingMedicineSystemQuestionAddOrEdit">
             <summary> ReadingMedicineSystemQuestionAddOrEdit  列表查询参数模型</summary>
         </member>

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

@@ -52,10 +52,10 @@ namespace IRaCIS.Core.Application.ViewModel
 	///<summary>ReadingMedicineSystemQuestionQuery  列表查询参数模型</summary>
 	public class ReadingMedicineSystemQuestionQuery:PageInput
 	{
-		public string Type { get; set; }
+		public string Type { get; set; }=string.Empty;
-		public string ParentTriggerValue { get; set; }
+		public string ParentTriggerValue { get; set; } = string.Empty;
-		public string QuestionName { get; set; }
+		public string QuestionName { get; set; } = string.Empty;
-		public string TypeValue { get; set; }
+		public string TypeValue { get; set; } = string.Empty;
 
 	}
 
@@ -67,6 +67,13 @@ namespace IRaCIS.Core.Application.ViewModel
 		public string QuestionName { get; set; }
 	}
 
+	public class AddTrialDataFromSystemInDto
+	{
+		public Guid TrialId { get; set; }
+
+		public List<Guid> SystemQuestionIds { get; set; }
+	}
+
 	/// <summary>
 	/// 获取项目的其他问题
 	/// </summary>
@@ -151,13 +158,13 @@ namespace IRaCIS.Core.Application.ViewModel
 		/// </summary>
 		public Guid TrialId { get; set; }
 
-		public string Type { get; set; }
+		public string Type { get; set; } = string.Empty;
 
-        public string ParentTriggerValue { get; set; }
+		public string ParentTriggerValue { get; set; } = string.Empty;
 
-        public string QuestionName { get; set; }
+		public string QuestionName { get; set; } = string.Empty;
 
-        public string TypeValue { get; set; }
+		public string TypeValue { get; set; } = string.Empty;
 
 	}
 

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

@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Infra.EFCore.Common;
+using MassTransit;
 
 namespace IRaCIS.Core.Application.Service
 {	
@@ -135,6 +136,31 @@ namespace IRaCIS.Core.Application.Service
 			return questionList;
 		}
 
+		/// <summary>
+		/// 从系统里面选择问题添加到项目里面
+		/// </summary>
+		/// <param name="InDto"></param>
+		/// <returns></returns>
+		[HttpPost]
+		public async Task<IResponseOutput> AddTrialDataFromSystem(AddTrialDataFromSystemInDto inDto)
+		{
+			var needList = _readingMedicineSystemQuestionRepository.Where(x => inDto.SystemQuestionIds.Contains(x.Id))
+				.Select(x => new ReadingMedicineTrialQuestion()
+				{
+					Id = NewId.NextGuid(),
+					ShowOrder = x.ShowOrder,
+					IsEnable = x.IsEnable,
+					IsRequired = x.IsRequired,
+					QuestionName = x.QuestionName,
+					Type = x.Type,
+					TypeValue = x.TypeValue,
+					TrialId=inDto.TrialId,
+				});
+
+			 await _readingMedicineTrialQuestionRepository.AddRangeAsync(needList);
+			 var result = await _readingMedicineTrialQuestionRepository.SaveChangesAsync();
+			 return ResponseOutput.Result(result);
+		}
 
 		/// <summary>
 		/// 删除项目的医学审核问题

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

@@ -87,7 +87,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<ReadingMedicineSystemQuestion, ReadingMedicineSystemQuestionView>();
 
             CreateMap<ReadingMedicineTrialQuestionAddOrEdit, ReadingMedicineTrialQuestion>();
-            CreateMap<ReadingMedicineSystemQuestion, ReadingMedicineSystemQuestionView>();
+            CreateMap<ReadingMedicineTrialQuestion, ReadingMedicineTrialQuestionView>();
             #endregion