Compare commits

..

No commits in common. "de72cdb61ad736745c186e0dfc3aba8615b771e1" and "0c1b3b017572fd80b8f1300e78c8c9ff8cb7fca6" have entirely different histories.

5 changed files with 5 additions and 88 deletions

View File

@ -356,11 +356,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary>
/// 最大答案长度
/// </summary>
@ -480,11 +475,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary>
/// 最大答案长度
/// </summary>
@ -1050,11 +1040,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary>
/// 最大答案长度
/// </summary>
@ -1126,11 +1111,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary>
/// 最大答案长度
/// </summary>
@ -1643,11 +1623,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary>
/// 最大答案长度
/// </summary>
@ -2027,11 +2002,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 限制显示
/// </summary>
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
/// <summary>
/// 最大答案长度
/// </summary>

View File

@ -765,16 +765,6 @@ namespace IRaCIS.Application.Services
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 =>
{
x.CrterionDictionaryGroup = ReadingCommon.GetCrterionDictionaryGroup(taskinfo.IsConvertedTask);
@ -1021,16 +1011,6 @@ namespace IRaCIS.Application.Services
if (inDto.TaskId != null)
{
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 =>
{

View File

@ -2413,30 +2413,6 @@ public enum PET5PSScore
}
/// <summary>
/// 显示限制
/// </summary>
public enum LimitShow
{
/// <summary>
/// 全都显示
/// </summary>
AllShow = 0,
/// <summary>
/// 基线显示
/// </summary>
BaseLineShow = 1,
/// <summary>
/// 随访显示
/// </summary>
FollowShow = 2,
}
/// <summary>
/// 限制编辑
/// </summary>

View File

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

View File

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