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

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

@@ -4712,6 +4712,11 @@
             整体疗效
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.EditCriterionDictionaryInDto.CrterionDictionaryGroup">
+            <summary>
+            标准字典分组
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SetCriterionDictionaryDto.IsBaseLineUse">
             <summary>
             IsBaseLineUse
@@ -6457,6 +6462,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.RC.ReadingQuestionService.EditCriterionDictionary(IRaCIS.Core.Application.Service.Reading.Dto.EditCriterionDictionaryInDto)">
+            <summary>
+            设置标准字典分组
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.RC.ReadingQuestionService.SetCriterionDictionary(IRaCIS.Core.Application.Service.Reading.Dto.SetCriterionDictionaryInDto)">
             <summary>
             设置标准字典

IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs

@@ -89,6 +89,14 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
+        public async Task AddIsPDChangeTask(Guid taskId)
+        {
+            var taskInfo = await _visitTaskRepository.Where(x => x.Id == taskId).IgnoreAutoIncludes().AsNoTracking().FirstNotNullAsync();
+            taskInfo.ReadingTaskState = ReadingTaskState.WaitReading;
+            taskInfo.IsConvertedTask = true;
+            
+
+        }
 
         //基于标准签名 产生任务 (或者手动选择某些访视生成该标准的任务)
         public async Task BaseCritrionGenerateVisitTask(Guid trialId, Guid confirmedTrialReadingCriterionId, bool? isManualSelectVisit = null, List<Guid>? subjectVisitIdList = null)

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

@@ -92,6 +92,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public bool IsCopyQuestion { get; set; }
 	}
 
+	public class EditCriterionDictionaryInDto
+	{
+		public Guid Id { get; set; }
+
+		/// <summary>
+		/// 标准字典分组
+		/// </summary>
+		public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General;
+	}
+
 	public class SetCriterionDictionaryInDto
 	{
 		[NotDefault]
@@ -156,7 +166,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 	public class CriterionDictionaryInfo
 	{
 
-		public Guid Id { get; set; }
+
+		public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; }
+
+	    public Guid Id { get; set; }
 
 		public Guid DictionaryId { get; set; }
 

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs

@@ -575,6 +575,22 @@ namespace IRaCIS.Core.Application.Service.RC
             return result;
         }
 
+
+        /// <summary>
+        /// 设置标准字典分组
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<bool> EditCriterionDictionary(EditCriterionDictionaryInDto inDto)
+        {
+            await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id,x=>new ReadingCriterionDictionary() { 
+                CrterionDictionaryGroup=inDto.CrterionDictionaryGroup
+            });
+
+            return await _readingCriterionDictionaryRepository.SaveChangesAsync();
+        }
+
         /// <summary>
         /// 设置标准字典
         /// </summary>

IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs

@@ -1465,7 +1465,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 PresentSod = (await GetSODData(inDto)) ?? 0,
 
                 //非淋巴结靶病灶长径之和  decimal
-                SumOfDiameter = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.SumOfDiameter).Sum(x => x.Answer.IsNullOrEmptyReturn0()),
+                SumOfDiameter = (await GetSumOfDiameter(inDto))??0,
 
                 //所有淋巴结靶病灶的短径小于10mm bool
                 DiameterLessThan10 = true,

IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs

@@ -285,7 +285,12 @@ namespace IRaCIS.Core.Domain.Share
         Adbandon = 3,
 
         //重置 （裁判任务做了，签名了   算工作量） 
-        HaveReturned = 4
+        HaveReturned = 4,
+
+        /// <summary>
+        /// 转为IRECIST之后 之前任务的状态
+        /// </summary>
+        Freeze = 5,
     }
 
     //阅片状态

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -16,6 +16,27 @@ namespace IRaCIS.Core.Domain.Share
         public static readonly string Group = "group";
     }
 
+    /// <summary>
+    /// 标准字典分类
+    /// </summary>
+    public enum CrterionDictionaryGroup
+    {
+
+        /// <summary>
+        /// 通用
+        /// </summary>
+        General = 0,
+
+        /// <summary>
+        /// 转变前
+        /// </summary>
+        BeforeConvert = 1,
+
+        /// <summary>
+        /// 转变后
+        /// </summary>
+        Converted = 2
+    }
 
     public enum RelevanceType
     {

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -288,6 +288,16 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
         public bool IsAnalysisCreate { get; set; }
 
+
+        /// <summary>
+        /// 是否是转变的任务(转为IRECIST)
+        /// </summary>
+        public bool IsConvertedTask { get; set; } = false;
+
+
+
+
+
         public bool? IsSelfAnalysis { get; set; }
 
         public string BlindSubjectCode { get; set; } = string.Empty;

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingCriterionDictionary.cs

@@ -54,6 +54,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public bool IsFollowVisitUse { get; set; } = false;
 
+		/// <summary>
+		/// 标准字典分组
+		/// </summary>
+		public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General;
+
 		[JsonIgnore]
 		[ForeignKey("DictionaryId")]
 		public Dictionary Dictionary { get; set; }