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

修改

Uat_Study
he 2022-10-09 15:01:09 +08:00
parent d3f4e024e8
commit 3898f1d63f
5 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -239,7 +239,7 @@ namespace IRaCIS.Application.Services
{ {
var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync(); var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
GetReadingToolOutDto result = new GetReadingToolOutDto(); GetReadingToolOutDto result = new GetReadingToolOutDto();
result.ReadingTool = await _trialRepository.Where(x => x.Id == visitTaskInfo.TrialId).Select(x => x.ReadingTool).FirstOrDefaultAsync(); result.ReadingTool = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == visitTaskInfo.TrialReadingCriterionId).Select(x => x.ReadingTool).FirstOrDefaultAsync();
return result; return result;
} }
@ -1353,15 +1353,15 @@ namespace IRaCIS.Application.Services
task.SubjectCode = visitTaskInfo.BlindSubjectCode.IsNullOrEmpty() ? task.SubjectCode : visitTaskInfo.BlindSubjectCode; task.SubjectCode = visitTaskInfo.BlindSubjectCode.IsNullOrEmpty() ? task.SubjectCode : visitTaskInfo.BlindSubjectCode;
var trialInfo = await _trialRepository.Where(x => x.Id == visitTaskInfo.TrialId).Select(x => new var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == visitTaskInfo.TrialReadingCriterionId).Select(x => new
{ {
x.IsReadingShowPreviousResults, x.IsReadingShowPreviousResults,
x.IsReadingShowSubjectInfo, x.IsReadingShowSubjectInfo,
x.ClinicalInformationTransmissionEnum,
}).FirstOrDefaultAsync(); }).FirstOrDefaultAsync();
task.IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults; task.IsReadingShowPreviousResults = criterionInfo.IsReadingShowPreviousResults;
task.IsReadingShowSubjectInfo = trialInfo.IsReadingShowSubjectInfo; task.IsReadingShowSubjectInfo = criterionInfo.IsReadingShowSubjectInfo;
@ -1397,11 +1397,19 @@ namespace IRaCIS.Application.Services
List<NoneDicomStudyView> result = await _noneDicomStudyRepository.Where(t => visitIds.Contains(t.SubjectVisitId)) List<NoneDicomStudyView> result = await _noneDicomStudyRepository.Where(t => visitIds.Contains(t.SubjectVisitId))
.ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }).ToListAsync(); .ProjectTo<NoneDicomStudyView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken }).ToListAsync();
var taskinfo=await _visitTaskRepository.Where(x=>x.Id==inDto.VisistTaskId).FirstNotNullAsync();
var trialInfo = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => new var trialInfo = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => new
{
x.ClinicalInformationTransmissionEnum,
}).FirstOrDefaultAsync();
var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskinfo.TrialReadingCriterionId).Select(x => new
{ {
x.IsReadingShowPreviousResults, x.IsReadingShowPreviousResults,
x.IsReadingShowSubjectInfo, x.IsReadingShowSubjectInfo,
x.ClinicalInformationTransmissionEnum,
}).FirstOrDefaultAsync(); }).FirstOrDefaultAsync();
#region 临床数据 #region 临床数据
@ -1429,8 +1437,8 @@ namespace IRaCIS.Application.Services
SubjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? task.SubjectCode : taskInfo.BlindSubjectCode, SubjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? task.SubjectCode : taskInfo.BlindSubjectCode,
ReadingCategory = task.ReadingCategory, ReadingCategory = task.ReadingCategory,
TaskBlindName = task.TaskBlindName, TaskBlindName = task.TaskBlindName,
IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults, IsReadingShowPreviousResults = criterionInfo.IsReadingShowPreviousResults,
IsReadingShowSubjectInfo = trialInfo.IsReadingShowSubjectInfo, IsReadingShowSubjectInfo = criterionInfo.IsReadingShowSubjectInfo,
IsExistsClinicalData = isExistsClinicalData, IsExistsClinicalData = isExistsClinicalData,
}); });
} }

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

