计算修改

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

@@ -1312,6 +1312,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.ReadingCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.ReadingCalculateService.AddTaskLesionAnswerFromLastTask(IRaCIS.Core.Application.ViewModel.AddTaskLesionAnswerFromLastTaskInDto)">
             <summary>
             将上一次的访视病灶添加到这一次
@@ -1352,6 +1359,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="F:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.sODData">
             <summary>
             获取Sod的值
@@ -1725,6 +1739,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="F:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.sODData">
             <summary>
             获取Sod的值
@@ -2177,6 +2198,13 @@
             <param name="digitPlaces"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.PCWG3CalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.PCWG3CalculateService.GetDeleteLesionStatrIndex(IRaCIS.Core.Application.Service.Reading.Dto.DeleteReadingRowAnswerInDto)">
             <summary>
             删除病灶获取起始病灶序号
@@ -2276,6 +2304,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="F:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.sODData">
             <summary>
             获取Sod的值
@@ -2520,6 +2555,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1_BMCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="F:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1_BMCalculateService.sODData">
             <summary>
             获取Sod的值
@@ -2824,6 +2866,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.SelfDefineCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.SelfDefineCalculateService.GetDeleteLesionStatrIndex(IRaCIS.Core.Application.Service.Reading.Dto.DeleteReadingRowAnswerInDto)">
             <summary>
             删除病灶获取起始病灶序号
@@ -2908,6 +2957,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ICriterionCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.IGeneralCalculateService.GetReadingCalculateDto(System.Guid)">
             <summary>
             获取ReadingCalculateDto
@@ -2980,6 +3036,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.IReadingCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.SubjectCriteriaEvaluationService">
             <summary>
             SubjectCriteriaEvaluationService
@@ -4979,6 +5042,11 @@
             任务Id
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto.VisitTaskId">
+            <summary>
+            任务Id
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingCustomTagDto.VisitTaskId">
             <summary>
             任务Id
@@ -13368,6 +13436,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SubmitCustomTag(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCustomTagDto)">
             <summary>
             提交自定义标记

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

@@ -434,6 +434,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid VisitTaskId { get; set; }
     }
 
+    public class GetReadingCalculationDataInDto
+    {
+		/// <summary>
+		/// 任务Id
+		/// </summary>
+		public Guid VisitTaskId { get; set; }
+	}
+
 	public class ReadingCustomTagDto
     {
         public Guid? Id { get; set; }

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

@@ -150,6 +150,21 @@ namespace IRaCIS.Application.Services
             this._trialEmailNoticeConfigService = trialEmailNoticeConfigService;
         }
 
+        #region 计算
+
+        /// <summary>
+        /// 获取阅片的计算数据
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto)
+        {
+            return await _readingCalculateService.GetReadingCalculationData(inDto);
+
+		}
+		#endregion
+
 		/// <summary>
 		/// 提交自定义标记
 		/// </summary>

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

@@ -118,6 +118,20 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
         }
 
+		/// <summary>
+		/// 获取阅片的计算数据
+		/// </summary>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		[HttpPost]
+		public async Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto)
+		{
+			var service = await this.GetService(inDto.VisitTaskId);
+
+			return await service.GetReadingCalculationData(inDto);
+		}
+
+
 		/// <summary>
 		/// 将上一次的访视病灶添加到这一次
 		/// </summary>

IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs

@@ -63,6 +63,18 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             this._logger = logger;
         }
 
+		/// <summary>
+		/// 获取阅片的计算数据
+		/// </summary>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		public async Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto)
+		{
+			return new
+			{
+			};
+		}
+
 		#region 临时对象 单个请求的生命周期 避免重复查询数据库
 
 		private List<VisitTaskAnswerInfo> visitTaskAnswerList;

IRaCIS.Core.Application/Service/ReadingCalculate/Interface/ICriterionCalculateService.cs

@@ -1,5 +1,6 @@
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Application.ViewModel;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -52,6 +53,15 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         Task<int> GetDeleteLesionStatrIndex(DeleteReadingRowAnswerInDto inDto);
 
+        /// <summary>
+        /// 获取阅片的计算数据
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+
+        Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto);
+		
+
 
 	}
 }

IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IReadingCalculateService.cs

@@ -51,5 +51,13 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <returns></returns>
         Task<int> GetDeleteLesionStatrIndex(DeleteReadingRowAnswerInDto inDto);
+
+        /// <summary>
+        /// 获取阅片的计算数据
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto);
+
 	}
 }

IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs

@@ -71,6 +71,28 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
         }
 
+		/// <summary>
+		/// 获取阅片的计算数据
+		/// </summary>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		public async Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto)
+		{
+			ReadingCalculateDto readingData = await _generalCalculateService.GetReadingCalculateDto(inDto.VisitTaskId);
+            var baseLinePET5PS = 0m;
+			if (!readingData.IsBaseLine)
+			{
+				var baseLineTaskId = await GetBaseLineTaskId(readingData);
+				 baseLinePET5PS = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == baseLineTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.PET5PS).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0();
+
+			}
+			return new
+            {
+			   BaseLinePET5PS= baseLinePET5PS,
+
+			};
+		}
+
 		#region 临时对象 单个请求的生命周期 避免重复查询数据库
 
 		private List<VisitTaskAnswerInfo> visitTaskAnswerList;

IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs

@@ -63,6 +63,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
         private List<SiteVisitForTumor> siteVisitForTumorList = new List<SiteVisitForTumor>();
 
+		/// <summary>
+		/// 获取阅片的计算数据
+		/// </summary>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		public async Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto)
+		{
+			return new
+			{
+			};
+		}
 
 		#region 删除病灶获取起始病灶序号
 		/// <summary>

IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs

@@ -56,6 +56,18 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
         }
 
+		/// <summary>
+		/// 获取阅片的计算数据
+		/// </summary>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		public async Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto)
+		{
+			return new
+			{
+			};
+		}
+
 		#region 临时对象 单个请求的生命周期 避免重复查询数据库
 
 		private List<VisitTaskAnswerInfo> visitTaskAnswerList;

IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs

@@ -56,6 +56,18 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
         }
 
+		/// <summary>
+		/// 获取阅片的计算数据
+		/// </summary>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		public async Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto)
+		{
+			return new
+			{
+			};
+		}
+
 		#region 临时对象 单个请求的生命周期 避免重复查询数据库
 
 		private List<VisitTaskAnswerInfo> visitTaskAnswerList;

IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs

@@ -63,6 +63,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
         private List<SiteVisitForTumor> siteVisitForTumorList = new  List<SiteVisitForTumor>() ;
 
+		/// <summary>
+		/// 获取阅片的计算数据
+		/// </summary>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		public async Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto)
+		{
+			return new
+			{
+			};
+		}
 
 		#region 删除病灶获取起始病灶序号
 		/// <summary>