diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 1b07a24f9..9f5051e4e 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2071,6 +2071,9 @@
阅片期名称
+
+ PageName
+
排序
@@ -2086,6 +2089,16 @@
是否启用
+
+
+ 表单类型
+
+
+
+
+ 修约小数点
+
+
标准ID
@@ -2171,6 +2184,11 @@
是否是裁判问题
+
+
+ 标准分页Id
+
+
Id
@@ -2506,6 +2524,16 @@
是否完成配置
+
+
+ 表单类型
+
+
+
+
+ 修约小数点
+
+
是否是系统数据
@@ -3791,46 +3819,11 @@
项目ID
-
-
- 阅片方式
-
-
阅片平台
-
-
- 全局阅片
-
-
-
-
- 仲裁规则
-
-
-
-
- 阅片模式
-
-
-
-
- 仲裁阅片
-
-
-
-
- 肿瘤学阅片
-
-
-
-
- 读片任务显示是否顺序
-
-
任务组织级别
@@ -3838,22 +3831,37 @@
- 图像是否有标注
+ 影像是否有标注
- 阅片是否显示受试者信息
+ IR阅片是否显示受试者信息
- 阅片是否显示既往结果
+ IR阅片是否显示既往结果
-
+
- 项目标准集合
+ 修约小数点
+
+
+
+
+ 仲裁规则/对象
+
+
+
+
+ 项目标准Id
+
+
+
+
+ 项目分页
@@ -3861,6 +3869,111 @@
项目裁判问题集合
+
+
+ 项目问题集合
+
+
+
+
+ 项目ID
+
+
+
+
+ 分页名称
+
+
+
+
+ 是否启用
+
+
+
+
+ 创建时间
+
+
+
+
+ 创建用户ID
+
+
+
+
+ 排序
+
+
+
+
+ 分页名称
+
+
+
+
+ 问题名称
+
+
+
+
+ 类型
+
+
+
+
+ 父问题触发
+
+
+
+
+ 父问题名称
+
+
+
+
+ 是否是必须
+
+
+
+
+ 类型值
+
+
+
+
+ 是否启用
+
+
+
+
+ 是否是裁判问题
+
+
+
+
+ 备注
+
+
+
+
+ 分组
+
+
+
+
+ 答案分组
+
+
+
+
+ 答案组合
+
+
+
+
+ 裁判类型
+
+
问题名称
@@ -3891,41 +4004,11 @@
项目ID
-
-
- 阅片方式
-
-
阅片平台
-
-
- 全局阅片
-
-
-
-
- 阅片模式
-
-
-
-
- 仲裁阅片
-
-
-
-
- 肿瘤学阅片
-
-
-
-
- 读片任务显示是否顺序
-
-
任务组织级别
@@ -3933,22 +4016,22 @@
- 图像是否有标注
+ 影像是否有标注
- 阅片是否显示受试者信息
+ IR阅片是否显示受试者信息
- 阅片是否显示既往结果
+ IR阅片是否显示既往结果
- 仲裁规则
+ 仲裁规则/对象
@@ -5609,6 +5692,20 @@
阅片问题.标准
+
+
+ 新增修改项目标准分页
+
+
+
+
+
+
+ 删除标准分页
+
+
+
+
获取系统问题标准
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 4c4f10281..5ba7c7e46 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -34,8 +34,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid TrialId { get; set; }
public string PageName { get; set; }
public bool IsEnable { get; set; }
-
- }
+
+ public Guid ReadingQuestionCriterionTrialId{ get; set; }
+
+}
public class AddOrUpdateReadingQuestionCriterionTrialInDto
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index de1654a02..1426fdbaa 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -317,6 +317,9 @@ namespace IRaCIS.Core.Application.Contracts
///
public bool IsReadingShowPreviousResults { get; set; } = false;
+ //读片任务显示是否顺序
+ public bool IsReadingTaskViewInOrder { get; set; } = true;
+
///
/// 修约小数点
///
@@ -367,7 +370,7 @@ namespace IRaCIS.Core.Application.Contracts
///
/// 项目分页
///
- public List ReadingCriterionPageList { get; set; }
+ public List ReadingCriterionPageList { get; set; }
///
/// 项目裁判问题集合
@@ -381,6 +384,33 @@ namespace IRaCIS.Core.Application.Contracts
public List TrialQuestionList { get; set; }
}
+ public class ReadingCriterionPageDto
+ {
+ ///
+ /// 项目ID
+ ///
+ public Guid TrialId { get; set; }
+
+ ///
+ /// 分页名称
+ ///
+ public string PageName { get; set; }
+
+ ///
+ /// 是否启用
+ ///
+ public bool IsEnable { get; set; }
+
+ ///
+ /// 创建时间
+ ///
+ public DateTime CreateTime { get; set; }
+
+ ///
+ /// 创建用户ID
+ ///
+ public Guid CreateUserId { get; set; }
+ }
public class TrialReadQuestion
{
@@ -510,6 +540,8 @@ namespace IRaCIS.Core.Application.Contracts
public class SetTrialReadingInfoInDto
{
+
+
///
/// 项目ID
///
@@ -533,7 +565,8 @@ namespace IRaCIS.Core.Application.Contracts
///
public bool IsImageStandard { get; set; }
-
+ //读片任务显示是否顺序
+ public bool IsReadingTaskViewInOrder { get; set; } = true;
///
/// IR阅片是否显示受试者信息
@@ -545,10 +578,7 @@ namespace IRaCIS.Core.Application.Contracts
///
public bool IsReadingShowPreviousResults { get; set; } = false;
- ///
- /// 修约小数点
- ///
- public int? DigitPlaces { get; set; } = 2;
+
///
/// 仲裁规则/对象
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index d4727097d..c670f692f 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -54,7 +54,7 @@ namespace IRaCIS.Core.Application
{
GetTrialReadingInfoOutDto trialInfo= await _trialRepository.Where(x=>x.Id==inDto.TrialId).ProjectTo(_mapper.ConfigurationProvider).FirstNotNullAsync();
- trialInfo.ReadingCriterionPageList = await _readingCriterionPageRepository.Where(x => x.TrialId == inDto.TrialId).ToListAsync();
+ trialInfo.ReadingCriterionPageList = await _readingCriterionPageRepository.Where(x => x.TrialId == inDto.TrialId).ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
trialInfo.TrialCriterionId = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).Select(x => x.Id).ToListAsync();
trialInfo.TrialJudgeQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.IsJudgeQuestion && x.TrialId == inDto.TrialId)
.Select(x => new TrialJudgeQuestion()
@@ -85,7 +85,8 @@ namespace IRaCIS.Core.Application
{
await _trialRepository.UpdatePartialFromQueryAsync(inDto.TrialId, x => new Trial()
{
- DigitPlaces=inDto.DigitPlaces,
+ //DigitPlaces=inDto.DigitPlaces,
+ IsReadingTaskViewInOrder=inDto.IsReadingTaskViewInOrder,
ReadingTaskViewEnum = inDto.ReadingTaskViewEnum,
IsImageStandard = inDto.IsImageStandard,
IsReadingShowSubjectInfo = inDto.IsReadingShowSubjectInfo,
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
index eaafa13f3..d53974b14 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
@@ -215,6 +215,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap();
+ CreateMap();
CreateMap();
@@ -223,6 +224,8 @@ namespace IRaCIS.Core.Application.Service
.ForMember(t => t.TrialUserList, u => u.Ignore());
+
+
CreateMap()
.ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id));
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionPage.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionPage.cs
index 13d809e25..d45e7ab1b 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionPage.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionPage.cs
@@ -42,6 +42,9 @@ namespace IRaCIS.Core.Domain.Models
///
public Guid CreateUserId { get; set; }
+
+ public Guid ReadingQuestionCriterionTrialId { get; set; }
+
public List ReadingQuestionList { get; set; } = new List();