修改导表

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

@@ -527,15 +527,25 @@
         </member>
         <member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.GetOverallTumorEvaluationList_Export(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
             <summary>
-            整体肿瘤评估   多个标准一个接口   Excel 列是一样的
+            整体肿瘤评估  （目前仅仅 RECIST1.1   多个标准一个接口   Excel 列是一样的 ）
             </summary>
             <param name="queryVisitTask"></param>
             <returns></returns>
         </member>
-        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.Common.ExcelExportService.GetEvaluationOfTumorEfficacy_Export(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})" -->
+        <member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.GetEvaluationOfTumorEfficacy_Export(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
+            <summary>
+            肿瘤疗效评估表   ( 目前仅仅 RECIST1.1)
+            </summary>
+            <param name="queryVisitTask"></param>
+            <param name="_commonDocumentRepository"></param>
+            <param name="_dictionaryService"></param>
+            <param name="_trialRepository"></param>
+            <returns></returns>
+            <exception cref="T:System.Exception"></exception>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.GetDetailedOfEvaluatedLesion_Export(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
             <summary>
-            评估病灶明细表   ( 目前 RECIST1.1  PGW3 表都是不同的)
+            评估病灶明细表   (目前仅仅 RECIST1.1    RECIST1.1  PGW3 表都是不同的)
             </summary>
             <param name="queryVisitTask"></param>
             <returns></returns>
@@ -6974,6 +6984,16 @@
             无效的 为True无效
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GroupAnalysisExport.IsGroupDiffArm1">
+            <summary>
+            组件一致性和原Arm1是否有差异
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GroupAnalysisExport.IsGroupDiffArm2">
+            <summary>
+            组件一致性和原Arm2是否有差异
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Contracts.QCQuestionViewInDto">
             <summary>
             

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -471,6 +471,12 @@ namespace IRaCIS.Core.Application.Service.Common
                 [FromServices] IRepository<Trial> _trialRepository)
         {
 
+            var criterionType = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync();
+
+            if (criterionType != CriterionType.RECIST1Pointt1)
+            {
+                throw new Exception("当前标准导出还未支持");
+            }
             //产生一致性分析的Subject
 
             var subjectQuerybal = _repository.Where<VisitTask>(t => t.TrialId == queryVisitTask.TrialId && t.TaskState == TaskState.Effect && t.IsSelfAnalysis == true).Select(t => t.SubjectId).Distinct();
@@ -541,6 +547,12 @@ namespace IRaCIS.Core.Application.Service.Common
                 [FromServices] IDictionaryService _dictionaryService,
                 [FromServices] IRepository<Trial> _trialRepository)
         {
+            var criterionType = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync();
+
+            if (criterionType != CriterionType.RECIST1Pointt1)
+            {
+                throw new Exception("当前标准导出还未支持");
+            }
 
             //产生组间一致性分析的Subject
 
@@ -574,7 +586,7 @@ namespace IRaCIS.Core.Application.Service.Common
             var list = allList.Where(t => t.IsSelfAnalysis == null).OrderBy(t => t.TrialSiteCode).ThenBy(t => t.SubjectCode).ThenBy(t => t.VisitTaskNum).ToList();
 
 
-            var newList=new List<GroupAnalysisExport>();
+            var newList = new List<GroupAnalysisExport>();
 
             // 每个subject访视进行分组
 
@@ -587,7 +599,7 @@ namespace IRaCIS.Core.Application.Service.Common
                 var subjectVisitGroupList = group.ToList();
 
 
-                //找到当前访视组件一致性分析的任务结果
+                //找到当前访视组间一致性分析的任务结果
 
                 var groupTaskList = allList.Where(t => t.IsSelfAnalysis == false && t.SubjectCode == group.Key.SubjectCode && t.VisitTaskNum == group.Key.VisitTaskNum && t.TaskName == group.Key.TaskName).ToList();
 
@@ -599,19 +611,20 @@ namespace IRaCIS.Core.Application.Service.Common
                         var cloneObj = subjectVisitTaskArm.Clone();
 
 
-                        cloneObj.AgainUserName= item.UserName;
+                        cloneObj.AgainUserName = item.UserName;
                         cloneObj.AgainEvaluateResult = item.EvaluateResult;
                         cloneObj.ArmEnum = item.ArmEnum;
-                        //cloneObj.IsGroupAnalysisDiffToOriginalData = item.ArmEnum;
+
+                        cloneObj.IsGroupAnalysisDiffToOriginalData = cloneObj.ArmEnum == Arm.DoubleReadingArm1 ? item.IsGroupDiffArm1 : item.IsGroupDiffArm2;
 
                         newList.Add(cloneObj);
                     }
                 }
