From 9f9bc9c7471100eaf8a48229348bacf54d32b723 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 16 May 2024 10:13:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Inspection/DTO/InspectionModel.cs | 2 ++ IRaCIS.Core.Application/Service/Inspection/InspectionService.cs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs index 1fe3ba77c..0f6b0fe2a 100644 --- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs +++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs @@ -480,6 +480,8 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO /// public string OpByUserName { get; set; } = string.Empty; + public string? CreateUserName { get; set; } + /// /// 阅读片人 /// diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index ad6e6268b..eeb6ce8c1 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -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 From a055d1c668f381abec683ef48ac656e2ce5a805f Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 16 May 2024 10:40:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs | 5 ++++- .../Service/TrialSiteUser/TrialConfigService.cs | 4 ++-- IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs | 3 ++- .../ReadingCriterion/ReadingQuestionCriterionTrial.cs | 3 +++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index a1a8022fa..814de05b7 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -345,6 +345,8 @@ namespace IRaCIS.Core.Application.Contracts public class GetTrialReadingInfoOutDto { + public string TrialModalitys { get; set;} + /// /// 项目ID /// @@ -500,7 +502,7 @@ namespace IRaCIS.Core.Application.Contracts public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); - + 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; } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 20b5dffd8..6e9765ed2 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -178,7 +178,7 @@ namespace IRaCIS.Core.Application /// /// [HttpPost] - public async Task GetCriterionReadingInfo(GetTrialReadingInfoInDto inDto) + public async Task > GetCriterionReadingInfo(GetTrialReadingInfoInDto inDto) { GetTrialReadingInfoOutDto trialInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).ProjectTo(_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) ; } /// diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs index 55300c875..9b8701c4e 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs @@ -247,7 +247,8 @@ namespace IRaCIS.Core.Application.Service - CreateMap(); + CreateMap() + .ForMember(t => t.TrialModalitys, u => u.MapFrom(c => c.Trial.Modalitys)); CreateMap() diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index 3dbecb37b..74fafa25e 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -127,6 +127,9 @@ namespace IRaCIS.Core.Domain.Models #region 阅片单元配置 新加 + + public string CriterionModalitys { get; set; } = string.Empty; + /// /// 阅片平台 ///