修改一版

2022-08-04 11:15:23 +08:00
parent fee3b47eed
commit 1e512a4623
5 changed files with 43 additions and 1 deletions
@@ -95,6 +95,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto

        public string VisitName { get; set; }

+        public bool IsHaveChange { get; set; }
+
+        public string VisitRemark { get; set; } = string.Empty;
+
        /// <summary>
        /// 评估结果
        /// </summary>
@@ -124,9 +128,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
        /// </summary>
        public string TrialEvaluationReason { get; set; } = string.Empty;

+
+        /// <summary>
+        /// 是否显示详情
+        /// </summary>
+        public bool IsShowDetail { get; set; }
+
        //任务阅片状态
        public ReadingTaskState ReadingTaskState { get; set; }

+        public Guid GlobalTaskId { get; set; }
+
        public List<OncologyVisitTaskInfo> OncologyVisits { get; set; } = new List<OncologyVisitTaskInfo>();
    }

@@ -116,9 +116,10 @@ namespace IRaCIS.Application.Services

            GetOncologyReadingInfoOutDto result = new GetOncologyReadingInfoOutDto() {
            TrialEvaluationResult= trialCriterion.EvaluationResult,
+            IsShowDetail= trialCriterion.IsShowDetail,
            TrialEvaluationReason = trialCriterion.EvaluationReason.IsNullOrEmpty()? ReadingCommon.EvaluationReason : trialCriterion.EvaluationReason,
            OncologyTaskId = inDto.VisitTaskId,
-                ReadingTaskState=  taskInfo.ReadingTaskState,
+            ReadingTaskState=  taskInfo.ReadingTaskState,
            };

            // 先找到是R1还是R2的阅片 先找到全局阅片
@@ -151,6 +152,13 @@ namespace IRaCIS.Application.Services
                visitTask = await _visitTaskRepository.Where(x=>x.Id== judgeResultTaskId).FirstOrDefaultAsync();
            }

+            // 获取全局阅片信息
+            var globalTaskReadingInfo = await this.GetGlobalReadingInfo(new GetGlobalReadingInfoInDto()
+            {
+                UsingOriginalData = true,
+                VisitTaskId = visitTask.Id
+            });
+

            // 找到对应的访视

@@ -182,6 +190,8 @@ namespace IRaCIS.Application.Services
                    x.EvaluationReason = oncologyData.EvaluationReason;
                }

+                x.IsHaveChange = globalTaskReadingInfo.TaskList.Where(y => y.VisitTaskId == y.VisitTaskId).SelectMany(y => y.AfterQuestionList).Any(y => y.IsHaveChange);
+                x.VisitRemark = globalTaskReadingInfo.TaskList.Where(y => y.VisitTaskId == y.VisitTaskId).SelectMany(y => y.AfterQuestionList).Where(y => y.QuestionId == null).Select(x => x.Answer).FirstOrDefault() ?? String.Empty;

            });