修改

2023-02-23 14:51:01 +08:00
parent 9e0f4eb0d6
commit c9b6287b46
8 changed files with 161 additions and 5 deletions
@@ -24,6 +24,16 @@ namespace IRaCIS.Core.Application.ViewModel

        public decimal VisitTaskNum { get; set; }

+        public bool IsUrgent { get; set; }
+
+        /// <summary>
+        /// 加急类型
+        /// </summary>
+        public TaskUrgentType? TaskUrgentType { get; set; }
+
+
+        public string TaskUrgentRemake { get; set; } = string.Empty;
+
        public ReadingCategory ReadingCategory { get; set; }

        public TaskAllocationState TaskAllocationState { get; set; }
@@ -158,6 +158,21 @@ namespace IRaCIS.Core.Application.Service
                            currentMaxCodeInt = currentMaxCodeInt + 1;


+                            TaskUrgentType? taskUrgentType = null;
+
+                            if (subjectVisit.PDState == PDStateEnum.PDProgress)
+                            {
+                                taskUrgentType = TaskUrgentType.PDProgress;
+                            }
+                            else if (subjectVisit.IsEnrollmentConfirm)
+                            {
+                                taskUrgentType = TaskUrgentType.EnrollmentConfirm;
+                            }
+                            else if (subjectVisit.IsUrgent)
+                            {
+                                taskUrgentType = TaskUrgentType.VisitUrgent;
+                            }
+
                            task1 = await _visitTaskRepository.AddAsync(new VisitTask()
                            {
                                TrialId = trialId,
@@ -166,6 +181,7 @@ namespace IRaCIS.Core.Application.Service
                                TaskBlindName = blindTaskName,
                                TaskName = subjectVisit.VisitName,
                                VisitTaskNum = subjectVisit.VisitNum,
+                                TaskUrgentType = taskUrgentType,
                                //CheckPassedTime = subjectVisit.CheckPassedTime,
                                ArmEnum = Arm.DoubleReadingArm1,//特殊
                                Code = currentMaxCodeInt,
@@ -176,7 +192,7 @@ namespace IRaCIS.Core.Application.Service
                                TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
                                IsNeedClinicalDataSign = isNeedClinicalDataSign,
                                IsClinicalDataSign = isClinicalDataSign
-                            });
+                            }) ;

                        }

@@ -66,6 +66,24 @@ namespace IRaCIS.Core.Application.Service.Allocation
            _trialReadingCriterionRepository = trialReadingCriterionRepository;
        }

+        /// <summary>
+        /// 设置任务加急
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<bool> SetTaskUrgent(SetTaskUrgentInDto inDto)
+        {
+            await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask()
+            {
+                IsUrgent = inDto.IsUrgent,
+                TaskUrgentType = inDto.TaskUrgentType,
+                TaskUrgentRemake = inDto.TaskUrgentRemake,
+
+            });
+
+           return await _visitTaskRepository.SaveChangesAsync();
+        }

        public async Task<List<TrialReadingCriterionDto>> GetTrialCriterionList(Guid trialId, bool isHaveSigned = true)
        {