Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

2023-01-12 12:04:34 +08:00
parent dab955b151 a79338ab32
commit 07f7a420f3
7 changed files with 23 additions and 12 deletions
@@ -254,6 +254,8 @@ namespace IRaCIS.Core.Application.ViewModel

        public DateTime? SuggesteFinishedTime => UnReadTaskList.Max(t => t.SuggesteFinishedTime);

+        public List<IRUnreadTaskView> UnReadCanReadTaskList => UnReadTaskList.Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)).ToList();
+
        public List<IRUnreadTaskView> UnReadTaskList { get; set; } = new List<IRUnreadTaskView>();
    }

@@ -284,6 +286,7 @@ namespace IRaCIS.Core.Application.ViewModel

        public bool IsClinicalDataSign { get; set; }

+        public bool IsFrontTaskNeedSignButNotSign { get; set; }
    }


@@ -977,16 +977,18 @@ namespace IRaCIS.Core.Application.Service.Allocation
                UnReadTaskCount = x.Where(y => y.ReadingTaskState != ReadingTaskState.HaveSigned).Count(),

                //未读 里可读任务量   
-                UnReadCanReadTaskCount = x.Where(y => y.ReadingTaskState != ReadingTaskState.HaveSigned && y.IsFrontTaskNeedSignButNotSign==false
-                 //(y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)
+                UnReadCanReadTaskCount = x.Where(y => y.ReadingTaskState != ReadingTaskState.HaveSigned && y.IsFrontTaskNeedSignButNotSign==false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)
                //不能对包含聚合或子查询的表达式执行聚合函数
                //&& !x.Any(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.IsNeedClinicalDataSign == true && t.IsClinicalDataSign == false && t.VisitTaskNum<y.VisitTaskNum )
                ).Count(),

                //已读任务量
                HaveReadTaskCount = x.Where(y => y.ReadingTaskState == ReadingTaskState.HaveSigned).Count(),
+
                ExistReadingApply = x.Any(y => y.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || y.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed),
-                UnReadTaskList = x.Where(y => y.ReadingTaskState != ReadingTaskState.HaveSigned /*&& y.IsFrontTaskNeedSignButNotSign == false*/).OrderBy(x => x.VisitTaskNum)
+
+                //查出所有未读的  未读的可读的  在这个列表基础上 过滤下   y.IsFrontTaskNeedSignButNotSign==false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)  这样容易排错 确认这三个字段是否维护有误
+                UnReadTaskList = x.Where(y => y.ReadingTaskState != ReadingTaskState.HaveSigned ).OrderBy(x => x.VisitTaskNum)
                .Select(u => new IRUnreadTaskView()
                {
                    Id = u.Id,
@@ -999,7 +1001,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
                    IsAnalysisCreate = u.IsAnalysisCreate,
                    TrialReadingCriterionId = u.TrialReadingCriterionId,
                    IsNeedClinicalDataSign =u.IsNeedClinicalDataSign,
-                    IsClinicalDataSign=u.IsClinicalDataSign
+                    IsClinicalDataSign=u.IsClinicalDataSign,
+                    IsFrontTaskNeedSignButNotSign=u.IsFrontTaskNeedSignButNotSign
                })
                .ToList(),
            }).Where(x => x.UnReadTaskCount > 0).OrderBy(x => x.UnReadCanReadTaskCount);
@@ -1124,14 +1124,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto

    public class GetNextTaskInDto
    {
-        public Guid? SubjectId { get; set; }

        public string SubjectCode { get; set; }=string.Empty;

        public Guid TrialId { get; set; }

+        public Guid? SubjectId { get; set; }

-        public Guid TrialReadingCriterionId { get; set; }
+        public Guid? TrialReadingCriterionId { get; set; }

        public Guid? VisitTaskId { get; set; }
    }
@@ -1659,7 +1659,7 @@ namespace IRaCIS.Application.Services
                var subjectTaskList = (await _visitTaskService.GetOrderReadingIQueryable(new GetOrderReadingIQueryableInDto()
                {
                    TrialId = inDto.TrialId,
-                    TrialReadingCriterionId = inDto.TrialReadingCriterionId,
+                    TrialReadingCriterionId = trialReadingCriterionId.Value,
                })).Item2;

                var index = 0;
@@ -1678,7 +1678,7 @@ namespace IRaCIS.Application.Services
                    throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"]);
                }

-                task = currentSubject.UnReadTaskList.Select(x => new GetReadingTaskDto()
+                task = currentSubject.UnReadCanReadTaskList.Select(x => new GetReadingTaskDto()
                {
                    ReadingCategory = x.ReadingCategory,
                    SubjectCode = currentSubject.SubjectCode,