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

IRC_NewDev
he 2024-05-16 13:59:12 +08:00
parent 3da3b9de45 a055d1c668
commit 963fbcb5e8
6 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
View File

@ -480,6 +480,8 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
/// </summary>
public string OpByUserName { get; set; } = string.Empty;
public string? CreateUserName { get; set; }
/// <summary>
/// 阅读片人
/// </summary>

2
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -195,6 +195,8 @@ namespace IRaCIS.Core.Application.Service.Inspection
.WhereIf(dto.ModuleType != null, x => x.ModuleTypeId == dto.ModuleType)
.WhereIf(!dto.Description.IsNullOrEmpty(), x => x.Description.Contains(dto.Description)|| x.DescriptionCN.Contains(dto.Description))
.WhereIf(!dto.OpByUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(dto.OpByUserName))
.WhereIf(!dto.CreateUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(dto.CreateUserName) || x.CreateUserRealName.Contains(dto.CreateUserName))
//.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
.WhereIf(dto.IsSign != null, x => x.IsSign == dto.IsSign);
#endregion

5
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
View File

@ -345,6 +345,8 @@ namespace IRaCIS.Core.Application.Contracts
public class GetTrialReadingInfoOutDto
{
public string TrialModalitys { get; set;}
/// <summary>
/// 项目ID
/// </summary>
@ -500,7 +502,7 @@ namespace IRaCIS.Core.Application.Contracts
public List<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List<TrialCriterionAdditionalAssessmentType>();
public string CriterionModalitys { get; set; }
}
@ -859,6 +861,7 @@ namespace IRaCIS.Core.Application.Contracts
public class SetCriterionReadingInfoInDto
{
public string CriterionModalitys { get; set; }
//是否附加评估
public bool IsAdditionalAssessment { get; set; }

4
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -178,7 +178,7 @@ namespace IRaCIS.Core.Application
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<GetTrialReadingInfoOutDto> GetCriterionReadingInfo(GetTrialReadingInfoInDto inDto)
public async Task<IResponseOutput<GetTrialReadingInfoOutDto> > GetCriterionReadingInfo(GetTrialReadingInfoInDto inDto)
{
GetTrialReadingInfoOutDto trialInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).ProjectTo<GetTrialReadingInfoOutDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
@ -191,7 +191,7 @@ namespace IRaCIS.Core.Application
trialInfo.TrialCriterionAdditionalAssessmentTypeList = await _trialCriterionAdditionalAssessmentTypeRepository.Where(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId).ToListAsync();
return trialInfo;
return ResponseOutput.Ok(trialInfo) ;
}
/// <summary>

3
IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
View File

@ -247,7 +247,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ReadingQuestionCriterionTrial, GetTrialReadingInfoOutDto>();
CreateMap<ReadingQuestionCriterionTrial, GetTrialReadingInfoOutDto>()
.ForMember(t => t.TrialModalitys, u => u.MapFrom(c => c.Trial.Modalitys));
CreateMap<ReadingQuestionTrial, TrialAdditionaQuestion>()

3
IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
View File

@ -127,6 +127,9 @@ namespace IRaCIS.Core.Domain.Models
#region 阅片单元配置 新加
public string CriterionModalitys { get; set; } = string.Empty;
/// <summary>
/// 阅片平台
/// </summary>