修改

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

@@ -51,6 +51,26 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string Answer { get; set; }
     }
 
+    public class GetOncologyReadingInfoOutDto
+    {
+        public Guid VisitTaskId { get; set; }
+
+        /// <summary>
+        /// 评估结果
+        /// </summary>
+        public string EvaluationResult { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 评估原因
+        /// </summary>
+        public string EvaluationReason { get; set; } = string.Empty;
+    }
+
+    public class GetOncologyReadingInfoInDto
+    {
+        public Guid VisitTaskId { get; set; }
+    }
+
     public class GetGlobalReadingInfoInDto
     {
         public Guid VisitTaskId { get; set; }

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

@@ -87,6 +87,13 @@ namespace IRaCIS.Application.Services
             this._readingQuestionTrialRepository = readingQuestionTrialRepository;
         }
 
+        #region 肿瘤学阅片相关
+        //public async Task<GetOncologyReadingInfoOutDto> GetOncologyReadingInfo(GetOncologyReadingInfoInDto inDto)
+        //{ 
+
+        //}
+        #endregion
+
         #region 全局阅片相关
         /// <summary>
         /// 保存全局阅片结果

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs

@@ -381,6 +381,7 @@ namespace IRaCIS.Core.Application.Contracts
         }
 
 
+        public bool IsClinicalReading { get; set; }
 
         /// <summary>
         /// 仲裁阅片
@@ -641,9 +642,9 @@ namespace IRaCIS.Core.Application.Contracts
     public class SetOncologySetInDto
     {
         /// <summary>
-        /// 项目标准ID
+        /// 项目ID
         /// </summary>
-        public Guid TrialCriterionId { get; set; }
+        public Guid TrialId { get; set; }
 
         /// <summary>
         /// 评估结果
@@ -671,7 +672,7 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class GetOncologySetInDto
     {
-        public Guid TrialCriterionId { get; set; }
+        public Guid TrialId { get; set; }
     }
 
     public class GetTrialReadingInfoInDto

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -121,7 +121,7 @@ namespace IRaCIS.Core.Application
         [HttpPost]
         public async Task<GetOncologySetOutDto> GetOncologySet(GetOncologySetInDto inDto)
         {
-            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialCriterionId && x.IsConfirm).FirstOrDefaultAsync();
+            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync();
             if (trialCriterion == null)
             {
                 throw new BusinessValidationFailedException("请先确认一个项目标准。");
@@ -140,14 +140,21 @@ namespace IRaCIS.Core.Application
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task SetOncologySet(SetOncologySetInDto inDto)
+        public async Task<IResponseOutput> SetOncologySet(SetOncologySetInDto inDto)
         {
-            await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialCriterionId, x => new ReadingQuestionCriterionTrial()
+            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync();
+            if (trialCriterion == null)
+            {
+                throw new BusinessValidationFailedException("请先确认一个项目标准。");
+            }
+            await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(trialCriterion.Id, x => new ReadingQuestionCriterionTrial()
             {
                 EvaluationResult = inDto.EvaluationResult,
                 EvaluationReason = inDto.EvaluationReason,
-
             });
+
+            var result = await _readingQuestionCriterionTrialRepository.SaveChangesAsync();
+            return ResponseOutput.Ok(result);
         }
 
         /// <summary>

IRaCIS.Core.Domain/Reading/ReadingOncologyTaskInfo.cs

@@ -0,0 +1,62 @@
+
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2022-08-01 14:50:23 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace IRaCIS.Core.Domain.Models
+{
+	 /// <summary>
+	 /// 阅片肿瘤学
+	 /// </summary>
+	 [Table("ReadingOncologyTaskInfo")]	
+	 public class ReadingOncologyTaskInfo : Entity, IAuditAdd
+	 {
+	 
+		/// <summary>
+        /// 肿瘤学任务ID
+        /// </summary>
+		public Guid OncologyTaskId { get; set; }
+	
+		/// <summary>
+        /// 访视任务Id
+        /// </summary>
+		public Guid TaskId { get; set; }
+	
+		/// <summary>
+        /// 结果
+        /// </summary>
+		public string EvaluationResult { get; set; }
+	
+		/// <summary>
+        /// 原因
+        /// </summary>
+		public string EvaluationReason { get; set; }
+	
+		/// <summary>
+        /// 创建时间
+        /// </summary>
+		public DateTime CreateTime { get; set; }
+	
+		/// <summary>
+        /// 创建人
+        /// </summary>
+		public Guid CreateUserId { get; set; }
+	
+		/// <summary>
+        /// 项目Id
+        /// </summary>
+		public Guid TrialId { get; set; }
+	
+		/// <summary>
+        /// 受试者Id
+        /// </summary>
+		public Guid SubjectId { get; set; }
+	 
+	 }
+
+	  
+}	 

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -209,7 +209,7 @@ namespace IRaCIS.Core.Infra.EFCore
 
         public virtual DbSet<ReadingClinicalData> ReadingClinicalData { get; set; }
 
-
+        public virtual DbSet<ReadingOncologyTaskInfo> ReadingOncologyTaskInfo { get; set; }
         public virtual DbSet<ReadingGlobalTaskInfo> ReadingGlobalTaskInfo { get; set; }
         public virtual DbSet<ReadingQuestionCriterionSystem> ReadingQuestionCriterionSystem { get; set; }
 

IRaCIS.Core.Test/DbHelper.ttinclude

@@ -4,7 +4,7 @@
         public static readonly string ConnectionString = "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true";
         public static readonly string DbDatabase = "IRaCIS_New_Tet";
         //表名称用字符串,拼接
-        public static readonly string TableName = "SubjectCanceDoctor";
+        public static readonly string TableName = "ReadingOncologyTaskInfo";
         //具体文件里面  例如service 可以配置是否分页
 	}
 #>