修改一版

2022-06-22 14:30:19 +08:00
parent 62c30ceef3
commit 89cd7a9008
5 changed files with 54 additions and 12 deletions
@@ -141,6 +141,20 @@ namespace IRaCIS.Core.Application.ViewModel
    }


+    public class ReadingGenerataTaskDTO
+    {
+        public Guid Id { get; set; }
+
+        public Guid SubjectId { get; set; }
+
+        public bool IsUrgent { get; set; }
+
+        public string ReadingName { get; set; }
+
+        public ReadingCategory ReadingCategory { get; set; }
+
+    }
+
    public class VisitGenerataTaskDTO
    {
        public Guid Id { get; set; }
@@ -56,7 +56,7 @@ namespace IRaCIS.Core.Application.Service
            var subjectVisitList = _subjectVisitRepository.Where(t => subjectVisitIdList.Contains(t.Id)).ProjectTo<VisitGenerataTaskDTO>(_mapper.ConfigurationProvider).Distinct().ToList();


-            await AddTaskAsync(new GenerateTaskCommand() { TrialId = trialId, IsAssignSubjectToDoctor = isAssignSubjectToDoctor, VisitGenerataTaskList = subjectVisitList });
+            await AddTaskAsync(new GenerateTaskCommand() { TrialId = trialId, IsAssignSubjectToDoctor = isAssignSubjectToDoctor, VisitGenerataTaskList = subjectVisitList, ReadingCategory= ReadingCategory.Visit });


        }
@@ -311,7 +311,7 @@ namespace IRaCIS.Core.Application.Service
                    JudgeVisitTaskId = visitTask.Id
                });

-                await _visitTaskRepository.AddAsync(visitTask);
+                
            }
            else if(generateTaskCommand.ReadingCategory == ReadingCategory.ReadingPeriod)
            {
@@ -350,8 +350,7 @@ namespace IRaCIS.Core.Application.Service

                    _provider.Set<int>($"{trialId }_{ StaticData.CacheKey.TaskMaxCode}", currentMaxCodeInt + 2, TimeSpan.FromMinutes(30));

-                    await _visitTaskRepository.AddAsync(task1);
-                    await _visitTaskRepository.AddAsync(task2);
+                  
                }
                else
                {
@@ -375,7 +374,7 @@ namespace IRaCIS.Core.Application.Service

                    _provider.Set<int>($"{trialId }_{ StaticData.CacheKey.TaskMaxCode}", currentMaxCodeInt + 1, TimeSpan.FromMinutes(30));

-                    await _visitTaskRepository.AddAsync(singleTask);
+                  
                }
            }

@@ -150,7 +150,7 @@ namespace IRaCIS.Core.Application.Service

            var pageList = await visitTaskQueryable.ToPagedListAsync(queryVisitTask.PageIndex, queryVisitTask.PageSize, queryVisitTask.SortField, queryVisitTask.Asc, string.IsNullOrWhiteSpace(queryVisitTask.SortField), defalutSortArray);

-            var trialTaskConfig = _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).ProjectTo<TrialTaskConfig>(_mapper.ConfigurationProvider).FirstOrDefault();
+            var trialTaskConfig = _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstOrDefault();

            return (pageList, trialTaskConfig);
        }