添加字段
parent
a267bc13b4
commit
90671b2c34
|
@ -10916,6 +10916,11 @@
|
||||||
Parent字典code
|
Parent字典code
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</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">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ReadingQuestionCriterionTrialId">
|
||||||
<summary>
|
<summary>
|
||||||
系统标准Id
|
系统标准Id
|
||||||
|
@ -11786,6 +11791,11 @@
|
||||||
分类显示类型 是否显示
|
分类显示类型 是否显示
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</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">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.HighlightAnswer">
|
||||||
<summary>
|
<summary>
|
||||||
高亮问题的答案
|
高亮问题的答案
|
||||||
|
@ -14091,6 +14101,13 @@
|
||||||
计划外访视 获取受试者选择下拉框列表
|
计划外访视 获取受试者选择下拉框列表
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</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)">
|
<member name="M:IRaCIS.Core.Application.Service.VisitPlanService.GetTrialVisitStageList(IRaCIS.Application.Contracts.VisitPlanQueryDTO)">
|
||||||
暂时不用
|
暂时不用
|
||||||
<summary> 获取项目访视计划</summary>
|
<summary> 获取项目访视计划</summary>
|
||||||
|
|
|
@ -1040,7 +1040,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
|
|
||||||
public List<string> HighlightAnswerList { get; set; } = new List<string>();
|
public List<string> HighlightAnswerList { get; set; } = new List<string>();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 排除显示的访视名称
|
||||||
|
/// </summary>
|
||||||
|
public List<decimal> ExcludeShowVisitList { get; set; } = new List<decimal>() { };
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 系统标准Id
|
/// 系统标准Id
|
||||||
|
@ -2423,6 +2426,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public List<ExportResult> ExportResult { get; set; } = new List<ExportResult>();
|
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; }
|
public bool IsAdditional { get; set; }
|
||||||
|
|
||||||
|
|
|
@ -1064,12 +1064,12 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
if (taskinfo.VisitTaskNum == 0)
|
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
|
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 =>
|
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();
|
taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
|
||||||
if (taskInfo.VisitTaskNum == 0)
|
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
|
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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,10 @@ namespace IRaCIS.Application.Contracts
|
||||||
public bool IsDeleted { get; set; }
|
public bool IsDeleted { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class GetVisitStageInDto
|
||||||
|
{
|
||||||
|
public Guid TrialId { get; set; } = Guid.Empty;
|
||||||
|
}
|
||||||
public class VisitPlanQueryDTO : PageInput
|
public class VisitPlanQueryDTO : PageInput
|
||||||
{
|
{
|
||||||
public Guid TrialId { get; set; } = Guid.Empty;
|
public Guid TrialId { get; set; } = Guid.Empty;
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
using IRaCIS.Application.Contracts;
|
using DocumentFormat.OpenXml.Office2010.ExcelAc;
|
||||||
|
using IRaCIS.Application.Contracts;
|
||||||
using IRaCIS.Application.Interfaces;
|
using IRaCIS.Application.Interfaces;
|
||||||
using IRaCIS.Core.Application.Filter;
|
using IRaCIS.Core.Application.Filter;
|
||||||
using IRaCIS.Core.Domain.Share;
|
using IRaCIS.Core.Domain.Share;
|
||||||
|
@ -18,7 +19,18 @@ namespace IRaCIS.Core.Application.Service
|
||||||
IRepository<VisitPlanInfluenceStat> _visitPlanInfluenceStatRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IVisitPlanService
|
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>
|
/// <summary> 获取项目访视计划</summary>
|
||||||
|
|
|
@ -3074,7 +3074,14 @@ public enum PET5PSScore
|
||||||
/// </summary>
|
/// </summary>
|
||||||
FollowShow = 2,
|
FollowShow = 2,
|
||||||
|
|
||||||
}
|
|
||||||
|
/// <summary>
|
||||||
|
/// 排除部分访视
|
||||||
|
/// </summary>
|
||||||
|
|
||||||
|
ExcludeSomeVisits = 3,
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 限制编辑
|
/// 限制编辑
|
||||||
|
|
|
@ -226,6 +226,11 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
|
||||||
[Comment("限制显示")]
|
[Comment("限制显示")]
|
||||||
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
|
public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 排除显示的访视名称
|
||||||
|
/// </summary>
|
||||||
|
public List<decimal> ExcludeShowVisitList { get; set; } = new List<decimal>() { };
|
||||||
|
|
||||||
[MaxLength]
|
[MaxLength]
|
||||||
[Comment("自定义计算标记")]
|
[Comment("自定义计算标记")]
|
||||||
public string CalculateQuestions { get; set; } = "[]";
|
public string CalculateQuestions { get; set; } = "[]";
|
||||||
|
|
19915
IRaCIS.Core.Infra.EFCore/Migrations/20250807034547_ExcludeShowVisitList.Designer.cs
generated
Normal file
19915
IRaCIS.Core.Infra.EFCore/Migrations/20250807034547_ExcludeShowVisitList.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,29 @@
|
||||||
|
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,6 +6274,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
.HasColumnType("nvarchar(400)")
|
.HasColumnType("nvarchar(400)")
|
||||||
.HasComment("字典code");
|
.HasComment("字典code");
|
||||||
|
|
||||||
|
b.Property<string>("ExcludeShowVisitList")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("nvarchar(max)");
|
||||||
|
|
||||||
b.Property<string>("ExportResultStr")
|
b.Property<string>("ExportResultStr")
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasMaxLength(400)
|
.HasMaxLength(400)
|
||||||
|
|
Loading…
Reference in New Issue