From 4c2827401bf8f04df267224cc63436493f777ba6 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 10 Oct 2022 11:57:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrialSiteUser/DTO/TrialConfigDTO.cs        |  8 ++++----
 .../TrialSiteUser/TrialConfigService.cs        | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index bb838bfe..44bf4672 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -643,7 +643,7 @@ namespace IRaCIS.Core.Application.Contracts
     public class TrialReadingInfoSignInDto
     {
         [NotDefault]
-        public Guid TrialCriterionId { get; set; }
+        public Guid TrialReadingCriterionId { get; set; }
     }
 
     public class GetTrialReadingCriterionInfoOutDto
@@ -739,7 +739,7 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class GetOncologySetInDto
     {
-        public Guid TrialCriterionId { get; set; }
+        public Guid TrialReadingCriterionId { get; set; }
     }
 
     public class GetTrialReadingInfoInDto
@@ -749,7 +749,7 @@ namespace IRaCIS.Core.Application.Contracts
         public Guid TrialId { get; set; }
 
         [NotDefault]
-        public Guid TrialCriterionId { get; set; }
+        public Guid TrialReadingCriterionId { get; set; }
 
       
     }
@@ -781,7 +781,7 @@ namespace IRaCIS.Core.Application.Contracts
         /// <summary>
         /// 项目标准ID
         /// </summary>
-        public Guid TrialCriterionId { get; set; }
+        public Guid TrialReadingCriterionId { get; set; }
 
         /// <summary>
         /// 阅片工具
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 8a2a7181..e9a050ca 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -64,7 +64,7 @@ namespace IRaCIS.Core.Application
         [HttpPost]
         public async Task<IResponseOutput> TrialReadingInfoSignVerify(TrialReadingInfoSignInDto inDto)
         {
-            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync();
+            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
             var existsJudge = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id && x.IsJudgeQuestion && x.JudgeType == JudgeTypeEnum.None)
                 .WhereIf(trialCriterion.FormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null)
                 .WhereIf(trialCriterion.FormType == FormType.MultiplePage, x => x.ReadingCriterionPageId != null)
@@ -103,7 +103,7 @@ namespace IRaCIS.Core.Application
         [NonDynamicMethod]
         public async Task<IResponseOutput> TrialReadingInfoSign(TrialReadingInfoSignInDto inDto)
         {
-            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id==inDto.TrialCriterionId).FirstOrDefaultAsync();
+            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id==inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
 
             var existsJudge = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialCriterion.Id && x.IsJudgeQuestion && x.JudgeType == JudgeTypeEnum.None)
                   .WhereIf(trialCriterion.FormType == FormType.SinglePage, x => x.ReadingCriterionPageId == null)
@@ -115,7 +115,7 @@ namespace IRaCIS.Core.Application
                 throw new BusinessValidationFailedException("有裁判问题未配置产生裁判阅片任务的条件,操作失败！");
             }
 
-            await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.TrialCriterionId, x => new ReadingQuestionCriterionTrial()
+            await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
             {
                 ReadingInfoSignTime = DateTime.Now
             });
@@ -133,7 +133,7 @@ namespace IRaCIS.Core.Application
         [HttpPost]
         public async Task<GetTrialReadingInfoOutDto> GetCriterionReadingInfo(GetTrialReadingInfoInDto inDto)
         {
-            GetTrialReadingInfoOutDto trialInfo= await _readingQuestionCriterionTrialRepository.Where(x=>x.Id==inDto.TrialCriterionId).ProjectTo<GetTrialReadingInfoOutDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+            GetTrialReadingInfoOutDto trialInfo= await _readingQuestionCriterionTrialRepository.Where(x=>x.Id==inDto.TrialReadingCriterionId).ProjectTo<GetTrialReadingInfoOutDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
             return trialInfo;
         }
 
@@ -147,7 +147,7 @@ namespace IRaCIS.Core.Application
         public async Task<GetOncologySetOutDto> GetOncologySet(GetOncologySetInDto inDto)
         {
           
-            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialCriterionId).FirstOrDefaultAsync();
+            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
             if (trialCriterion == null)
             {
                 throw new BusinessValidationFailedException("请先确认一个项目标准。");
@@ -195,7 +195,7 @@ namespace IRaCIS.Core.Application
         [HttpPost]
         public async Task<(List<TrialJudgeQuestion>,object)> GetTrialReadingJudgeList(GetTrialReadingInfoInDto inDto)
         {
-            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync();
+            var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
             if (trialCriterion == null)
             {
                 throw new BusinessValidationFailedException("请先确认一个项目标准。");
@@ -260,7 +260,7 @@ namespace IRaCIS.Core.Application
                     // 同步器官
                     await _iOrganInfoService.SynchronizeSystemOrganToTrial(new SynchronizeSystemOrganToTrialInDto()
                     {
-                        TrialCriterionId = inDto.TrialCriterionId,
+                        TrialCriterionId = inDto.TrialReadingCriterionId,
                         SystemCriterionId = trialCriterion.ReadingQuestionCriterionSystemId
                     });
 
@@ -268,7 +268,7 @@ namespace IRaCIS.Core.Application
                     await iReadingQuestionService.SynchronizeCriterion(new SynchronizeCriterionInDto()
                     {
 
-                        TrialCriterionId = inDto.TrialCriterionId,
+                        TrialCriterionId = inDto.TrialReadingCriterionId,
                     });
                 }
 
@@ -327,7 +327,7 @@ namespace IRaCIS.Core.Application
         [HttpPost]
         public async Task<IResponseOutput> SetCriterionReadingInfo(SetCriterionReadingInfoInDto inDto)
         {
-            await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialCriterionId, x => new ReadingQuestionCriterionTrial()
+            await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
             {
                 ReadingTool=inDto.ReadingTool,
                 //DigitPlaces=inDto.DigitPlaces,