Merge branch 'Test.IRC' of http://192.168.3.69:3000/XCKJ/irc-netcore-api into Test.IRC

IRaCIS.Core.Application/Service/QC/QCListService.cs

@@ -451,7 +451,7 @@ namespace IRaCIS.Core.Application.Image.QA
                         //.WhereIf(visitSearchDTO.ChallengeState != null, t => t.ChallengeState == visitSearchDTO.ChallengeState)
                         .ProjectTo<QCVisitViewModel>(_mapper.ConfigurationProvider);
 
-            var defalutSortArray = new string[] { nameof(SubjectVisit.IsUrgent) + " desc", nameof(SubjectVisit.SubjectId), nameof(SubjectVisit.VisitNum) };
+            var defalutSortArray = new string[] { nameof(SubjectVisit.IsUrgent) + " desc", nameof(QCVisitViewModel.AuditState) +" asc" };
             var pageList = await query.ToPagedListAsync(visitSearchDTO.PageIndex, visitSearchDTO.PageSize, visitSearchDTO.SortField, visitSearchDTO.Asc, string.IsNullOrWhiteSpace(visitSearchDTO.SortField), defalutSortArray);
 
 

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

@@ -514,11 +514,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string QuestionEnName { get; set; } = string.Empty;
 
-		
+
+        public List<string> ParentTriggerValueList { get; set; }
+        public List<string> RelevanceValueList { get; set; }
 
 
-
-	}
+    }
 
 	public class ReadingCriterionPageView
 	{
@@ -1038,10 +1039,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueOfType? ValueType { get; set; }
 
-		/// <summary>
-		/// 备注
-		/// </summary>
-		public string Remark { get; set; }
+        public List<string> ParentTriggerValueList { get; set; }
+        public List<string> RelevanceValueList { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
 
 		/// <summary>
 		/// 数据来源
@@ -1730,7 +1734,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 问题英文分组
 		/// </summary>
 		public string GroupEnName { get; set; } = string.Empty;
-	}
+
+        public List<string> ParentTriggerValueList { get; set; }
+        public List<string> RelevanceValueList { get; set; }
+    }
 
 
 

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

@@ -271,6 +271,8 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<IResponseOutput> AddOrUpdateReadingQuestionSystem(AddOrUpdateReadingQuestionSystemInDto indto)
         {
+            indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
+            indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
             if (indto.Id != null)
             {
                 var trialIdList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionSystemId == indto.Id && x.IsJudgeQuestion && x.JudgeType != JudgeTypeEnum.None)
@@ -371,10 +373,11 @@ namespace IRaCIS.Application.Services
         /// <param name="addOrEditReadingTableQuestionSystem"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResponseOutput> AddOrUpdateReadingTableQuestionSystem(ReadingTableQuestionSystemAddOrEdit addOrEditReadingTableQuestionSystem)
+        public async Task<IResponseOutput> AddOrUpdateReadingTableQuestionSystem(ReadingTableQuestionSystemAddOrEdit indto)
         {
-
-            var entity = await _readingTableQuestionSystemRepository.InsertOrUpdateAsync(addOrEditReadingTableQuestionSystem, true);
+            indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
+            indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
+            var entity = await _readingTableQuestionSystemRepository.InsertOrUpdateAsync(indto, true);
 
             return ResponseOutput.Ok(entity.Id.ToString());
 

IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs

@@ -20,7 +20,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             {CriterionType.PCWG3,typeof(PCWG3CalculateService) },
             {CriterionType.SelfDefine,typeof(SelfDefineCalculateService) },
             {CriterionType.RECIST1Pointt1_MB,typeof(RECIST1Point1_BMCalculateService) },
-            {CriterionType.IRECIST1Point1,typeof(IRECIST1Point1CalculateService) }
+            {CriterionType.IRECIST1Point1,typeof(IRECIST1Point1CalculateService) },
+            {CriterionType.Lugano2014,typeof(LuganoCalculateService) }
         };