From 46abd0ab779cbdb09dcbccc254cbebf6be56e966 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 13 Jan 2023 13:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/Dto/ReadingQuestionViewModel.cs        | 5 +++++
 .../Reading/ReadingCriterion/ReadingQuestionService.cs     | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 169f122d1..41919985d 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -1153,6 +1153,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 	{
 		public Guid QuestionId { get; set; }
 
+		/// <summary>
+		/// 问题名称
+		/// </summary>
+		public string QuestionName { get; set; }
+
 		/// <summary>
 		/// 自定义计算标记
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
index dea63ebe0..6833682d8 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
@@ -504,10 +504,12 @@ namespace IRaCIS.Application.Services
         {
             if (inDto.TrialReadingCriterionId != null)
             {
-                return await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId)
+                return await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId
+                &&x.DataSource== DataSources.Automatic&&x.Type== "number")
                        .Select(x => new CalculateRelationDto()
                        {
                            QuestionId = x.Id,
+                           QuestionName=  x.QuestionName,
                            CustomCalculateMark = x.CustomCalculateMark,
                            CalculateQuestionList = x.CalculateQuestionList,
                            ValueType = x.ValueType,
@@ -518,10 +520,11 @@ namespace IRaCIS.Application.Services
             }
             else
             {
-                return await _readingTableQuestionTrialRepository.Where(x => x.ReadingQuestionId == inDto.ReadingQuestionId)
+                return await _readingTableQuestionTrialRepository.Where(x => x.ReadingQuestionId == inDto.ReadingQuestionId && x.DataSource == DataSources.Automatic && x.Type == "number")
                       .Select(x => new CalculateRelationDto()
                       {
                           QuestionId = x.Id,
+                          QuestionName = x.QuestionName,
                           CustomCalculateMark = x.CustomCalculateMark,
                           CalculateQuestionList = x.CalculateQuestionList,
                           ValueType = x.ValueType,