From beb43a785edef3604a2066c5eca49053f91fe612 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 9 Jan 2024 11:14:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/DTO/TaskMedicalReviewViewModel.cs | 4 +++- .../Service/Allocation/TaskMedicalReviewService.cs | 4 ++-- IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs index 3856d2508..80ed03842 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs @@ -126,7 +126,9 @@ namespace IRaCIS.Core.Application.ViewModel public ReadingTaskState? ReadingTaskState { get; set; } public Guid? TrialReadingCriterionId { get; set; } - } + + public MedicalReviewDoctorUserIdea? DoctorUserIdeaEnum { get; set; } + } public class SetMedicalReviewInvalidCommand diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs index 02f2c0368..8e56f8c98 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs @@ -64,8 +64,8 @@ namespace IRaCIS.Core.Application.Service .WhereIf(inQuery.ReadingCategory != null, t => t.VisitTask.ReadingCategory == inQuery.ReadingCategory) .WhereIf(inQuery.TaskState != null, t => t.VisitTask.TaskState == inQuery.TaskState) .WhereIf(inQuery.AuditState != null, t => t.AuditState == inQuery.AuditState) - - .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId) + .WhereIf(inQuery.DoctorUserIdeaEnum != null, t => t.DoctorUserIdeaEnum == inQuery.DoctorUserIdeaEnum) + .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId) .ProjectTo(_mapper.ConfigurationProvider); var pageList = await taskMedicalReviewQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TaskMedicalReviewView.Id) : inQuery.SortField, inQuery.Asc); diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 5aa40e863..fde50d37e 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -1116,7 +1116,8 @@ namespace IRaCIS.Core.Application.Contracts public bool? IsOverTime { get; set; } public Guid? CreateUserId { get; set; } - } + + } public class QCCRCChallengeViewModel { From 3768c22aedfbde93d4d0c232560984cb187358c5 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 9 Jan 2024 13:58:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=91=E6=81=AF=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/ReadingImageTask/ReadingImageTaskService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 598967634..0bf8e26de 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -2585,13 +2585,13 @@ namespace IRaCIS.Application.Services #region 两小时 var cacheDate = DateTime.Parse(value.ToString()); int timespanMin = (DateTime.Now - cacheDate).Minutes; - if (timespanMin > 120 && timespanMin < 140) + if (timespanMin > 120 && timespanMin < 130) { throw new BusinessValidationFailedException(_localizer["ReadingImage_NeedRest", 2, 20]); } - else if (timespanMin > 140) + else if (timespanMin > 130) { - cacheDate = cacheDate.AddMinutes((Math.Floor((double)(timespanMin / 140))) * 140); + cacheDate = cacheDate.AddMinutes((Math.Floor((double)(timespanMin / 130))) * 130); _provider.Set(cacheKey, cacheDate.ToString(), TimeSpan.FromHours(5)); // _cache.Set(cacheKey, cacheDate.ToString(), TimeSpan.FromHours(5));