修改

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

@@ -812,58 +812,16 @@
             <returns></returns>
             <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ICriterionCalculateService.CalculateTask(IRaCIS.Core.Application.Service.Reading.Dto.CalculateTaskInDto)">
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.GeneralCalculateService.GetReadingCalculateDto(System.Guid)">
             <summary>
-            自动计算 并修改值
+            获取ReadingCalculateDto
             </summary>
-            <param name="inDto"></param>
+            <param name="visitTaskId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ICriterionCalculateService.VerifyVisitTaskQuestions(IRaCIS.Core.Application.Service.Reading.Dto.VerifyVisitTaskQuestionsInDto)">
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.PCWG3CalculateService.AddTaskLesionAnswerFromLastTask(IRaCIS.Core.Application.ViewModel.AddTaskLesionAnswerFromLastTaskInDto)">
             <summary>
-            验证访视提交
+            将上一次的病灶信息添加到这一次
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.ICriterionCalculateService.AddTaskLesionAnswerFromLastTask(IRaCIS.Core.Application.ViewModel.AddTaskLesionAnswerFromLastTaskInDto)">
-            <summary>
-            将上一次的访视病灶添加到这一次
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.ICriterionCalculateService.GetReportVerify(IRaCIS.Core.Application.Service.Reading.Dto.GetReportVerifyInDto)">
-            <summary>
-            获取报告验证的信息(这里每个标准可能不一样 返回用object)
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.IReadingCalculateService.CalculateTask(IRaCIS.Core.Application.Service.Reading.Dto.CalculateTaskInDto)">
-            <summary>
-            自动计算 并修改值
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.IReadingCalculateService.VerifyVisitTaskQuestions(IRaCIS.Core.Application.Service.Reading.Dto.VerifyVisitTaskQuestionsInDto)">
-            <summary>
-            验证访视提交
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.IReadingCalculateService.AddTaskLesionAnswerFromLastTask(IRaCIS.Core.Application.ViewModel.AddTaskLesionAnswerFromLastTaskInDto)">
-            <summary>
-            将上一次的访视病灶添加到这一次
-            </summary>
-            <param name="inDto"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.IReadingCalculateService.GetReportVerify(IRaCIS.Core.Application.Service.Reading.Dto.GetReportVerifyInDto)">
-            <summary>
-            获取报告验证的信息(这里每个标准可能不一样 返回用object)
             </summary>
             <param name="inDto"></param>
             <returns></returns>
@@ -964,13 +922,6 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.GetReadingCalculateDto(System.Guid)">
-            <summary>
-            获取ReadingCalculateDto
-            </summary>
-            <param name="visitTaskId"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.AddTaskLesionAnswerFromLastTask(IRaCIS.Core.Application.ViewModel.AddTaskLesionAnswerFromLastTaskInDto)">
             <summary>
             将上一次的访视病灶添加到这一次
@@ -1152,6 +1103,69 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ICriterionCalculateService.CalculateTask(IRaCIS.Core.Application.Service.Reading.Dto.CalculateTaskInDto)">
+            <summary>
+            自动计算 并修改值
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ICriterionCalculateService.VerifyVisitTaskQuestions(IRaCIS.Core.Application.Service.Reading.Dto.VerifyVisitTaskQuestionsInDto)">
+            <summary>
+            验证访视提交
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ICriterionCalculateService.AddTaskLesionAnswerFromLastTask(IRaCIS.Core.Application.ViewModel.AddTaskLesionAnswerFromLastTaskInDto)">
+            <summary>
+            将上一次的访视病灶添加到这一次
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ICriterionCalculateService.GetReportVerify(IRaCIS.Core.Application.Service.Reading.Dto.GetReportVerifyInDto)">
+            <summary>
+            获取报告验证的信息(这里每个标准可能不一样 返回用object)
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.IGeneralCalculateService.GetReadingCalculateDto(System.Guid)">
+            <summary>
+            获取ReadingCalculateDto
+            </summary>
+            <param name="visitTaskId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.IReadingCalculateService.CalculateTask(IRaCIS.Core.Application.Service.Reading.Dto.CalculateTaskInDto)">
+            <summary>
+            自动计算 并修改值
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.IReadingCalculateService.VerifyVisitTaskQuestions(IRaCIS.Core.Application.Service.Reading.Dto.VerifyVisitTaskQuestionsInDto)">
+            <summary>
+            验证访视提交
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.IReadingCalculateService.AddTaskLesionAnswerFromLastTask(IRaCIS.Core.Application.ViewModel.AddTaskLesionAnswerFromLastTaskInDto)">
+            <summary>
+            将上一次的访视病灶添加到这一次
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.IReadingCalculateService.GetReportVerify(IRaCIS.Core.Application.Service.Reading.Dto.GetReportVerifyInDto)">
+            <summary>
+            获取报告验证的信息(这里每个标准可能不一样 返回用object)
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.ClinicalDataSetName">
             <summary>
             名称

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

