XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一版

Test.EIImageViewer
he 2022-06-16 13:40:59 +08:00
parent 8b3e75b2a1
commit 9a1ddb8450
7 changed files with 182 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -1584,6 +1584,11 @@
阅片期名称 阅片期名称
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto.ShowOrder">
<summary>
排序
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto.CriterionName"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto.CriterionName">
<summary> <summary>
标准 标准
@ -1614,6 +1619,11 @@
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CriterionList.ShowOrder">
<summary>
排序
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialViewInDto"> <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialViewInDto">
<summary> <summary>
@ -1659,6 +1669,11 @@
类型值 类型值
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.IsJudgeQuestion">
<summary>
是否是裁判问题
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.Id"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.Id">
<summary> <summary>
Id Id
@ -1704,6 +1719,11 @@
类型值 类型值
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.IsJudgeQuestion">
<summary>
是否是裁判问题
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialViewInDto.ReadingQuestionCriterionTrialId"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialViewInDto.ReadingQuestionCriterionTrialId">
<summary> <summary>
系统标准Id 系统标准Id
@ -1804,6 +1824,11 @@
父问题ID 父问题ID
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.IsJudgeQuestion">
<summary>
是否是裁判问题
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.TypeValue"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.TypeValue">
<summary> <summary>
类型值 类型值
@ -1819,6 +1844,11 @@
系统标准Id 系统标准Id
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.IsJudgeQuestion">
<summary>
是否是裁判问题
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.Type"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.Type">
<summary> <summary>
类型 类型
@ -1874,6 +1904,11 @@
是否启用 是否启用
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionSystemView.IsCompleteConfig">
<summary>
是否完成配置
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialView.Id"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialView.Id">
<summary> <summary>
返回的对象 返回的对象
@ -1894,6 +1929,11 @@
是否启用 是否启用
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialView.IsCompleteConfig">
<summary>
是否完成配置
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialView.IsSystemData"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialView.IsSystemData">
<summary> <summary>
是否是系统数据 是否是系统数据
@ -4244,9 +4284,9 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.SetSystemReadingQuestionCriterionIsIsEnable(IRaCIS.Core.Application.Service.Reading.Dto.SetSystemReadingQuestionCriterionIsIsEnable)"> <member name="M:IRaCIS.Application.Services.ReadingQuestionService.SetSystemReadingQuestionCriterionIsCompleteConfig(IRaCIS.Core.Application.Service.Reading.Dto.SetSystemReadingQuestionCriterionIsIsCompleteConfig)">
<summary> <summary>
设置系统问题标准是否生效 设置系统问题标准是否完成配置
</summary> </summary>
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
@ -4317,9 +4357,9 @@
<param name="indto"></param> <param name="indto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Application.Services.ReadingQuestionService.SetTrialReadingQuestionCriterionIsIsEnable(IRaCIS.Core.Application.Service.Reading.Dto.SetSystemReadingQuestionCriterionIsIsEnable)"> <member name="M:IRaCIS.Application.Services.ReadingQuestionService.SetTrialReadingQuestionCriterionIsIsCompleteConfig(IRaCIS.Core.Application.Service.Reading.Dto.SetSystemReadingQuestionCriterionIsIsCompleteConfig)">
<summary> <summary>
设置项目标准是否生效 设置项目标准是否完成配置
</summary> </summary>
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>

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

@ -15,6 +15,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
[NotDefault] [NotDefault]
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
/// <summary>
/// 排序
/// </summary>
public int ShowOrder { get; set; }
/// <summary> /// <summary>
/// 标准 /// 标准
/// </summary> /// </summary>
@ -59,6 +64,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid Id { get; set; } public Guid Id { get; set; }
public string Value { get; set; } public string Value { get; set; }
/// <summary>
/// 排序
/// </summary>
public int ShowOrder { get; set; }
} }
public class SetSystemReadingQuestionCriterionIsIsEnable public class SetSystemReadingQuestionCriterionIsIsEnable
@ -70,6 +80,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
} }
public class SetSystemReadingQuestionCriterionIsIsCompleteConfig
{
[NotDefault]
public Guid Id { get; set; }
public bool IsCompleteConfig { get; set; }
}
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
@ -133,6 +153,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
public string ParentQuestionName { get; set; } public string ParentQuestionName { get; set; }
/// <summary>
/// 是否是裁判问题
/// </summary>
public bool IsJudgeQuestion { get; set; }
} }
public class ReadingQuestionSystemView public class ReadingQuestionSystemView
@ -185,7 +210,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public string TypeValue { get; set; } public string TypeValue { get; set; }
public bool IsEnable { get; set; } //public bool IsEnable { get; set; }
/// <summary>
/// 是否是裁判问题
/// </summary>
public bool IsJudgeQuestion { get; set; }
} }
@ -322,6 +352,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public Guid? ParentId { get; set; } public Guid? ParentId { get; set; }
/// <summary>
/// 是否是裁判问题
/// </summary>
public bool IsJudgeQuestion { get; set; } = false;
/// <summary> /// <summary>
/// 类型值 /// 类型值
@ -348,6 +383,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public Guid ReadingQuestionCriterionTrialId { get; set; } public Guid ReadingQuestionCriterionTrialId { get; set; }
/// <summary>
/// 是否是裁判问题
/// </summary>
public bool IsJudgeQuestion { get; set; } = false;
/// <summary> /// <summary>
/// 类型 /// 类型
/// </summary> /// </summary>
@ -405,11 +445,18 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public string CriterionName { get; set; } public string CriterionName { get; set; }
public int ShowOrder { get; set; }
/// <summary> /// <summary>
/// 是否启用 /// 是否启用
/// </summary> /// </summary>
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
/// <summary>
/// 是否完成配置
/// </summary>
public bool IsCompleteConfig { get; set; }
public int QuestionCount { get; set; } public int QuestionCount { get; set; }
} }
@ -436,6 +483,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
/// <summary>
/// 是否完成配置
/// </summary>
public bool IsCompleteConfig { get; set; }
public int QuestionCount { get; set; } public int QuestionCount { get; set; }
/// <summary> /// <summary>

64
IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
View File

