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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
hang
2025-08-07 15:10:54 +08:00
parent 48d48b343e 6987dd075f
commit a13917bded
10 changed files with 20011 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+17
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>
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+9 -2
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
@@ -2421,9 +2424,13 @@ 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>
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+6 -5
View File
@@ -1062,16 +1062,17 @@ namespace IRaCIS.Core.Application.Service
var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
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 && !x.ExcludeShowVisitList.Contains(taskInfo.VisitTaskNum))).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 && !x.ExcludeShowVisitList.Contains(taskInfo.VisitTaskNum))).ToList();
}
questions.ForEach(x =>
{
x.CrterionDictionaryGroup = ReadingCommon.GetCrterionDictionaryGroup(taskinfo.IsConvertedTask);
@@ -1342,12 +1343,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&&!x.ExcludeShowVisitList.Contains(taskInfo.VisitTaskNum))).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 && !x.ExcludeShowVisitList.Contains(taskInfo.VisitTaskNum))).ToList();
}
IRaCIS.Core.Application/Service/Visit/DTO/VisitPlanViewModel.cs
+4 -1
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;
IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
+14 -2
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>