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

添加字段

Test_IRC_Net8
he 2025-08-07 11:46:26 +08:00
parent a267bc13b4
commit 90671b2c34
10 changed files with 20009 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -10916,6 +10916,11 @@
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
@ -11786,6 +11791,11 @@
分类显示类型 是否显示
</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>
高亮问题的答案
@ -14091,6 +14101,13 @@
计划外访视 获取受试者选择下拉框列表
</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>

9
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
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
@ -2423,6 +2426,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
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; }

8
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
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();
}

5
IRaCIS.Core.Application/Service/Visit/DTO/VisitPlanViewModel.cs
View File

@ -88,7 +88,10 @@ 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;

14
IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
View File

@ -1,4 +1,5 @@
using IRaCIS.Application.Contracts;
using DocumentFormat.OpenXml.Office2010.ExcelAc;
using IRaCIS.Application.Contracts;
using IRaCIS.Application.Interfaces;
using IRaCIS.Core.Application.Filter;
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
{
/// <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>

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

@ -3074,6 +3074,13 @@ public enum PET5PSScore
/// </summary>
FollowShow = 2,
/// <summary>
/// 排除部分访视
/// </summary>
ExcludeSomeVisits = 3,
}
/// <summary>

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

@ -226,6 +226,11 @@ 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; } = "[]";

19915
IRaCIS.Core.Infra.EFCore/Migrations/20250807034547_ExcludeShowVisitList.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

29
IRaCIS.Core.Infra.EFCore/Migrations/20250807034547_ExcludeShowVisitList.cs Normal file
View File

@ -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");
}
}
}

4
IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs
View File

@ -6274,6 +6274,10 @@ 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)