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

修改一版

Uat_Study
he 2022-07-13 09:13:42 +08:00
parent 2d6d344be7
commit a273238d59
6 changed files with 126 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

@ -30,6 +30,19 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 是否启用
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
/// 表单类型
/// </summary>
public FormType FormType { get; set; }
/// <summary>
/// 修约小数点
/// </summary>
public int? DigitPlaces { get; set; } = 2;
}
@ -608,6 +621,20 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public bool IsBeUsed { get; set; } = false;
/// <summary>
/// 表单类型
/// </summary>
public FormType FormType { get; set; }
/// <summary>
/// 修约小数点
/// </summary>
public int? DigitPlaces { get; set; } = 2;
/// <summary>
/// 是否是系统数据
/// </summary>

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

@ -292,66 +292,84 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 阅片方式
/// </summary>
public int ReadingMode { get; set; } = 1;
/// <summary>
/// 阅片平台
/// </summary>
public int ImagePlatform { get; set; } = 1;
/// <summary>
/// 全局阅片
/// </summary>
public bool IsGlobalReading { get; set; } = true;
/// <summary>
/// 仲裁规则
/// </summary>
public int ArbitrationRule { get; set; } = 2;
/// <summary>
/// 阅片模式
/// </summary>
public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
/// <summary>
/// 仲裁阅片
/// </summary>
public bool? IsArbitrationReading { get; set; } = true;
/// <summary>
/// 肿瘤学阅片
/// </summary>
public bool IsClinicalReading { get; set; }
/// <summary>
/// 读片任务显示是否顺序
/// </summary>
public bool IsReadingTaskViewInOrder { get; set; } = true;
/// <summary>
/// 任务组织级别
/// </summary>
public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; }
/// <summary>
/// 图像是否有标注
/// 影像是否有标注
/// </summary>
public bool IsImageStandard { get; set; }
/// <summary>
/// 阅片是否显示受试者信息
/// IR阅片是否显示受试者信息
/// </summary>
public bool IsReadingShowSubjectInfo { get; set; } = false;
/// <summary>
/// 阅片是否显示既往结果
/// IR阅片是否显示既往结果
/// </summary>
public bool IsReadingShowPreviousResults { get; set; } = false;
/// <summary>
/// 修约小数点
/// </summary>
public int? DigitPlaces { get; set; } = 2;
/// <summary>
/// 仲裁规则/对象
/// </summary>
public int ArbitrationRule { get; set; } = 2;
///// <summary>
///// 全局阅片
///// </summary>
//public bool IsGlobalReading { get; set; } = true;
///// <summary>
///// 阅片方式
///// </summary>
//public int ReadingMode { get; set; } = 1;
///// <summary>
///// 阅片模式
///// </summary>
//public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
///// <summary>
///// 仲裁阅片
///// </summary>
//public bool? IsArbitrationReading { get; set; } = true;
///// <summary>
///// 肿瘤学阅片
///// </summary>
//public bool IsClinicalReading { get; set; }
///// <summary>
///// 读片任务显示是否顺序
///// </summary>
//public bool IsReadingTaskViewInOrder { get; set; } = true;
/// <summary>
/// 项目标准集合
/// </summary>
@ -415,63 +433,43 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 阅片方式
/// </summary>
public int ReadingMode { get; set; } = 1;
/// <summary>
/// 阅片平台
/// </summary>
public int ImagePlatform { get; set; } = 1;
/// <summary>
/// 全局阅片
/// </summary>
public bool IsGlobalReading { get; set; } = true;
/// <summary>
/// 阅片模式
/// </summary>
public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
/// <summary>
/// 仲裁阅片
/// </summary>
public bool? IsArbitrationReading { get; set; } = true;
/// <summary>
/// 肿瘤学阅片
/// </summary>
public bool IsClinicalReading { get; set; }
/// <summary>
/// 读片任务显示是否顺序
/// </summary>
public bool IsReadingTaskViewInOrder { get; set; } = true;
/// <summary>
/// 任务组织级别
/// </summary>
public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; }
/// <summary>
/// 图像是否有标注
/// 影像是否有标注
/// </summary>
public bool IsImageStandard { get; set; }
/// <summary>
/// 阅片是否显示受试者信息
/// IR阅片是否显示受试者信息
/// </summary>
public bool IsReadingShowSubjectInfo { get; set; } = false;
/// <summary>
/// 阅片是否显示既往结果
/// IR阅片是否显示既往结果
/// </summary>
public bool IsReadingShowPreviousResults { get; set; } = false;
/// <summary>
/// 仲裁规则
/// 修约小数点
/// </summary>
public int? DigitPlaces { get; set; } = 2;
/// <summary>
/// 仲裁规则/对象
/// </summary>
public int ArbitrationRule { get; set; } = 2;
}

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

@ -81,18 +81,14 @@ namespace IRaCIS.Core.Application
{
await _trialRepository.UpdatePartialFromQueryAsync(inDto.TrialId, x => new Trial()
{
ReadingMode = inDto.ReadingMode,
ReadingType = inDto.ReadingType,
IsArbitrationReading = inDto.IsArbitrationReading,
IsReadingTaskViewInOrder = inDto.IsReadingTaskViewInOrder,
DigitPlaces=inDto.DigitPlaces,
ReadingTaskViewEnum = inDto.ReadingTaskViewEnum,
IsImageStandard = inDto.IsImageStandard,
IsReadingShowSubjectInfo = inDto.IsReadingShowSubjectInfo,
IsReadingShowPreviousResults = inDto.IsReadingShowPreviousResults,
IsGlobalReading = inDto.IsGlobalReading,
ImagePlatform=inDto.ImagePlatform,
ArbitrationRule=inDto.ArbitrationRule,
IsClinicalReading =inDto.IsClinicalReading,
});
var result = await _trialRepository.SaveChangesAsync();

17
IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs
View File

@ -171,6 +171,23 @@ namespace IRaCIS.Core.Domain.Share
SubjectVisit = 1
}
public enum FormType
{
None=0,
/// <summary>
/// 单页
/// </summary>
SinglePage=1,
/// <summary>
/// 多页
/// </summary>
MultiplePage = 2,
}
//分配默认状态
public enum TaskAllocateDefaultState
{

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

@ -59,6 +59,18 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public bool IsConfirm { get; set; }
/// <summary>
/// 表单类型
/// </summary>
public FormType FormType { get; set; }
/// <summary>
/// 修约小数点
/// </summary>
public int? DigitPlaces { get; set; } = 2;
/// <summary>
/// 项目
/// </summary>

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

@ -374,6 +374,8 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public bool IsImageStandard { get; set; }
//public Guid? ReviewTypeId { get; set; } = Guid.Empty;