@ -757,14 +757,14 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsSignSave { get; set; } = false; public bool IsSignSave { get; set; } = false;
} }
public class SetTrialReadingInfoInDto public class SetCriterionReadingInfoInDto
{ {
/// <summary> /// <summary>
/// 项目ID /// 项目标准ID
/// </summary> /// </summary>
public Guid TrialId { get; set; } public Guid TrialCriterionId { get; set; }
/// <summary> /// <summary>
/// 阅片工具 /// 阅片工具
@ -775,7 +775,7 @@ namespace IRaCIS.Core.Application.Contracts
/// <summary> /// <summary>
/// 阅片平台 /// 阅片平台
/// </summary> /// </summary>
public int ImagePlatform { get; set; } = 1; public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.MINT;
/// <summary> /// <summary>

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

@ -312,15 +312,15 @@ namespace IRaCIS.Core.Application
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<IResponseOutput> SetTrialReadingInfo(SetTrialReadingInfoInDto inDto) public async Task<IResponseOutput> SetCriterionReadingInfo(SetCriterionReadingInfoInDto inDto)
{ {
await _trialRepository.UpdatePartialFromQueryAsync(inDto.TrialId, x => new Trial() await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialCriterionId, x => new ReadingQuestionCriterionTrial()
{ {
ReadingTool=inDto.ReadingTool, ReadingTool=inDto.ReadingTool,
//DigitPlaces=inDto.DigitPlaces, //DigitPlaces=inDto.DigitPlaces,
IsReadingTaskViewInOrder=inDto.IsReadingTaskViewInOrder, IsReadingTaskViewInOrder=inDto.IsReadingTaskViewInOrder,
ReadingTaskViewEnum = inDto.ReadingTaskViewEnum, ReadingTaskViewEnum = inDto.ReadingTaskViewEnum,
IsImageIabeled = inDto.IsImageIabeled, //IsImageIabeled = inDto.IsImageIabeled,
IsReadingShowSubjectInfo = inDto.IsReadingShowSubjectInfo, IsReadingShowSubjectInfo = inDto.IsReadingShowSubjectInfo,
IsReadingShowPreviousResults = inDto.IsReadingShowPreviousResults, IsReadingShowPreviousResults = inDto.IsReadingShowPreviousResults,
ImagePlatform=inDto.ImagePlatform, ImagePlatform=inDto.ImagePlatform,

2
IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
View File

@ -171,7 +171,7 @@ namespace IRaCIS.Core.Domain.Models
public bool IsOncologyReading { get; set; } public bool IsOncologyReading { get; set; }
/// <summary> /// <summary>
/// 任务展示访视 /// 任务展示访视 读片任务显示是否顺序
/// </summary> /// </summary>
public bool IsReadingTaskViewInOrder { get; set; } = true; public bool IsReadingTaskViewInOrder { get; set; } = true;

66
IRaCIS.Core.Domain/Trial/Trial.cs
View File

@ -25,7 +25,7 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore] [JsonIgnore]
public List<TrialSiteSurvey> TrialSiteSurveyList { get; set; } = new List<TrialSiteSurvey>(); public List<TrialSiteSurvey> TrialSiteSurveyList { get; set; } = new List<TrialSiteSurvey>();
[JsonIgnore] [JsonIgnore]
public List<TrialDocument> TrialDocumentList { get; set; } public List<TrialDocument> TrialDocumentList { get; set; }
[JsonIgnore] [JsonIgnore]
public List<Enroll> EnrollList { get; set; } = new List<Enroll>(); public List<Enroll> EnrollList { get; set; } = new List<Enroll>();
@ -216,33 +216,33 @@ namespace IRaCIS.Core.Domain.Models
public bool IsSubjectSecondCodeView { get; set; } public bool IsSubjectSecondCodeView { get; set; }
/// <summary> ///// <summary>
/// 1 Mint、2 PACS ///// 1 Mint、2 PACS
/// </summary> ///// </summary>
public int ImagePlatform { get; set; } = 1; //public int ImagePlatform { get; set; } = 1;
//阅片方式 //阅片方式
public int ReadingMode { get; set; } = 1; public int ReadingMode { get; set; } = 1;
//阅片类型 ////阅片类型
public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; //public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
public bool IsGlobalReading { get; set; } = true; //public bool IsGlobalReading { get; set; } = true;
/// <summary> ///// <summary>
/// 仲裁阅片 ///// 仲裁阅片
/// </summary> ///// </summary>
public bool? IsArbitrationReading { get; set; } = true; //public bool? IsArbitrationReading { get; set; } = true;
public bool IsClinicalReading { get; set; } //public bool IsClinicalReading { get; set; }
/// <summary> ///// <summary>
/// 仲裁规则 ///// 仲裁规则
/// </summary> ///// </summary>
public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.None; //public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.None;
public int ChangeDefalutDays { get; set; } = 5; public int ChangeDefalutDays { get; set; } = 5;
@ -356,22 +356,22 @@ namespace IRaCIS.Core.Domain.Models
//后续全局自动分配默认状态 //后续全局自动分配默认状态
public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated;
//读片任务显示规则 ////读片任务显示规则
public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } //public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; }
//读片任务显示是否顺序 ////读片任务显示是否顺序
public bool IsReadingTaskViewInOrder { get; set; } = true; //public bool IsReadingTaskViewInOrder { get; set; } = true;
/// <summary> ///// <summary>
/// 阅片是否显示受试者信息 ///// 阅片是否显示受试者信息
/// </summary> ///// </summary>
public bool IsReadingShowSubjectInfo { get; set; } = false; //public bool IsReadingShowSubjectInfo { get; set; } = false;
/// <summary> ///// <summary>
/// 阅片是否显示既往结果 ///// 阅片是否显示既往结果
/// </summary> ///// </summary>
public bool IsReadingShowPreviousResults { get; set; } = false; //public bool IsReadingShowPreviousResults { get; set; } = false;
/// <summary> /// <summary>
@ -396,10 +396,10 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public DateTime? ReadingInfoSignTime { get; set; } public DateTime? ReadingInfoSignTime { get; set; }
/// <summary> ///// <summary>
/// 阅片工具 ///// 阅片工具
/// </summary> ///// </summary>
public ReadingTool? ReadingTool { get; set; } //public ReadingTool? ReadingTool { get; set; }
//public Guid? ReviewTypeId { get; set; } = Guid.Empty; //public Guid? ReviewTypeId { get; set; } = Guid.Empty;