Uat_Study
parent
324a5e43f5
commit
d79005242e
|
@ -1371,10 +1371,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
|
|
||||||
public class GetTrialReadingQuestionOutDto
|
public class GetTrialReadingQuestionOutDto
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 字典code
|
||||||
|
/// </summary>
|
||||||
|
public string DictionaryCode { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 项目标准Id
|
/// 项目标准Id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -109,6 +109,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public class ReadingTableQuestionTrialAddOrEdit
|
public class ReadingTableQuestionTrialAddOrEdit
|
||||||
{
|
{
|
||||||
public Guid? Id { get; set; }
|
public Guid? Id { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 字典code
|
||||||
|
/// </summary>
|
||||||
|
public string DictionaryCode { get; set; } = string.Empty;
|
||||||
public Guid ReadingQuestionId { get; set; }
|
public Guid ReadingQuestionId { get; set; }
|
||||||
public string Type { get; set; } = string.Empty;
|
public string Type { get; set; } = string.Empty;
|
||||||
public Guid? ParentId { get; set; }
|
public Guid? ParentId { get; set; }
|
||||||
|
@ -157,6 +163,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public Guid? Id { get; set; }
|
public Guid? Id { get; set; }
|
||||||
public Guid ReadingQuestionId { get; set; }
|
public Guid ReadingQuestionId { get; set; }
|
||||||
public string Type { get; set; } = string.Empty;
|
public string Type { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 字典code
|
||||||
|
/// </summary>
|
||||||
|
public string DictionaryCode { get; set; } = string.Empty;
|
||||||
public Guid? ParentId { get; set; }
|
public Guid? ParentId { get; set; }
|
||||||
public string ParentTriggerValue { get; set; } = string.Empty;
|
public string ParentTriggerValue { get; set; } = string.Empty;
|
||||||
public string QuestionName { get; set; } = string.Empty;
|
public string QuestionName { get; set; } = string.Empty;
|
||||||
|
|
|
@ -606,6 +606,7 @@ namespace IRaCIS.Application.Services
|
||||||
ShowOrder = x.ShowOrder,
|
ShowOrder = x.ShowOrder,
|
||||||
GroupName = string.Empty,
|
GroupName = string.Empty,
|
||||||
Id = x.Id,
|
Id = x.Id,
|
||||||
|
DictionaryCode=x.DictionaryCode,
|
||||||
Type = x.Type,
|
Type = x.Type,
|
||||||
TableQuestionType = x.TableQuestionType,
|
TableQuestionType = x.TableQuestionType,
|
||||||
DependParentId = x.DependParentId,
|
DependParentId = x.DependParentId,
|
||||||
|
|
|
@ -241,8 +241,6 @@ namespace IRaCIS.Application.Services
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
public async Task<List<ReadingTableQuestionSystemView>> GetReadingTableQuestionSystemList(ReadingTableQuestionSystemQuery inDto)
|
public async Task<List<ReadingTableQuestionSystemView>> GetReadingTableQuestionSystemList(ReadingTableQuestionSystemQuery inDto)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
var readingTableQuestionSystemQueryable = _readingTableQuestionSystemRepository
|
var readingTableQuestionSystemQueryable = _readingTableQuestionSystemRepository
|
||||||
.WhereIf(inDto.TableQuestionType!=null,x=>x.TableQuestionType ==inDto.TableQuestionType!)
|
.WhereIf(inDto.TableQuestionType!=null,x=>x.TableQuestionType ==inDto.TableQuestionType!)
|
||||||
.Where(x=>x.ReadingQuestionId==inDto.ReadingQuestionId).ProjectTo<ReadingTableQuestionSystemView>(_mapper.ConfigurationProvider);
|
.Where(x=>x.ReadingQuestionId==inDto.ReadingQuestionId).ProjectTo<ReadingTableQuestionSystemView>(_mapper.ConfigurationProvider);
|
||||||
|
|
|
@ -16,9 +16,90 @@ namespace IRaCIS.Core.Domain.Share
|
||||||
public static readonly string Group = "group";
|
public static readonly string Group = "group";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 非把病灶状态
|
||||||
|
/// </summary>
|
||||||
|
public enum NoTargetState
|
||||||
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 模块枚举
|
/// 存在
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
Exist = 0,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 显著增大
|
||||||
|
/// </summary>
|
||||||
|
Increase = 1,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 无法评估
|
||||||
|
/// </summary>
|
||||||
|
UnableEvaluate = 2,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 消失
|
||||||
|
/// </summary>
|
||||||
|
Loss = 3
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 新病灶状态
|
||||||
|
/// </summary>
|
||||||
|
public enum NewLesionState
|
||||||
|
{
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 存在
|
||||||
|
/// </summary>
|
||||||
|
Exist = 0,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 疑似
|
||||||
|
/// </summary>
|
||||||
|
Suspected = 1,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 无法评估
|
||||||
|
/// </summary>
|
||||||
|
UnableEvaluate = 2,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 消失
|
||||||
|
/// </summary>
|
||||||
|
Loss = 3
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 靶病灶状态
|
||||||
|
/// </summary>
|
||||||
|
public enum TargetState
|
||||||
|
{
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 存在
|
||||||
|
/// </summary>
|
||||||
|
Exist = 0,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 太小
|
||||||
|
/// </summary>
|
||||||
|
TooSmall = 1,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 无法评估
|
||||||
|
/// </summary>
|
||||||
|
UnableEvaluate = 2,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 消失
|
||||||
|
/// </summary>
|
||||||
|
Loss = 3
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 模块枚举
|
||||||
|
/// </summary>
|
||||||
public enum ModuleTypeEnum
|
public enum ModuleTypeEnum
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -132,6 +132,11 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public QuestionMark? QuestionMark { get; set; }
|
public QuestionMark? QuestionMark { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 字典code
|
||||||
|
/// </summary>
|
||||||
|
public string DictionaryCode { get; set; }
|
||||||
|
|
||||||
[ForeignKey("DependParentId")]
|
[ForeignKey("DependParentId")]
|
||||||
public ReadingTableQuestionSystem DependParentQuestion { get; set; }
|
public ReadingTableQuestionSystem DependParentQuestion { get; set; }
|
||||||
}
|
}
|
||||||
|
|
|
@ -136,7 +136,13 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public QuestionMark? QuestionMark { get; set; }
|
public QuestionMark? QuestionMark { get; set; }
|
||||||
|
|
||||||
[JsonIgnore]
|
|
||||||
|
/// <summary>
|
||||||
|
/// 字典code
|
||||||
|
/// </summary>
|
||||||
|
public string DictionaryCode { get; set; }
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
[ForeignKey("DependParentId")]
|
[ForeignKey("DependParentId")]
|
||||||
public ReadingTableQuestionTrial DependParentQuestion { get; set; }
|
public ReadingTableQuestionTrial DependParentQuestion { get; set; }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue