修改一版

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

@@ -8,6 +8,41 @@ using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
+	public class AddOrUpdateTumorAssessmentInDto
+	{
+
+		public Guid? Id { get; set; }
+
+		/// <summary>
+		/// 靶病灶
+		/// </summary>
+		public string TargetLesion { get; set; }
+
+		/// <summary>
+		/// 非靶病灶
+		/// </summary>
+		public string NonTargetLesions { get; set; }
+
+		/// <summary>
+		/// 新病灶
+		/// </summary>
+		public string NewLesion { get; set; }
+
+		/// <summary>
+		/// 整体疗效
+		/// </summary>
+		public string OverallEfficacy { get; set; }
+
+		/// <summary>
+		/// 标准ID
+		/// </summary>
+		public Guid CriterionId { get; set; }
+	}
+
+	public class GetTumorAssessmentListInDto
+	{
+		public Guid CriterionId { get; set; }
+	}
 	public class CopySystemCriterionDataInDto
 	{
 		public Guid SourceSystemCriterionId { get; set; }

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

@@ -110,19 +110,6 @@ namespace IRaCIS.Application.Services
         }
 
 
-        #region 疗效对照表
-
-        /// <summary>
-        /// 获取疗效对照
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<List<TumorAssessment>> GetTumorAssessmentList()
-        {
-            return await _tumorAssessmentRepository.AsQueryable().ToListAsync();
-        }
-
-        #endregion
 
         #region 表格问题相关
 

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

@@ -34,6 +34,7 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository;
         private readonly IRepository<ReadingCriterionPage> _readingCriterionPageRepository;
         private readonly IRepository<Trial> _trialRepository;
+        private readonly IRepository<TumorAssessment> _tumorAssessmentRepository;
         private readonly IRepository<OrganInfo> _organInfoRepository;
         private readonly IRepository<ReadingTableQuestionSystem> _readingTableQuestionSystemRepository;
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswer;
@@ -51,6 +52,7 @@ namespace IRaCIS.Application.Services
             IRepository<ReadingTableQuestionTrial> readingTableQuestionTrialRepository,
             IRepository<ReadingCriterionPage> readingCriterionPageRepository,
             IRepository<Trial> trialRepository,
+            IRepository<TumorAssessment> tumorAssessmentRepository,
             IRepository<OrganInfo> organInfoRepository,
             IRepository<ReadingTableQuestionSystem> readingTableQuestionSystemRepository,
             IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswer,
@@ -68,6 +70,7 @@ namespace IRaCIS.Application.Services
             this._readingTableQuestionTrialRepository = readingTableQuestionTrialRepository;
             this._readingCriterionPageRepository = readingCriterionPageRepository;
             this._trialRepository = trialRepository;
+            this._tumorAssessmentRepository = tumorAssessmentRepository;
             this._organInfoRepository = organInfoRepository;
             this._readingTableQuestionSystemRepository = readingTableQuestionSystemRepository;
             this._readingTaskQuestionAnswer = readingTaskQuestionAnswer;
@@ -76,6 +79,49 @@ namespace IRaCIS.Application.Services
 
 
 
+        #region 疗效对照表
+
+        /// <summary>
+        /// 获取疗效对照
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<List<TumorAssessment>> GetTumorAssessmentList(GetTumorAssessmentListInDto inDto)
+        {
+            return await _tumorAssessmentRepository.Where(x=>x.CriterionId==inDto.CriterionId).ToListAsync();
+        }
+
+
+        /// <summary>
+        /// 新增修改疗效对照
+        /// </summary>
+        /// <param name="indto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> AddOrUpdateTumorAssessment(AddOrUpdateTumorAssessmentInDto indto)
+        {
+
+            var entity = await _tumorAssessmentRepository.InsertOrUpdateAsync(indto, true);
+
+            return ResponseOutput.Ok(entity.Id.ToString());
+
+        }
+
+        /// <summary>
+        /// 删除疗效对照
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpDelete("{Id:guid}")]
+        public async Task<IResponseOutput> DeleteTumorAssessment(Guid Id)
+        {
+            await _tumorAssessmentRepository.DeleteFromQueryAsync(t => t.Id == Id);
+            var success = await _tumorAssessmentRepository.SaveChangesAsync();
+            return ResponseOutput.Result(success);
+        }
+
+        #endregion
+
 
         /// <summary>
         /// 复制一个系统标准到另一系统标准

IRaCIS.Core.Domain/Reading/TumorAssessment.cs

@@ -16,8 +16,6 @@ namespace IRaCIS.Core.Domain.Models
 	 public class TumorAssessment : Entity
 	 {
 	 
-	
-	
 		/// <summary>
         /// 靶病灶
         /// </summary>
@@ -38,6 +36,11 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		public string OverallEfficacy { get; set; }
 
+		/// <summary>
+		/// 标准ID
+		/// </summary>
+		public Guid CriterionId { get; set; }
+
 	}
 
 }