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

添加LimitShow 限制显示
continuous-integration/drone/push Build is passing Details

Uat_Study
he 2024-01-22 16:16:03 +08:00
parent efe96203d9
commit 8f5e2c5b0c
5 changed files with 88 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

@ -346,6 +346,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None; public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary> /// <summary>
/// 最大答案长度 /// 最大答案长度
/// </summary> /// </summary>
@ -454,6 +459,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None; public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary> /// <summary>
/// 最大答案长度 /// 最大答案长度
/// </summary> /// </summary>
@ -1000,6 +1010,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None; public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary> /// <summary>
/// 最大答案长度 /// 最大答案长度
/// </summary> /// </summary>
@ -1058,6 +1073,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None; public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary> /// <summary>
/// 最大答案长度 /// 最大答案长度
/// </summary> /// </summary>
@ -1560,6 +1580,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None; public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary> /// <summary>
/// 最大答案长度 /// 最大答案长度
/// </summary> /// </summary>
@ -1916,6 +1941,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None; public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary> /// <summary>
/// 最大答案长度 /// 最大答案长度
/// </summary> /// </summary>

20
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -748,6 +748,16 @@ namespace IRaCIS.Application.Services
var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync(); var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
if (taskinfo.VisitTaskNum == 0)
{
questions = questions.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.BaseLineShow).ToList();
}
else
{
questions = questions.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.FollowShow).ToList();
}
questions.ForEach(x => questions.ForEach(x =>
{ {
x.CrterionDictionaryGroup = ReadingCommon.GetCrterionDictionaryGroup(taskinfo.IsConvertedTask); x.CrterionDictionaryGroup = ReadingCommon.GetCrterionDictionaryGroup(taskinfo.IsConvertedTask);
@ -972,6 +982,16 @@ namespace IRaCIS.Application.Services
if (inDto.TaskId != null) if (inDto.TaskId != null)
{ {
taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync(); 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();
}
else
{
qusetionList = qusetionList.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.FollowShow).ToList();
}
qusetionList.ForEach(x => qusetionList.ForEach(x =>
{ {

24
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -1811,6 +1811,30 @@ namespace IRaCIS.Core.Domain.Share
} }
/// <summary>
/// 显示限制
/// </summary>
public enum LimitShow
{
/// <summary>
/// 全都显示
/// </summary>
AllShow = 0,
/// <summary>
/// 基线显示
/// </summary>
BaseLineShow = 1,
/// <summary>
/// 随访显示
/// </summary>
FollowShow = 2,
}
/// <summary> /// <summary>
/// 限制编辑 /// 限制编辑
/// </summary> /// </summary>

4
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
View File

@ -181,6 +181,10 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None; public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary> /// <summary>
/// 数据来源 /// 数据来源

5
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
View File

@ -231,6 +231,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None; public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary> /// <summary>
/// 自定义计算标记 /// 自定义计算标记
/// </summary> /// </summary>