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
2025-08-07 11:46:26 +08:00
parent a267bc13b4
commit 90671b2c34
10 changed files with 20009 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+9 -2
View File
@@ -1040,7 +1040,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public List<string> HighlightAnswerList { get; set; } = new List<string>();
/// <summary>
/// 排除显示的访视名称
/// </summary>
public List<decimal> ExcludeShowVisitList { get; set; } = new List<decimal>() { };
/// <summary>
/// 系统标准Id
@@ -2421,9 +2424,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string ExportResultStr { get; set; } = "[]";
public List<ExportResult> ExportResult { get; set; } = new List<ExportResult>();
/// <summary>
/// 排除显示的访视名称
/// </summary>
public List<decimal> ExcludeShowVisitList { get; set; } = new List<decimal>() { };
public bool IsAdditional { get; set; }
/// <summary>
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+4 -4
View File
@@ -1064,12 +1064,12 @@ namespace IRaCIS.Core.Application.Service
if (taskinfo.VisitTaskNum == 0)
{
questions = questions.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.BaseLineShow).ToList();
questions = questions.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.BaseLineShow|| x.LimitShow == LimitShow.ExcludeSomeVisits).ToList();
}
else
{
questions = questions.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.FollowShow).ToList();
questions = questions.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.FollowShow || x.LimitShow == LimitShow.ExcludeSomeVisits).ToList();
}
questions.ForEach(x =>
@@ -1342,12 +1342,12 @@ namespace IRaCIS.Core.Application.Service
taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
if (taskInfo.VisitTaskNum == 0)
{
qusetionList = qusetionList.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.BaseLineShow).ToList();
qusetionList = qusetionList.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.BaseLineShow || x.LimitShow == LimitShow.ExcludeSomeVisits).ToList();
}
else
{
qusetionList = qusetionList.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.FollowShow).ToList();
qusetionList = qusetionList.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.FollowShow || x.LimitShow == LimitShow.ExcludeSomeVisits).ToList();
}