From ab9bb015cd4c416f4aaab16489aa642f3e08b1f0 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 30 Sep 2022 11:00:47 +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
---
.../IRaCIS.Core.Application.xml | 25 +++++++++++++++++++
.../Reading/Dto/ReadingImageTaskViewModel.cs | 23 ++++++++++++++---
.../Reading/ReadingImageTaskService.cs | 7 ++++++
3 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index b9e12a463..a114ab42a 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1820,6 +1820,21 @@
当新答案为空的时候 是否是有原数据
+
+
+ 问题类型
+
+
+
+
+ 字典code
+
+
+
+
+ 问题类型
+
+
答案分组
@@ -3106,6 +3121,11 @@
排序
+
+
+ 标准类型
+
+
是否完成配置
@@ -3751,6 +3771,11 @@
是否启用
+
+
+ 标准类型
+
+
是否完成配置
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index eac8ee38d..436ebf623 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -681,13 +681,28 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string Answer { get; set; }
-
-
+ ///
+ /// 问题类型
+ ///
+ public QuestionType? QuestionType { get; set; }
///
- /// 答案分组
+ /// 字典code
///
- public string AnswerGroup { get; set; } = string.Empty;
+ public string DictionaryCode { get; set; } = string.Empty;
+
+ ///
+ /// 问题类型
+ ///
+ public TableQuestionType? QuestionGenre { get; set; }
+
+
+
+
+ ///
+ /// 答案分组
+ ///
+ public string AnswerGroup { get; set; } = string.Empty;
///
/// 答案组合
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 7df12147d..82d25e8f8 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -1120,6 +1120,10 @@ namespace IRaCIS.Application.Services
QuestionId = y.ReadingQuestionTrialId,
QuestionName = y.ReadingQuestionTrial.QuestionName,
AnswerGroup = y.ReadingQuestionTrial.AnswerGroup,
+ QuestionType=y.ReadingQuestionTrial.QuestionType,
+ QuestionGenre=y.ReadingQuestionTrial.QuestionGenre,
+ DictionaryCode=y.ReadingQuestionTrial.DictionaryCode,
+
AnswerCombination = y.ReadingQuestionTrial.AnswerCombination,
JudgeType = y.ReadingQuestionTrial.JudgeType,
@@ -1150,6 +1154,9 @@ namespace IRaCIS.Application.Services
IsHaveChange = lr.global == null ? false : lr.global.Any(),
QuestionId = lr.question.QuestionId,
QuestionName = lr.question.QuestionName,
+ QuestionType = lr.question.QuestionType,
+ QuestionGenre = lr.question.QuestionGenre,
+ DictionaryCode = lr.question.DictionaryCode,
Type = lr.question.Type,
GlobalAnswerType=GlobalAnswerType.Question,
AnswerGroup = lr.question.AnswerGroup,