Compare commits
No commits in common. "8bc3d9b12103c2793baadcb1513d251d718cd911" and "492312f5957126ebcfd489756173485cab382874" have entirely different histories.
8bc3d9b121
...
492312f595
|
|
@ -10916,11 +10916,6 @@
|
|||
Parent字典code
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ExcludeShowVisitList">
|
||||
<summary>
|
||||
排除显示的访视名称
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ReadingQuestionCriterionTrialId">
|
||||
<summary>
|
||||
系统标准Id
|
||||
|
|
@ -11791,11 +11786,6 @@
|
|||
分类显示类型 是否显示
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ExcludeShowVisitList">
|
||||
<summary>
|
||||
排除显示的访视名称
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.HighlightAnswer">
|
||||
<summary>
|
||||
高亮问题的答案
|
||||
|
|
@ -14101,13 +14091,6 @@
|
|||
计划外访视 获取受试者选择下拉框列表
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.VisitPlanService.GetVisitStage(IRaCIS.Application.Contracts.GetVisitStageInDto)">
|
||||
<summary>
|
||||
获取项目访视计划
|
||||
</summary>
|
||||
<param name="inDto"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.VisitPlanService.GetTrialVisitStageList(IRaCIS.Application.Contracts.VisitPlanQueryDTO)">
|
||||
暂时不用
|
||||
<summary> 获取项目访视计划</summary>
|
||||
|
|
|
|||
|
|
@ -1040,10 +1040,7 @@ 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
|
||||
|
|
@ -2424,13 +2421,9 @@ 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>
|
||||
|
|
|
|||
|
|
@ -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|| x.LimitShow == LimitShow.ExcludeSomeVisits).ToList();
|
||||
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 || x.LimitShow == LimitShow.ExcludeSomeVisits).ToList();
|
||||
questions = questions.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.FollowShow).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 || x.LimitShow == LimitShow.ExcludeSomeVisits).ToList();
|
||||
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 || x.LimitShow == LimitShow.ExcludeSomeVisits).ToList();
|
||||
qusetionList = qusetionList.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.FollowShow).ToList();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -88,10 +88,7 @@ namespace IRaCIS.Application.Contracts
|
|||
public bool IsDeleted { get; set; }
|
||||
}
|
||||
|
||||
public class GetVisitStageInDto
|
||||
{
|
||||
public Guid TrialId { get; set; } = Guid.Empty;
|
||||
}
|
||||
|
||||
public class VisitPlanQueryDTO : PageInput
|
||||
{
|
||||
public Guid TrialId { get; set; } = Guid.Empty;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
using DocumentFormat.OpenXml.Office2010.ExcelAc;
|
||||
using IRaCIS.Application.Contracts;
|
||||
using IRaCIS.Application.Contracts;
|
||||
using IRaCIS.Application.Interfaces;
|
||||
using IRaCIS.Core.Application.Filter;
|
||||
using IRaCIS.Core.Domain.Share;
|
||||
|
|
@ -19,18 +18,7 @@ namespace IRaCIS.Core.Application.Service
|
|||
IRepository<VisitPlanInfluenceStat> _visitPlanInfluenceStatRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IVisitPlanService
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 获取项目访视计划
|
||||
/// </summary>
|
||||
/// <param name="inDto"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<List<VisitStageDTO>> GetVisitStage(GetVisitStageInDto inDto)
|
||||
{
|
||||
var visitStageList = await _visitStageRepository.Where(x => x.TrialId == inDto.TrialId).ProjectTo<VisitStageDTO>(_mapper.ConfigurationProvider).OrderBy(x => x.VisitNum).ToListAsync(); ;
|
||||
|
||||
return visitStageList;
|
||||
}
|
||||
|
||||
|
||||
///暂时不用
|
||||
/// <summary> 获取项目访视计划</summary>
|
||||
|
|
|
|||
|
|
@ -3074,14 +3074,7 @@ public enum PET5PSScore
|
|||
/// </summary>
|
||||
FollowShow = 2,
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 排除部分访视
|
||||
/// </summary>
|
||||
|
||||
ExcludeSomeVisits = 3,
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 限制编辑
|
||||
|
|
|
|||
|
|
@ -226,11 +226,6 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
|
|||
[Comment("限制显示")]
|
||||
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
|
||||
|
||||
/// <summary>
|
||||
/// 排除显示的访视名称
|
||||
/// </summary>
|
||||
public List<decimal> ExcludeShowVisitList { get; set; } = new List<decimal>() { };
|
||||
|
||||
[MaxLength]
|
||||
[Comment("自定义计算标记")]
|
||||
public string CalculateQuestions { get; set; } = "[]";
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,29 +0,0 @@
|
|||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class ExcludeShowVisitList : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "ExcludeShowVisitList",
|
||||
table: "ReadingQuestionTrial",
|
||||
type: "nvarchar(max)",
|
||||
nullable: false,
|
||||
defaultValue: "[]");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "ExcludeShowVisitList",
|
||||
table: "ReadingQuestionTrial");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6274,10 +6274,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
|||
.HasColumnType("nvarchar(400)")
|
||||
.HasComment("字典code");
|
||||
|
||||
b.Property<string>("ExcludeShowVisitList")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<string>("ExportResultStr")
|
||||
.IsRequired()
|
||||
.HasMaxLength(400)
|
||||
|
|
|
|||
Loading…
Reference in New Issue