Compare commits
No commits in common. "ab9203eef09c5a6416027352e023141eb7a48a4d" and "0b3542e9c3e69f2d452ca38ffb8e12232f5754b8" have entirely different histories.
ab9203eef0
...
0b3542e9c3
|
|
@ -1,6 +1,5 @@
|
|||
using IRaCIS.Core.Domain.Share;
|
||||
using MassTransit;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
|
@ -142,13 +141,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
|
||||
public string ReportMark { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 高亮问题的答案
|
||||
/// </summary>
|
||||
public string HighlightAnswer { get; set; } = "[]";
|
||||
|
||||
public List<string> HighlightAnswerList { get; set; } = new List<string>();
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 问题英文分组
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
using IRaCIS.Core.Domain.Share;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
|
@ -894,14 +892,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
/// </summary>
|
||||
public string ParentDictionaryCode { get; set; } = string.Empty;
|
||||
|
||||
public List<string> HighlightAnswerList { get; set; } = new List<string>();
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 系统标准Id
|
||||
/// </summary>
|
||||
public Guid ReadingQuestionCriterionTrialId { get; set; }
|
||||
/// <summary>
|
||||
/// 系统标准Id
|
||||
/// </summary>
|
||||
public Guid ReadingQuestionCriterionTrialId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否复制病灶
|
||||
|
|
@ -1123,9 +1118,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
public List<string> ParentTriggerValueList { get; set; } = new List<string>();
|
||||
public List<string> RelevanceValueList { get; set; } = new List<string>();
|
||||
|
||||
|
||||
public List<string> HighlightAnswerList { get; set; } = new List<string>();
|
||||
|
||||
/// <summary>
|
||||
/// 备注
|
||||
/// </summary>
|
||||
|
|
@ -1668,14 +1660,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
/// </summary>
|
||||
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
|
||||
|
||||
|
||||
public List<string> HighlightAnswerList { get; set; }= new List<string>();
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 最大答案长度
|
||||
/// </summary>
|
||||
public int? MaxAnswerLength { get; set; }
|
||||
/// <summary>
|
||||
/// 最大答案长度
|
||||
/// </summary>
|
||||
public int? MaxAnswerLength { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 文件类型
|
||||
|
|
@ -1740,15 +1728,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
/// </summary>
|
||||
public string RelevanceValue { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 高亮问题的答案
|
||||
/// </summary>
|
||||
public string HighlightAnswer { get; set; } = "[]";
|
||||
|
||||
/// <summary>
|
||||
/// 类型
|
||||
/// </summary>
|
||||
public string Type { get; set; }
|
||||
/// <summary>
|
||||
/// 类型
|
||||
/// </summary>
|
||||
public string Type { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 父问题触发
|
||||
|
|
@ -1863,13 +1846,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
|
||||
public bool IsAdditional { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 高亮问题的答案
|
||||
/// </summary>
|
||||
public string HighlightAnswer { get; set; } = "[]";
|
||||
|
||||
public List<string> HighlightAnswerList { get; set; } = new List<string>();
|
||||
|
||||
/// <summary>
|
||||
/// 分类算法
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -274,7 +274,6 @@ namespace IRaCIS.Application.Services
|
|||
{
|
||||
indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
|
||||
indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
|
||||
indto.HighlightAnswer=JsonConvert.SerializeObject(indto.HighlightAnswerList);
|
||||
if (indto.Id != null)
|
||||
{
|
||||
var trialIdList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionSystemId == indto.Id && x.IsJudgeQuestion && x.JudgeType != JudgeTypeEnum.None)
|
||||
|
|
@ -440,7 +439,7 @@ namespace IRaCIS.Application.Services
|
|||
}
|
||||
indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
|
||||
indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
|
||||
indto.HighlightAnswer =JsonConvert.SerializeObject(indto.HighlightAnswerList);
|
||||
|
||||
|
||||
if (indto.Id != null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -217,8 +217,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Unit = x.Unit,
|
||||
CustomUnit=x.CustomUnit,
|
||||
ReportLayType= ReportLayType.Group,
|
||||
HighlightAnswer = x.HighlightAnswer,
|
||||
HighlightAnswerList = x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 分组
|
||||
|
|
@ -244,8 +242,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Unit = x.Unit,
|
||||
CustomUnit=x.CustomUnit,
|
||||
ReportLayType = ReportLayType.Question,
|
||||
HighlightAnswer = x.HighlightAnswer,
|
||||
HighlightAnswerList = x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 问题
|
||||
|
|
|
|||
|
|
@ -213,8 +213,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Unit = x.Unit,
|
||||
CustomUnit = x.CustomUnit,
|
||||
ReportLayType = ReportLayType.Group,
|
||||
HighlightAnswer = x.HighlightAnswer,
|
||||
HighlightAnswerList = x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 分组
|
||||
|
|
@ -240,8 +238,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Unit = x.Unit,
|
||||
CustomUnit = x.CustomUnit,
|
||||
ReportLayType = ReportLayType.Question,
|
||||
HighlightAnswer = x.HighlightAnswer,
|
||||
HighlightAnswerList = x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 问题
|
||||
|
|
|
|||
|
|
@ -213,8 +213,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Unit = x.Unit,
|
||||
CustomUnit = x.CustomUnit,
|
||||
ReportLayType = ReportLayType.Group,
|
||||
HighlightAnswer = x.HighlightAnswer,
|
||||
HighlightAnswerList = x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 分组
|
||||
|
|
@ -240,8 +238,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Unit = x.Unit,
|
||||
CustomUnit = x.CustomUnit,
|
||||
ReportLayType = ReportLayType.Question,
|
||||
HighlightAnswer = x.HighlightAnswer,
|
||||
HighlightAnswerList = x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 问题
|
||||
|
|
|
|||
|
|
@ -178,8 +178,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
CustomUnit=x.CustomUnit,
|
||||
Unit = x.Unit,
|
||||
ReportLayType=ReportLayType.Group,
|
||||
HighlightAnswer = x.HighlightAnswer,
|
||||
HighlightAnswerList = x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 分组
|
||||
|
|
@ -206,8 +204,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Unit = x.Unit,
|
||||
CustomUnit=x.CustomUnit,
|
||||
ReportLayType = ReportLayType.Question,
|
||||
HighlightAnswer = x.HighlightAnswer,
|
||||
HighlightAnswerList = x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 问题
|
||||
|
|
|
|||
|
|
@ -171,8 +171,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Unit = x.Unit,
|
||||
CustomUnit=x.CustomUnit,
|
||||
ReportLayType= ReportLayType.Group,
|
||||
HighlightAnswer=x.HighlightAnswer,
|
||||
HighlightAnswerList=x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 分组
|
||||
|
|
@ -198,8 +196,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Unit = x.Unit,
|
||||
CustomUnit=x.CustomUnit,
|
||||
ReportLayType = ReportLayType.Question,
|
||||
HighlightAnswer = x.HighlightAnswer,
|
||||
HighlightAnswerList = x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 问题
|
||||
|
|
|
|||
|
|
@ -167,8 +167,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Unit = x.Unit,
|
||||
CustomUnit=x.CustomUnit,
|
||||
ReportLayType= ReportLayType.Group,
|
||||
HighlightAnswer = x.HighlightAnswer,
|
||||
HighlightAnswerList = x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 分组
|
||||
|
|
@ -194,8 +192,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Unit = x.Unit,
|
||||
CustomUnit=x.CustomUnit,
|
||||
ReportLayType = ReportLayType.Question,
|
||||
HighlightAnswer = x.HighlightAnswer,
|
||||
HighlightAnswerList = x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 问题
|
||||
|
|
|
|||
|
|
@ -175,8 +175,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Unit = x.Unit,
|
||||
CustomUnit=x.CustomUnit,
|
||||
ReportLayType = ReportLayType.Group,
|
||||
HighlightAnswer = x.HighlightAnswer,
|
||||
HighlightAnswerList = x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 分组
|
||||
|
|
@ -205,8 +203,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
Unit = x.Unit,
|
||||
CustomUnit=x.CustomUnit,
|
||||
ReportLayType = ReportLayType.Question,
|
||||
HighlightAnswer = x.HighlightAnswer,
|
||||
HighlightAnswerList = x.HighlightAnswerList,
|
||||
}).ToList();
|
||||
|
||||
// 问题
|
||||
|
|
|
|||
|
|
@ -217,12 +217,7 @@ namespace IRaCIS.Core.Domain.Models
|
|||
/// </summary>
|
||||
public QuestionClassify? QuestionClassify { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 高亮问题的答案
|
||||
/// </summary>
|
||||
public string HighlightAnswer { get; set; } = "[]";
|
||||
|
||||
[JsonIgnore]
|
||||
[JsonIgnore]
|
||||
[ForeignKey("GroupId")]
|
||||
public ReadingQuestionSystem GroupInfo { get; set; }
|
||||
|
||||
|
|
@ -277,26 +272,6 @@ namespace IRaCIS.Core.Domain.Models
|
|||
|
||||
}
|
||||
|
||||
[NotMapped]
|
||||
public List<string> HighlightAnswerList
|
||||
{
|
||||
get
|
||||
{
|
||||
|
||||
try
|
||||
{
|
||||
var result = JsonConvert.DeserializeObject<List<string>>(this.HighlightAnswer);
|
||||
return result == null ? new List<string>() : result;
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
return new List<string>();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -302,15 +302,10 @@ namespace IRaCIS.Core.Domain.Models
|
|||
[ForeignKey("GroupId")]
|
||||
public ReadingQuestionTrial GroupInfo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 高亮问题的答案
|
||||
/// </summary>
|
||||
public string HighlightAnswer { get; set; } = "[]";
|
||||
|
||||
/// <summary>
|
||||
/// 分页标准
|
||||
/// </summary>
|
||||
[ForeignKey("ReadingCriterionPageId")]
|
||||
/// <summary>
|
||||
/// 分页标准
|
||||
/// </summary>
|
||||
[ForeignKey("ReadingCriterionPageId")]
|
||||
[JsonIgnore]
|
||||
public ReadingCriterionPage ReadingCriterionPage { get; set; }
|
||||
[JsonIgnore]
|
||||
|
|
@ -385,27 +380,7 @@ namespace IRaCIS.Core.Domain.Models
|
|||
}
|
||||
}
|
||||
|
||||
[NotMapped]
|
||||
public List<string> HighlightAnswerList
|
||||
{
|
||||
get
|
||||
{
|
||||
|
||||
try
|
||||
{
|
||||
var result = JsonConvert.DeserializeObject<List<string>>(this.HighlightAnswer);
|
||||
return result == null ? new List<string>() : result;
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
||||
return new List<string>();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public class CalculateInfo
|
||||
|
|
|
|||
Loading…
Reference in New Issue