@ -77,21 +77,45 @@ namespace IRaCIS.Application.Services
await AddSystemQuestionCriterion(); await AddSystemQuestionCriterion();
var query= _readingQuestionCriterionSystemRepository.AsQueryable() var query= _readingQuestionCriterionSystemRepository.AsQueryable()
.WhereIf(!inDto.CriterionName.IsNullOrEmpty(), x => x.CriterionName.Contains(inDto.CriterionName)) .WhereIf(!inDto.CriterionName.IsNullOrEmpty(), x => x.CriterionName.Contains(inDto.CriterionName))
.ProjectTo<ReadingQuestionCriterionSystemView>(_mapper.ConfigurationProvider); .ProjectTo<ReadingQuestionCriterionSystemView>(_mapper.ConfigurationProvider)
return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? nameof(ReadingQuestionCriterionSystemView.CriterionName) : inDto.SortField, .Where(x=>x.IsEnable);
return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField.IsNullOrEmpty() ? nameof(ReadingQuestionCriterionSystemView.ShowOrder) : inDto.SortField,
inDto.Asc); inDto.Asc);
} }
///// <summary>
///// 设置系统问题标准是否生效
///// </summary>
///// <param name="inDto"></param>
///// <returns></returns>
//public async Task<IResponseOutput> SetSystemReadingQuestionCriterionIsIsEnable(SetSystemReadingQuestionCriterionIsIsEnable inDto)
//{
// await _readingQuestionCriterionSystemRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingQuestionCriterionSystem()
// {
// IsEnable = inDto.IsEnable
// });
// var result =await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
// return ResponseOutput.Ok(result);
//}
/// <summary> /// <summary>
/// 设置系统问题标准是否生效 /// 设置系统问题标准是否完成配置
/// </summary> /// </summary>
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
public async Task<IResponseOutput> SetSystemReadingQuestionCriterionIsIsEnable(SetSystemReadingQuestionCriterionIsIsEnable inDto) public async Task<IResponseOutput> SetSystemReadingQuestionCriterionIsCompleteConfig(SetSystemReadingQuestionCriterionIsIsCompleteConfig inDto)
{ {
if (!inDto.IsCompleteConfig && await _readingQuestionCriterionTrialRepository.AnyAsync(x => x.ReadingQuestionCriterionSystemId == inDto.Id))
{
ResponseOutput.NotOk("当前标准已经运用到项目,操作失败");
}
await _readingQuestionCriterionSystemRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingQuestionCriterionSystem() await _readingQuestionCriterionSystemRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingQuestionCriterionSystem()
{ {
IsEnable = inDto.IsEnable IsCompleteConfig = inDto.IsCompleteConfig
}); });
var result = await _readingQuestionCriterionSystemRepository.SaveChangesAsync(); var result = await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
@ -99,6 +123,7 @@ namespace IRaCIS.Application.Services
return ResponseOutput.Ok(result); return ResponseOutput.Ok(result);
} }
/// <summary> /// <summary>
/// 添加系统qc问题标准 /// 添加系统qc问题标准
/// </summary> /// </summary>
@ -112,7 +137,8 @@ namespace IRaCIS.Application.Services
.Select(x => new CriterionList() .Select(x => new CriterionList()
{ {
Id = x.Id, Id = x.Id,
Value = x.Value Value = x.Value,
ShowOrder=x.ShowOrder,
}).ToListAsync(); }).ToListAsync();
List<ReadingQuestionCriterionSystem> needAddCriterionList = new List<ReadingQuestionCriterionSystem>(); List<ReadingQuestionCriterionSystem> needAddCriterionList = new List<ReadingQuestionCriterionSystem>();
criterionList.ForEach(x => criterionList.ForEach(x =>
@ -120,6 +146,7 @@ namespace IRaCIS.Application.Services
needAddCriterionList.Add(new ReadingQuestionCriterionSystem() needAddCriterionList.Add(new ReadingQuestionCriterionSystem()
{ {
CriterionId = x.Id, CriterionId = x.Id,
ShowOrder=x.ShowOrder,
CriterionName = x.Value, CriterionName = x.Value,
IsEnable = false, IsEnable = false,
}); });
@ -222,7 +249,7 @@ namespace IRaCIS.Application.Services
{ {
var trialUsrSystemIds = _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId && x.ReadingQuestionCriterionSystemId != null) var trialUsrSystemIds = _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId && x.ReadingQuestionCriterionSystemId != null)
.Select(x => x.ReadingQuestionCriterionSystemId); .Select(x => x.ReadingQuestionCriterionSystemId);
var needAddSystemDataList = await _readingQuestionCriterionSystemRepository.Where(x => !trialUsrSystemIds.Contains(x.Id)&&x.IsEnable).Include(x=>x.ReadingQuestionSystemList).ToListAsync(); var needAddSystemDataList = await _readingQuestionCriterionSystemRepository.Where(x => !trialUsrSystemIds.Contains(x.Id)&&x.IsCompleteConfig).Include(x=>x.ReadingQuestionSystemList).ToListAsync();
List<ReadingQuestionCriterionTrial> needAddCriterionList = new List<ReadingQuestionCriterionTrial>(); List<ReadingQuestionCriterionTrial> needAddCriterionList = new List<ReadingQuestionCriterionTrial>();
List<ReadingQuestionTrial> needAddQuestionList = new List<ReadingQuestionTrial>(); List<ReadingQuestionTrial> needAddQuestionList = new List<ReadingQuestionTrial>();
needAddSystemDataList.ForEach(x => needAddSystemDataList.ForEach(x =>
@ -329,16 +356,33 @@ namespace IRaCIS.Application.Services
} }
///// <summary>
///// 设置项目标准是否生效
///// </summary>
///// <param name="inDto"></param>
///// <returns></returns>
//public async Task<IResponseOutput> SetTrialReadingQuestionCriterionIsIsEnable(SetSystemReadingQuestionCriterionIsIsEnable inDto)
//{
// await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingQuestionCriterionTrial()
// {
// IsEnable = inDto.IsEnable
// });
// var result = await _readingQuestionCriterionTrialRepository.SaveChangesAsync();
// return ResponseOutput.Ok(result);
//}
/// <summary> /// <summary>
/// 设置项目标准是否生效 /// 设置项目标准是否完成配置
/// </summary> /// </summary>
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
public async Task<IResponseOutput> SetTrialReadingQuestionCriterionIsIsEnable(SetSystemReadingQuestionCriterionIsIsEnable inDto) public async Task<IResponseOutput> SetTrialReadingQuestionCriterionIsIsCompleteConfig(SetSystemReadingQuestionCriterionIsIsCompleteConfig inDto)
{ {
await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingQuestionCriterionTrial() await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingQuestionCriterionTrial()
{ {
IsEnable = inDto.IsEnable IsCompleteConfig = inDto.IsCompleteConfig
}); });
var result = await _readingQuestionCriterionTrialRepository.SaveChangesAsync(); var result = await _readingQuestionCriterionTrialRepository.SaveChangesAsync();

4
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -52,7 +52,9 @@ namespace IRaCIS.Core.Application.Service
#region 阅片问题 #region 阅片问题
CreateMap<AddOrUpdateReadingQuestionCriterionSystemInDto, ReadingQuestionCriterionSystem>(); CreateMap<AddOrUpdateReadingQuestionCriterionSystemInDto, ReadingQuestionCriterionSystem>();
CreateMap<ReadingQuestionCriterionSystem, ReadingQuestionCriterionSystemView>() CreateMap<ReadingQuestionCriterionSystem, ReadingQuestionCriterionSystemView>()
.ForMember(d => d.QuestionCount, u => u.MapFrom(s => s.ReadingQuestionSystemList.Count())); .ForMember(d => d.QuestionCount, u => u.MapFrom(s => s.ReadingQuestionSystemList.Count()))
.ForMember(d => d.IsEnable, u => u.MapFrom(s => s.Dictionary.IsEnable))
.ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.Dictionary.ShowOrder));
CreateMap<AddOrUpdateReadingQuestionSystemInDto, ReadingQuestionSystem>(); CreateMap<AddOrUpdateReadingQuestionSystemInDto, ReadingQuestionSystem>();

13
IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs
View File

@ -30,6 +30,16 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
/// <summary>
/// 排序
/// </summary>
public int ShowOrder { get; set; }
/// <summary>
/// 是否完成配置
/// </summary>
public bool IsCompleteConfig { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
@ -40,10 +50,9 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public Guid CreateUserId { get; set; } public Guid CreateUserId { get; set; }
[ForeignKey("CriterionId")]
public List<ReadingQuestionSystem> ReadingQuestionSystemList { get; set; } = new List<ReadingQuestionSystem>(); public List<ReadingQuestionSystem> ReadingQuestionSystemList { get; set; } = new List<ReadingQuestionSystem>();
[ForeignKey("CriterionId")]
public Dictionary Dictionary { get; set; } public Dictionary Dictionary { get; set; }
} }

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

@ -35,6 +35,16 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
/// <summary>
/// 排序
/// </summary>
public int ShowOrder { get; set; }
/// <summary>
/// 是否完成配置
/// </summary>
public bool IsCompleteConfig { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>

5
IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
View File

@ -65,6 +65,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary>
/// 是否是裁判问题
/// </summary>
public bool IsJudgeQuestion { get; set; }
/// <summary> /// <summary>
/// 创建人 /// 创建人
/// </summary> /// </summary>