@@ -811,6 +811,7 @@ namespace IRaCIS.Core.Application.Service
                 //case ReadingCategory.ReadingPeriod:
                 case GenerateTaskCategory.Global:
 
+        
                     var originalTaskInfo = await _visitTaskRepository.Where(x => x.Id == generateTaskCommand.OriginalVisitId).FirstNotNullAsync();
                     foreach (var item in generateTaskCommand.ReadingGenerataTaskList)
                     {

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

@@ -1399,7 +1399,7 @@ namespace IRaCIS.Application.Services
                          {
                              IsUrgent = x.IsUrgent ?? false,
                              SubjectId = x.SubjectId,
-                             VisitNum = x.VisitNum,
+                             VisitNum = x.SubjectVisit.VisitNum,
                              ReadingName = x.ModuleName,
                              ReadModuleId = x.Id,
                              ReadingCategory = typeChangeDic[x.ModuleType],

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs

@@ -213,7 +213,7 @@ namespace IRaCIS.Application.Services
                 // 先找到对应的全局阅片模块Id
                 var globalreadModuleId = await _readModuleRepository.Where(x => x.SubjectVisitId == readModuleInfo.SubjectVisitId &&
                 x.TrialReadingCriterionId== readModuleInfo.TrialReadingCriterionId&&
-                x.ModuleType == ModuleTypeEnum.Global).Select(x => x.Id).FirstOrDefaultAsync();
+                x.ModuleType == ModuleTypeEnum.Global).Include(x=>x.SubjectVisit).Select(x => x.Id).FirstOrDefaultAsync();
 
                 // 找到一个全局阅片任务是否有裁判任务
 
@@ -259,7 +259,7 @@ namespace IRaCIS.Application.Services
                             IsUrgent = readModuleInfo.IsUrgent ?? false,
                             SubjectId = readModuleInfo.SubjectId,
                             ReadingName = readModuleInfo.ModuleName,
-                            VisitNum = readModuleInfo.VisitNum,
+                            VisitNum = readModuleInfo.SubjectVisit.VisitNum,
                             ReadModuleId = readModuleInfo.Id,
                             ReadingCategory = ReadingCategory.Oncology,
                         });

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs

@@ -212,9 +212,9 @@ namespace IRaCIS.Application.Services
         public async Task<List<GetSubjectReadVisitsOutDto>> GetSubjectReadVisitList(GetSubjectReadVisitsInDto inDto)
         {
             //增加标准
-            var maxReadVisit = await _readModuleRepository.Where(x => x.SubjectId == inDto.SubjectId && x.ReadingSetType==inDto.ReadingSetType && x.TrialReadingCriterionId==inDto.TrialReadingCriterionId).OrderByDescending(x=>x.VisitNum).FirstOrDefaultAsync();
+            var maxReadVisit = await _readModuleRepository.Where(x => x.SubjectId == inDto.SubjectId && x.ReadingSetType==inDto.ReadingSetType && x.TrialReadingCriterionId==inDto.TrialReadingCriterionId).Include(x=>x.SubjectVisit).OrderByDescending(x=>x.SubjectVisit.VisitNum).FirstOrDefaultAsync();
 
-            var maxReadVisitNum= maxReadVisit==null?-1:maxReadVisit.VisitNum;
+            var maxReadVisitNum= maxReadVisit==null?-1:maxReadVisit.SubjectVisit.VisitNum;
             var visitQuery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null && !x.IsLostVisit);
             var finalVisitNum = await visitQuery.Where(x => x.IsFinalVisit).Select(x => x.VisitNum).FirstOrDefaultAsync();
 
@@ -272,7 +272,7 @@ namespace IRaCIS.Application.Services
                     SubjectVisitId = visit.Id,
                     ReadingSetType = dto.ReadingSetType,
                     TrialId = dto.TrialId,
-                    VisitNum = visit.VisitNum,
+               
                     ReadingStatus = ReadingStatusEnum.TaskAllocate,
 
                     //增加标准
@@ -303,7 +303,7 @@ namespace IRaCIS.Application.Services
                                  {
                                    IsUrgent = readModuleData.IsUrgent ?? false,
                                    SubjectId = readModuleData.SubjectId,
-                                   VisitNum=readModuleData.VisitNum,
+                                   VisitNum=await _subjectVisitRepository.Where(x=>x.Id==readModuleData.SubjectVisitId).Select(x=>x.VisitNum).FirstOrDefaultAsync() ,
                                    ReadingName = readModuleData.ModuleName,
                                    ReadModuleId =readModuleData.Id,
                                    ReadingCategory = ReadingCategory.Global,
@@ -355,7 +355,7 @@ namespace IRaCIS.Application.Services
                                  {
                                    IsUrgent = readModuleData.IsUrgent ?? false,
                                    SubjectId = readModuleData.SubjectId,
-                                   VisitNum=readModuleData.VisitNum,
+                                   VisitNum=visit.VisitNum,
                                    ReadingName = readModuleData.ModuleName,
                                    
                                    ReadModuleId =readModuleData.Id,

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs

@@ -171,7 +171,7 @@ namespace IRaCIS.Application.Services
                         ReadingPeriodSetId = item.ReadingPeriodSet.Id,
                         ReadingStatus = ReadingStatusEnum.TaskAllocate,
                         TrialId = readingPeriodSet.TrialId,
-                        VisitNum = item.SubjectVisit.VisitNum,
+                        //VisitNum = item.SubjectVisit.VisitNum,
 
                         //增加标准
                         TrialReadingCriterionId = readingPeriodSet.TrialReadingCriterionId
@@ -206,7 +206,7 @@ namespace IRaCIS.Application.Services
                                      {
                                        IsUrgent = readModule.IsUrgent??false,
                                        SubjectId = readModule.SubjectId,
-                                       VisitNum=readModule.VisitNum,
+                                       VisitNum= await _subjectVisitRepository.Where(x=>x.Id==readModule.SubjectVisitId).Select(x=>x.VisitNum).FirstOrDefaultAsync(),
                                        ReadingName = readModule.ModuleName,
                                        ReadModuleId =readModule.Id,
                                        ReadingCategory = ReadingCategory.Global,
@@ -264,7 +264,7 @@ namespace IRaCIS.Application.Services
                                          {
                                            IsUrgent = readModule.IsUrgent ?? false,
                                            SubjectId = readModule.SubjectId,
-                                           VisitNum=readModule.VisitNum,
+                                           VisitNum=await _visitTaskRepository.Where(x=>x.Id==readModule.SubjectVisitId).Select(x=>x.VisitTaskNum).FirstOrDefaultAsync(),
                                            ReadingName = readModule.ModuleName,
                                            ReadModuleId =readModule.Id,
                                            ReadingCategory = ReadingCategory.Oncology,
@@ -439,7 +439,7 @@ namespace IRaCIS.Application.Services
                 globalVisitNum = await _readModuleRepository
                     .WhereIf(inDto.TrialReadingCriterionId != null, t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId)
 
-                    .Where(x => x.ReadingSetType == ReadingSetType.ImageReading && x.TrialId == inDto.TrialId).Select(x => x.VisitNum).Distinct().ToListAsync();
+                    .Where(x => x.ReadingSetType == ReadingSetType.ImageReading && x.TrialId == inDto.TrialId).Select(x => x.SubjectVisit.VisitNum).Distinct().ToListAsync();
             }
 
             List<GetReadingVisitListOutDto> result = await _visitStageRepository.Where(x => x.TrialId == inDto.TrialId)

IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs

@@ -152,7 +152,7 @@ namespace IRaCIS.Core.Application.Triggers
                         ReadingSetType = ReadingSetType.ImageReading,
                         ModuleType = ModuleTypeEnum.Global,
                         TrialId = subjectVisit.TrialId,
-                        VisitNum = subjectVisit.VisitNum,
+                        //VisitNum = subjectVisit.VisitNum,
                         TrialReadingCriterionId = item.Id,
                     });
 

IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs

@@ -63,10 +63,10 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid TrialId { get; set; }
 
-		/// <summary>
+		///// <summary>
-		/// 
+		///// 
-		/// </summary>
+		///// </summary>
-		public decimal VisitNum { get; set; }
+		//public decimal VisitNum { get; set; }
 
         [JsonIgnore]
 		/// <summary>