diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index b9efc7f35..45f77f15b 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -261,6 +261,13 @@
访视读片任务
+
+
+ 添加转变任务
+
+
+
+
访视读片任务
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index a547462b9..86367b4bc 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -522,7 +522,7 @@ namespace IRaCIS.Core.Application.Service
var trialId = generateTaskCommand.TrialId;
var isAssignSubjectToDoctor = generateTaskCommand.IsAssignSubjectToDoctor;
- var trialReadingCriterionConfigList = _trialReadingCriterionRepository.Where(t => t.TrialId == trialId && t.ReadingInfoSignTime != null).Select(t => new { TrialReadingCriterionId = t.Id, t.ReadingTool, t.ReadingType, t.IsReadingTaskViewInOrder, t.IsFollowVisitAutoAssign, t.IsFollowGlobalVisitAutoAssign, t.FollowGlobalVisitAutoAssignDefaultState, t.FollowVisitAutoAssignDefaultState, t.TaskAllocateObjEnum, t.CriterionType }).ToList();
+ var trialReadingCriterionConfigList = _trialReadingCriterionRepository.Where(t => t.TrialId == trialId && t.ReadingInfoSignTime != null && t.IsAutoCreate).Select(t => new { TrialReadingCriterionId = t.Id, t.ReadingTool, t.ReadingType, t.IsReadingTaskViewInOrder, t.IsFollowVisitAutoAssign, t.IsFollowGlobalVisitAutoAssign, t.FollowGlobalVisitAutoAssignDefaultState, t.FollowVisitAutoAssignDefaultState, t.TaskAllocateObjEnum, t.CriterionType }).ToList();
var visitBlindConfig = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.BlindBaseLineName, t.BlindFollowUpPrefix }).FirstOrDefault();
diff --git a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs
index ba0c13edc..df4cf17d4 100644
--- a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs
@@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.ViewModel
public bool? IsGeneratedTask { get; set; }
-
+ public decimal VisitNum { get; set; }
public string VisitName { get; set; }
public DateTime? EarliestScanDate { get; set; }
public DateTime? LatestScanDate { get; set; }
@@ -75,7 +75,7 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid SubjectId { get; set; }
- public List SubjectVisitIdList { get; set; }
+ public List SubjectVisitIdList { get; set; }=new List();
}
public class VisitStudyAndSeriesQuery
@@ -111,6 +111,8 @@ namespace IRaCIS.Core.Application.ViewModel
public string TaskCode { get; set; }
+ public decimal VisitTaskNum { get; set; }
+
public string TaskName { get; set; }
public string TaskBlindName { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs
index 1e55f164b..316456b3f 100644
--- a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs
@@ -412,12 +412,14 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(inQuery.ImageDeterminationResultState != null, t => t.ImageDeterminationResultState == inQuery.ImageDeterminationResultState)
.WhereIf(inQuery.ImageFilterState != null, t => t.ImageFilterState == inQuery.ImageFilterState)
.WhereIf(inQuery.IsGeneratedTask != null, t => t.IsGeneratedTask == inQuery.IsGeneratedTask)
- on subjectVisit.Id equals subjectCriteriaEvaluationVisitFilter.SubjectVisitId into d
- from subjectCriteriaEvaluationVisitFilter in d.DefaultIfEmpty()
+ on subjectVisit.Id equals subjectCriteriaEvaluationVisitFilter.SubjectVisitId
+
+ //into d from subjectCriteriaEvaluationVisitFilter in d.DefaultIfEmpty()
select new SubjectCriteriaEvaluationVisitFilterView()
{
VisitName = subjectVisit.VisitName,
+ VisitNum=subjectVisit.VisitNum,
SubjectVisitId = subjectVisit.Id,
SubjectId = subjectVisit.SubjectId,
TrialReadingCriterionId = inQuery.TrialReadingCriterionId,
@@ -436,7 +438,7 @@ namespace IRaCIS.Core.Application.Service
};
- return await subjectCriteriaEvaluationVisitFilterQueryable.ToListAsync();
+ return await subjectCriteriaEvaluationVisitFilterQueryable.OrderBy(t=>t.VisitNum).ToListAsync();
}
///
@@ -447,7 +449,7 @@ namespace IRaCIS.Core.Application.Service
[HttpPost]
public async Task> GetHaveGeneratedTaskList(HaveGeneratedTaskQuery inQuery)
{
- var list = await _repository.Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.SubjectId == inQuery.SubjectId && t.TaskState == TaskState.Effect)
+ var list = await _repository.Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.SubjectId == inQuery.SubjectId && t.TaskState == TaskState.Effect).OrderBy(t => t.VisitTaskNum)
.ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
return list;