计算修改

2024-03-07 10:25:05 +08:00
parent 35f01818dd
commit 9bfd89cb9b
12 changed files with 240 additions and 30 deletions
@@ -434,7 +434,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
        public Guid VisitTaskId { get; set; }
    }

-    public class ReadingCustomTagDto
+    public class GetReadingCalculationDataInDto
+    {
+		/// <summary>
+		/// 任务Id
+		/// </summary>
+		public Guid VisitTaskId { get; set; }
+	}
+
+	public class ReadingCustomTagDto
    {
        public Guid? Id { get; set; }

@@ -150,12 +150,27 @@ 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>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		[HttpPost]
        public async Task<IResponseOutput> SubmitCustomTag(ReadingCustomTagDto inDto)
        {
            var entity = await _readingCustomTagRepository.InsertOrUpdateAsync(inDto, true);
@@ -118,12 +118,26 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate

        }

-        /// <summary>
-        /// 将上一次的访视病灶添加到这一次
-        /// </summary>
-        /// <param name="inDto"></param>
-        /// <returns></returns>
-        public async Task<AddTaskLesionAnswerFromLastTaskOutDto> AddTaskLesionAnswerFromLastTask(AddTaskLesionAnswerFromLastTaskInDto inDto)
+		/// <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>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		public async Task<AddTaskLesionAnswerFromLastTaskOutDto> AddTaskLesionAnswerFromLastTask(AddTaskLesionAnswerFromLastTaskInDto inDto)
        {
            var service = await this.GetService(inDto.VisitTaskId);
            var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
@@ -63,9 +63,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
            this._logger = logger;
        }

-        #region 临时对象 单个请求的生命周期 避免重复查询数据库
+		/// <summary>
+		/// 获取阅片的计算数据
+		/// </summary>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		public async Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto)
+		{
+			return new
+			{
+			};
+		}

-        private List<VisitTaskAnswerInfo> visitTaskAnswerList;
+		#region 临时对象 单个请求的生命周期 避免重复查询数据库
+
+		private List<VisitTaskAnswerInfo> visitTaskAnswerList;

        /// <summary>
        /// 获取Sod的值
@@ -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);
+		
+
+
+	}
 }
@@ -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);
+
+	}
 }
@@ -71,9 +71,31 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
            this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
        }

-        #region 临时对象 单个请求的生命周期 避免重复查询数据库
+		/// <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();

-        private List<VisitTaskAnswerInfo> visitTaskAnswerList;
+			}
+			return new
+            {
+			   BaseLinePET5PS= baseLinePET5PS,
+
+			};
+		}
+
+		#region 临时对象 单个请求的生命周期 避免重复查询数据库
+
+		private List<VisitTaskAnswerInfo> visitTaskAnswerList;

        /// <summary>
        /// 获取Sod的值
@@ -63,13 +63,24 @@ 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>
-        /// 删除病灶获取起始病灶序号
-        /// </summary>
-        /// <returns></returns>
-        public async Task<int> GetDeleteLesionStatrIndex(DeleteReadingRowAnswerInDto inDto)
+		#region 删除病灶获取起始病灶序号
+		/// <summary>
+		/// 删除病灶获取起始病灶序号
+		/// </summary>
+		/// <returns></returns>
+		public async Task<int> GetDeleteLesionStatrIndex(DeleteReadingRowAnswerInDto inDto)
        {
            var rowInfo = await _readingTableAnswerRowInfoRepository.Where(x => x.Id == inDto.RowId).Include(x => x.ReadingQuestionTrial).FirstNotNullAsync();
            if (rowInfo.ReadingQuestionTrial.LesionType == LesionType.NewLesions)
@@ -56,9 +56,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
            this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
        }

-        #region 临时对象 单个请求的生命周期 避免重复查询数据库
+		/// <summary>
+		/// 获取阅片的计算数据
+		/// </summary>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		public async Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto)
+		{
+			return new
+			{
+			};
+		}

-        private List<VisitTaskAnswerInfo> visitTaskAnswerList;
+		#region 临时对象 单个请求的生命周期 避免重复查询数据库
+
+		private List<VisitTaskAnswerInfo> visitTaskAnswerList;

        /// <summary>
        /// 获取Sod的值
@@ -56,9 +56,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
            this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
        }

-        #region 临时对象 单个请求的生命周期 避免重复查询数据库
+		/// <summary>
+		/// 获取阅片的计算数据
+		/// </summary>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		public async Task<object> GetReadingCalculationData(GetReadingCalculationDataInDto inDto)
+		{
+			return new
+			{
+			};
+		}

-        private List<VisitTaskAnswerInfo> visitTaskAnswerList;
+		#region 临时对象 单个请求的生命周期 避免重复查询数据库
+
+		private List<VisitTaskAnswerInfo> visitTaskAnswerList;

        /// <summary>
        /// 获取Sod的值
@@ -63,13 +63,24 @@ 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>
-        /// 删除病灶获取起始病灶序号
-        /// </summary>
-        /// <returns></returns>
-        public async Task<int> GetDeleteLesionStatrIndex(DeleteReadingRowAnswerInDto inDto)
+		#region 删除病灶获取起始病灶序号
+		/// <summary>
+		/// 删除病灶获取起始病灶序号
+		/// </summary>
+		/// <returns></returns>
+		public async Task<int> GetDeleteLesionStatrIndex(DeleteReadingRowAnswerInDto inDto)
        {
            return 1;