-                 
+
             }
 
 
-  
+
 
             var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
 
@@ -625,7 +638,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
 
         /// <summary>
-        /// 整体肿瘤评估   多个标准一个接口   Excel 列是一样的
+        /// 整体肿瘤评估  （目前仅仅 RECIST1.1   多个标准一个接口   Excel 列是一样的 ）
         /// </summary>
         /// <param name="queryVisitTask"></param>
         /// <returns></returns>
@@ -636,9 +649,17 @@ namespace IRaCIS.Core.Application.Service.Common
                 [FromServices] IRepository<Trial> _trialRepository)
         {
 
+
+
+
             //每次查询必须是单标准的
             var criterionType = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefaultAsync();
 
+            if (criterionType != CriterionType.RECIST1Pointt1)
+            {
+                throw new Exception("当前标准导出还未支持");
+            }
+
             var list = await _repository.Where<VisitTask>(t => t.TrialId == queryVisitTask.TrialId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false && t.ReadingTaskState == ReadingTaskState.HaveSigned)
 
                //.WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId)
@@ -672,11 +693,14 @@ namespace IRaCIS.Core.Application.Service.Common
         }
 
         /// <summary>
-        ///  肿瘤疗效评估表   ( 目前 RECIST1.1)
+        /// 肿瘤疗效评估表   ( 目前仅仅 RECIST1.1)
-        /// </summa
+        /// </summary>
         /// <param name="queryVisitTask"></param>
+        /// <param name="_commonDocumentRepository"></param>
+        /// <param name="_dictionaryService"></param>
+        /// <param name="_trialRepository"></param>
         /// <returns></returns>
-        [HttpPost]
+        /// <exception cref="Exception"></exception>
         public async Task<IActionResult> GetEvaluationOfTumorEfficacy_Export(VisitTaskQuery queryVisitTask,
                 [FromServices] IRepository<CommonDocument> _commonDocumentRepository,
                 [FromServices] IDictionaryService _dictionaryService,
@@ -716,7 +740,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
                 exportInfo.List = list;
 
-                return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialMedicalReviewList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1EvaluationOfTumorEfficacyExport), criterionType);
+                return await ExcelExportHelper.DataExportAsync(StaticData.Export.RECIST1Point1EvaluationOfTumorEfficacy_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1EvaluationOfTumorEfficacyExport), criterionType);
             }
 
             else
@@ -729,7 +753,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
 
         /// <summary>
-        /// 评估病灶明细表   ( 目前 RECIST1.1  PGW3 表都是不同的)
+        /// 评估病灶明细表   (目前仅仅 RECIST1.1    RECIST1.1  PGW3 表都是不同的)
         /// </summary>
         /// <param name="queryVisitTask"></param>
         /// <returns></returns>
@@ -797,7 +821,7 @@ namespace IRaCIS.Core.Application.Service.Common
                 }).ToList();
                 exportInfo.List = exportList;
 
-                return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialMedicalReviewList_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1DetailedOfEvaluatedLesionExport), criterionType);
+                return await ExcelExportHelper.DataExportAsync(StaticData.Export.RECIST1Point1DetailedOfEvaluatedLesion_Export, exportInfo, "", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1DetailedOfEvaluatedLesionExport), criterionType);
 
 
             }

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -630,6 +630,16 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string AgainUserName { get; set; }
 
+        /// <summary>
+        /// 组件一致性和原Arm1是否有差异
+        /// </summary>
+        public bool? IsGroupDiffArm1 { get; set; }
+
+        /// <summary>
+        /// 组件一致性和原Arm2是否有差异
+        /// </summary>
+        public bool? IsGroupDiffArm2 { get; set; }
+
         public bool? IsGroupAnalysisDiffToOriginalData { get; set; }
 
     }