申请历史

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -91,6 +91,13 @@
             <param name="queryVisitTask"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetAnalysisTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
+            <summary>
+            一致性分析列表  (一致性分析  最后勾选 产生的任务)
+            </summary>
+            <param name="queryVisitTask"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetReReadingTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
             <summary>
             获取重阅影像阅片列表 

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -204,6 +204,31 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid? RootReReadingTaskId { get; set; }
     }
 
+
+    public class SelfConsistentQuery
+    {
+        public Guid TrialId { get; set; }
+
+        public Guid? SiteId { get; set; }
+
+        public Guid? SubjectId { get; set; }
+
+
+        public int? SubjectCount { get; set; }
+    }
+
+
+    public class SelfConsistentView
+    {
+        public Guid TrialId { get; set; }
+        public Guid SiteId { get; set; }
+
+        public Guid SubjectId { get; set; }
+        public String TrialSiteCode { get; set; } = String.Empty;
+        public string SubjectCode { get; set; } = String.Empty;
+    }
+
+
     public class IRUnReadSubjectQuery : PageInput
     {
         public Guid TrialId { get; set; }

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -195,6 +195,46 @@ namespace IRaCIS.Core.Application.Service
             return (pageList, trialTaskConfig);
         }
 
+
+        /// <summary>
+        /// 一致性分析列表  (一致性分析  最后勾选 产生的任务)
+        /// </summary>
+        /// <param name="queryVisitTask"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<PageOutput<ReadingTaskView>> GetAnalysisTaskList(VisitTaskQuery queryVisitTask)
+        {
+            var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == queryVisitTask.TrialId)
+                .Where(t => t.IsAnalysisCreate)
+
+               .WhereIf(queryVisitTask.SiteId != null, t => t.Subject.SiteId == queryVisitTask.SiteId)
+               .WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId)
+               .WhereIf(queryVisitTask.IsUrgent != null, t => t.IsUrgent == queryVisitTask.IsUrgent)
+               .WhereIf(queryVisitTask.DoctorUserId != null, t => t.DoctorUserId == queryVisitTask.DoctorUserId)
+               .WhereIf(queryVisitTask.ReadingCategory != null, t => t.ReadingCategory == queryVisitTask.ReadingCategory)
+               .WhereIf(queryVisitTask.ReadingTaskState != null, t => t.ReadingTaskState == queryVisitTask.ReadingTaskState)
+               .WhereIf(queryVisitTask.TaskAllocationState != null, t => t.TaskAllocationState == queryVisitTask.TaskAllocationState)
+               .WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskName), t => t.TaskName.Contains(queryVisitTask.TaskName) || t.TaskBlindName.Contains(queryVisitTask.TaskName))
+               .WhereIf(!string.IsNullOrEmpty(queryVisitTask.SubjectCode), t => t.Subject.Code.Contains(queryVisitTask.SubjectCode))
+               .WhereIf(queryVisitTask.BeginAllocateDate != null, t => t.AllocateTime > queryVisitTask.BeginAllocateDate)
+               .WhereIf(queryVisitTask.EndAllocateDate != null, t => t.AllocateTime < queryVisitTask.EndAllocateDate.Value.AddDays(1))
+               .ProjectTo<ReadingTaskView>(_mapper.ConfigurationProvider);
+
+            var defalutSortArray = new string[] { nameof(VisitTask.IsUrgent) + " desc", nameof(VisitTask.SubjectId) };
+
+            var pageList = await visitTaskQueryable.ToPagedListAsync(queryVisitTask.PageIndex, queryVisitTask.PageSize, queryVisitTask.SortField, queryVisitTask.Asc, string.IsNullOrWhiteSpace(queryVisitTask.SortField), defalutSortArray);
+
+            return (pageList);
+        }
+
+
+        //public async  Task<List<SelfConsistentView>> GetSelfConsistentList(SelfConsistentQuery inQuery)
+        //{
+
+        //}
+
+
+
         /// <summary>
         /// 获取重阅影像阅片列表 
         /// </summary>
@@ -352,7 +392,7 @@ namespace IRaCIS.Core.Application.Service
         {
 
             var visitTaskQueryable = _visitTaskReReadingRepository
-                .Where(t => t.NewReReadingTask.DoctorUserId == _userInfo.Id)
+                .Where(t => t.OriginalReReadingTask.DoctorUserId == _userInfo.Id)
                 .Where(t => t.NewReReadingTask.TrialId == queryVisitTask.TrialId)
                 .WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId == queryVisitTask.RootReReadingTaskId)
                 .WhereIf(queryVisitTask.SiteId != null, t => t.NewReReadingTask.Subject.SiteId == queryVisitTask.SiteId)
@@ -970,6 +1010,8 @@ namespace IRaCIS.Core.Application.Service
                     RequestReReadingRejectReason = agreeReReadingCommand.RequestReReadingRejectReason
                 });
 
+                if(agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree)
+                {
                     if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer)
                     {
                         await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == item.NewReReadingTaskId, u => new VisitTask()
@@ -978,18 +1020,18 @@ namespace IRaCIS.Core.Application.Service
                         });
                     }
                     //立即分配
-                else if(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
+                    else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
                     {
                         await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == item.NewReReadingTaskId, u => new VisitTask()
                         {
                             TaskState = TaskState.Effect,
 
-                        DoctorUserId=_userInfo.Id,
+                            DoctorUserId = _userInfo.Id,
 
-                        AllocateTime= DateTime.Now,
+                            AllocateTime = DateTime.Now,
                         });
                     }
-               
+                }
                                         
             }
 
@@ -1001,5 +1043,9 @@ namespace IRaCIS.Core.Application.Service
             return ResponseOutput.Ok();
         }
 
+
+
+
+
     }
 }

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -176,6 +176,9 @@ namespace IRaCIS.Core.Domain.Models
 
         public bool IsReReadingCreate { get; set; }
 
+        //是否是一致性分析产生
+        public bool IsAnalysisCreate { get; set; }
+
 
         /// <summary>
         /// 裁判结果的任务ID