修改

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

@@ -239,7 +239,7 @@ namespace IRaCIS.Application.Services
         {
             var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
             GetReadingToolOutDto result = new GetReadingToolOutDto();
-            result.ReadingTool = await _trialRepository.Where(x => x.Id == visitTaskInfo.TrialId).Select(x => x.ReadingTool).FirstOrDefaultAsync();
+            result.ReadingTool = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == visitTaskInfo.TrialReadingCriterionId).Select(x => x.ReadingTool).FirstOrDefaultAsync();
             return result;
         }
 
@@ -1353,15 +1353,15 @@ namespace IRaCIS.Application.Services
             task.SubjectCode = visitTaskInfo.BlindSubjectCode.IsNullOrEmpty() ? task.SubjectCode : visitTaskInfo.BlindSubjectCode;
 
 
-            var trialInfo = await _trialRepository.Where(x => x.Id == visitTaskInfo.TrialId).Select(x => new
+            var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == visitTaskInfo.TrialReadingCriterionId).Select(x => new
             {
                 x.IsReadingShowPreviousResults,
                 x.IsReadingShowSubjectInfo,
-                x.ClinicalInformationTransmissionEnum,
+               
             }).FirstOrDefaultAsync();
 
-            task.IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults;
-            task.IsReadingShowSubjectInfo = trialInfo.IsReadingShowSubjectInfo;
+            task.IsReadingShowPreviousResults = criterionInfo.IsReadingShowPreviousResults;
+            task.IsReadingShowSubjectInfo = criterionInfo.IsReadingShowSubjectInfo;
 
 
 
@@ -1397,11 +1397,19 @@ namespace IRaCIS.Application.Services
             List<NoneDicomStudyView> result = await _noneDicomStudyRepository.Where(t => visitIds.Contains(t.SubjectVisitId))
                 .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }).ToListAsync();
 
+            var  taskinfo=await _visitTaskRepository.Where(x=>x.Id==inDto.VisistTaskId).FirstNotNullAsync();
+
             var trialInfo = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => new
+            {
+                x.ClinicalInformationTransmissionEnum,
+            }).FirstOrDefaultAsync();
+
+
+            var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskinfo.TrialReadingCriterionId).Select(x => new
             {
                 x.IsReadingShowPreviousResults,
                 x.IsReadingShowSubjectInfo,
-                x.ClinicalInformationTransmissionEnum,
+
             }).FirstOrDefaultAsync();
 
             #region 临床数据
@@ -1429,8 +1437,8 @@ namespace IRaCIS.Application.Services
                 SubjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? task.SubjectCode : taskInfo.BlindSubjectCode,
                 ReadingCategory = task.ReadingCategory,
                 TaskBlindName = task.TaskBlindName,
-                IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults,
-                IsReadingShowSubjectInfo = trialInfo.IsReadingShowSubjectInfo,
+                IsReadingShowPreviousResults = criterionInfo.IsReadingShowPreviousResults,
+                IsReadingShowSubjectInfo = criterionInfo.IsReadingShowSubjectInfo,
                 IsExistsClinicalData = isExistsClinicalData,
             });
         }

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

@@ -757,14 +757,14 @@ namespace IRaCIS.Core.Application.Contracts
         public bool IsSignSave { get; set; } = false;
     }
 
-    public class SetTrialReadingInfoInDto
+    public class SetCriterionReadingInfoInDto
     {
 
 
         /// <summary>
-        /// 项目ID
+        /// 项目标准ID
         /// </summary>
-        public Guid TrialId { get; set; }
+        public Guid TrialCriterionId { get; set; }
 
         /// <summary>
         /// 阅片工具
@@ -775,7 +775,7 @@ namespace IRaCIS.Core.Application.Contracts
         /// <summary>
         /// 阅片平台
         /// </summary>
-        public int ImagePlatform { get; set; } = 1;
+        public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.MINT;
 
 
         /// <summary>

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

@@ -312,15 +312,15 @@ namespace IRaCIS.Core.Application
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResponseOutput> SetTrialReadingInfo(SetTrialReadingInfoInDto inDto)
+        public async Task<IResponseOutput> SetCriterionReadingInfo(SetCriterionReadingInfoInDto inDto)
         {
-            await _trialRepository.UpdatePartialFromQueryAsync(inDto.TrialId, x => new Trial()
+            await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialCriterionId, x => new ReadingQuestionCriterionTrial()
             {
                 ReadingTool=inDto.ReadingTool,
                 //DigitPlaces=inDto.DigitPlaces,
                 IsReadingTaskViewInOrder=inDto.IsReadingTaskViewInOrder,
                 ReadingTaskViewEnum = inDto.ReadingTaskViewEnum,
-                IsImageIabeled = inDto.IsImageIabeled,
+                //IsImageIabeled = inDto.IsImageIabeled,
                 IsReadingShowSubjectInfo = inDto.IsReadingShowSubjectInfo,
                 IsReadingShowPreviousResults = inDto.IsReadingShowPreviousResults,
                 ImagePlatform=inDto.ImagePlatform,