重传修改

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

@@ -96,6 +96,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public RequestReReadingType RequestReReadingType { get; set; }
 
+        public string RequestReReadingRejectReason { get; set; } = string.Empty;
+
         public DateTime? RequestReReadingTime { get; set; }
 
         public string RequestReReadingReason { get; set; } = string.Empty;
@@ -439,6 +441,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public List<ConfirmReReadingDTO> ConfirmReReadingList { get; set; }
 
 
+        public string RequestReReadingRejectReason { get; set; } = string.Empty;
         public RequestReReadingResult RequestReReadingResultEnum { get; set; }
     }
 

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

@@ -326,10 +326,11 @@ namespace IRaCIS.Core.Application.Service
                             TaskState = TaskState.NotEffect,
                             Code = currentMaxCodeInt + 1,
                             TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
-                            AllocateTime = DateTime.Now,
-                            DoctorUserId = reReadingVisitTask.DoctorUserId,
 
 
+                           // AllocateTime = DateTime.Now,
+                            //DoctorUserId = reReadingVisitTask.DoctorUserId,
+
                         });
 
                         var rootReReadingTaskId = await _visitTaskReReadingRepository.Where(t => t.NewReReadingTaskId == reReadingVisitTask.Id).Select(u => u.RootReReadingTaskId).FirstOrDefaultAsync();
@@ -348,6 +349,7 @@ namespace IRaCIS.Core.Application.Service
                             RequestReReadingUserId = _userInfo.Id,
                             RequestReReadingReason = generateTaskCommand.ReReadingApplyGenerateTaskCommand.RequestReReadingReason,
                             RequestReReadingType = generateTaskCommand.ReReadingApplyGenerateTaskCommand.RequestReReadingType,
+
                         });
 
                         //是否增加任务类别

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

@@ -967,12 +967,29 @@ namespace IRaCIS.Core.Application.Service
                 {
                     RequestReReadingConfirmUserId=_userInfo.Id,
                     RequestReReadingResultEnum= agreeReReadingCommand.RequestReReadingResultEnum,
+                    RequestReReadingRejectReason = agreeReReadingCommand.RequestReReadingRejectReason
                 });
 
-                await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == item.NewReReadingTaskId, u => new VisitTask()
+                if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer)
                 {
-                    TaskState = TaskState.Effect
+                    await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == item.NewReReadingTaskId, u => new VisitTask()
-                });
+                    {
+                        TaskState = TaskState.Effect
+                    });
+                }
+                //立即分配
+                else if(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
+                {
+                    await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == item.NewReReadingTaskId, u => new VisitTask()
+                    {
+                        TaskState = TaskState.Effect,
+
+                        DoctorUserId=_userInfo.Id,
+
+                        AllocateTime= DateTime.Now,
+                    });
+                }
+               
 
             }
 

IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs

@@ -44,6 +44,9 @@ namespace IRaCIS.Core.Domain.Models
 
 
         public string RequestReReadingReason { get; set; } = string.Empty;
+
+        public string RequestReReadingRejectReason { get; set; } = string.Empty;
+
         public RequestReReadingResult RequestReReadingResultEnum { get; set; }