XCKJ/irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加高亮

Browse Source
This commit is contained in:
he
2024-07-18 10:05:26 +08:00
parent d9fc5e3646
commit 924ba90384
12 changed files with 130 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+8
View File
@@ -1,5 +1,6 @@
using IRaCIS.Core.Domain.Share;
using MassTransit;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -141,6 +142,13 @@ 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>
/// 问题英文分组
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+36 -12
View File
@@ -1,7 +1,9 @@
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;
@@ -892,11 +894,14 @@ 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>
/// 是否复制病灶
@@ -1118,6 +1123,9 @@ 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>
@@ -1660,10 +1668,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary>
/// 最大答案长度
/// </summary>
public int? MaxAnswerLength { get; set; }
public List<string> HighlightAnswerList { get; set; }= new List<string>();
/// <summary>
/// 最大答案长度
/// </summary>
public int? MaxAnswerLength { get; set; }
/// <summary>
/// 文件类型
@@ -1728,10 +1740,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
/// <summary>
/// 类型
/// </summary>
public string Type { get; set; }
/// <summary>
/// 高亮问题的答案
/// </summary>
public string HighlightAnswer { get; set; } = "[]";
/// <summary>
/// 类型
/// </summary>
public string Type { get; set; }
/// <summary>
/// 父问题触发
@@ -1846,6 +1863,13 @@ 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>
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+2 -1
View File
@@ -274,6 +274,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)
{
var trialIdList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionSystemId == indto.Id && x.IsJudgeQuestion && x.JudgeType != JudgeTypeEnum.None)
@@ -439,7 +440,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)
{
IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
+4
View File
@@ -217,6 +217,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Unit = x.Unit,
CustomUnit=x.CustomUnit,
ReportLayType= ReportLayType.Group,
HighlightAnswer = x.HighlightAnswer,
HighlightAnswerList = x.HighlightAnswerList,
}).ToList();
// 分组
@@ -242,6 +244,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Unit = x.Unit,
CustomUnit=x.CustomUnit,
ReportLayType = ReportLayType.Question,
HighlightAnswer = x.HighlightAnswer,
HighlightAnswerList = x.HighlightAnswerList,
}).ToList();
// 问题
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+4
View File
@@ -213,6 +213,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Unit = x.Unit,
CustomUnit = x.CustomUnit,
ReportLayType = ReportLayType.Group,
HighlightAnswer = x.HighlightAnswer,
HighlightAnswerList = x.HighlightAnswerList,
}).ToList();
// 分组
@@ -238,6 +240,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Unit = x.Unit,
CustomUnit = x.CustomUnit,
ReportLayType = ReportLayType.Question,
HighlightAnswer = x.HighlightAnswer,
HighlightAnswerList = x.HighlightAnswerList,
}).ToList();
// 问题
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs
+4
View File
@@ -213,6 +213,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Unit = x.Unit,
CustomUnit = x.CustomUnit,
ReportLayType = ReportLayType.Group,
HighlightAnswer = x.HighlightAnswer,
HighlightAnswerList = x.HighlightAnswerList,
}).ToList();
// 分组
@@ -238,6 +240,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Unit = x.Unit,
CustomUnit = x.CustomUnit,
ReportLayType = ReportLayType.Question,
HighlightAnswer = x.HighlightAnswer,
HighlightAnswerList = x.HighlightAnswerList,
}).ToList();
// 问题
IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+4
View File
@@ -178,6 +178,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
CustomUnit=x.CustomUnit,
Unit = x.Unit,
ReportLayType=ReportLayType.Group,
HighlightAnswer = x.HighlightAnswer,
HighlightAnswerList = x.HighlightAnswerList,
}).ToList();
// 分组
@@ -204,6 +206,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Unit = x.Unit,
CustomUnit=x.CustomUnit,
ReportLayType = ReportLayType.Question,
HighlightAnswer = x.HighlightAnswer,
HighlightAnswerList = x.HighlightAnswerList,
}).ToList();
// 问题
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+4
View File
@@ -171,6 +171,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Unit = x.Unit,
CustomUnit=x.CustomUnit,
ReportLayType= ReportLayType.Group,
HighlightAnswer=x.HighlightAnswer,
HighlightAnswerList=x.HighlightAnswerList,
}).ToList();
// 分组
@@ -196,6 +198,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Unit = x.Unit,
CustomUnit=x.CustomUnit,
ReportLayType = ReportLayType.Question,
HighlightAnswer = x.HighlightAnswer,
HighlightAnswerList = x.HighlightAnswerList,
}).ToList();
// 问题
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
+4
View File
@@ -167,6 +167,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Unit = x.Unit,
CustomUnit=x.CustomUnit,
ReportLayType= ReportLayType.Group,
HighlightAnswer = x.HighlightAnswer,
HighlightAnswerList = x.HighlightAnswerList,
}).ToList();
// 分组
@@ -192,6 +194,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Unit = x.Unit,
CustomUnit=x.CustomUnit,
ReportLayType = ReportLayType.Question,
HighlightAnswer = x.HighlightAnswer,
HighlightAnswerList = x.HighlightAnswerList,
}).ToList();
// 问题
IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
+4
View File
@@ -175,6 +175,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Unit = x.Unit,
CustomUnit=x.CustomUnit,
ReportLayType = ReportLayType.Group,
HighlightAnswer = x.HighlightAnswer,
HighlightAnswerList = x.HighlightAnswerList,
}).ToList();
// 分组
@@ -203,6 +205,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
Unit = x.Unit,
CustomUnit=x.CustomUnit,
ReportLayType = ReportLayType.Question,
HighlightAnswer = x.HighlightAnswer,
HighlightAnswerList = x.HighlightAnswerList,
}).ToList();
// 问题