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
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;
+
///
/// 阅片平台
///