diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index c6d2a2636..7fd62db99 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -351,6 +351,10 @@ namespace IRaCIS.Core.Application.Service
.Where(t => t.UnReadTaskCount > 0);
+ //var visitQuery=_visitTaskRepository.Where(x=>x.TrialId==trialId&&x.DoctorUserId== _userInfo.Id)
+ // .GroupBy(x=> new )
+
+
var result = await subjectQuery.ToPagedListAsync(iRUnReadSubjectQuery.PageIndex, iRUnReadSubjectQuery.PageSize, String.IsNullOrEmpty(iRUnReadSubjectQuery.SortField) ? nameof(IRUnReadSubjectView.SubjectId) : iRUnReadSubjectQuery.SortField, iRUnReadSubjectQuery.Asc);
return (result, new
{
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index cd220149a..90070bc88 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -123,7 +123,7 @@ namespace IRaCIS.Core.Application.Contracts
public bool? IsClinicalReading { get; set; }
- public int ArbitrationRule { get; set; }
+
public int? DigitPlaces { get; set; }
@@ -133,6 +133,25 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsReadingTaskViewInOrder { get; set; }
+ ///
+ /// 仲裁规则
+ ///
+ public ArbitrationRule ArbitrationRule { get; set; }
+
+
+ ///
+ /// 阅片是否显示受试者信息
+ ///
+ public bool IsReadingShowSubjectInfo { get; set; } = false;
+
+ ///
+ /// 阅片是否显示既往结果
+ ///
+ public bool IsReadingShowPreviousResults { get; set; } = false;
+
+ public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; }
+
+
}
@@ -186,7 +205,7 @@ namespace IRaCIS.Core.Application.Contracts
public bool? IsClinicalReading { get; set; }
- public int ArbitrationRule { get; set; }
+ public ArbitrationRule ArbitrationRule { get; set; }
}
@@ -341,7 +360,7 @@ namespace IRaCIS.Core.Application.Contracts
///
/// 仲裁规则/对象
///
- public int ArbitrationRule { get; set; } = 2;
+ public ArbitrationRule ArbitrationRule { get; set; }
///
@@ -746,7 +765,7 @@ namespace IRaCIS.Core.Application.Contracts
public bool? IsClinicalReading { get; set; }
- public int ArbitrationRule { get; set; }
+ public ArbitrationRule ArbitrationRule { get; set; }
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 696275c2d..ca6c1c1d0 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -503,7 +503,17 @@ namespace IRaCIS.Core.Application
var trialInfo = await _trialRepository.Where(t => t.Id == trialConfig.TrialId, true).Include(t => t.TrialDicList.Where(u => u.KeyName == StaticData.Criterion)).FirstOrDefaultAsync();
if (trialInfo == null) return Null404NotFound(trialInfo);
-
+ if (trialConfig.IsReadingTaskViewInOrder)
+ {
+ trialConfig.ReadingTaskViewEnum = ReadingTaskViewMethod.ReadingPeriodOrVisit;
+ }
+ else
+ {
+ trialConfig.ReadingTaskViewEnum = ReadingTaskViewMethod.Subject;
+ trialConfig.IsReadingShowPreviousResults = false;
+ trialConfig.IsReadingShowSubjectInfo = false;
+ trialConfig.ArbitrationRule = ArbitrationRule.Visit;
+ }
_mapper.Map(trialConfig, trialInfo);
trialInfo.UpdateTime = DateTime.Now;