XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-01-09 14:27:17 +08:00
parent 5654125091 3768c22aed
commit 197c315f07
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs
View File

@ -126,6 +126,8 @@ namespace IRaCIS.Core.Application.ViewModel
public ReadingTaskState? ReadingTaskState { get; set; } public ReadingTaskState? ReadingTaskState { get; set; }
public Guid? TrialReadingCriterionId { get; set; } public Guid? TrialReadingCriterionId { get; set; }
public MedicalReviewDoctorUserIdea? DoctorUserIdeaEnum { get; set; }
} }

2
IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
View File

@ -64,7 +64,7 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(inQuery.ReadingCategory != null, t => t.VisitTask.ReadingCategory == inQuery.ReadingCategory) .WhereIf(inQuery.ReadingCategory != null, t => t.VisitTask.ReadingCategory == inQuery.ReadingCategory)
.WhereIf(inQuery.TaskState != null, t => t.VisitTask.TaskState == inQuery.TaskState) .WhereIf(inQuery.TaskState != null, t => t.VisitTask.TaskState == inQuery.TaskState)
.WhereIf(inQuery.AuditState != null, t => t.AuditState == inQuery.AuditState) .WhereIf(inQuery.AuditState != null, t => t.AuditState == inQuery.AuditState)
.WhereIf(inQuery.DoctorUserIdeaEnum != null, t => t.DoctorUserIdeaEnum == inQuery.DoctorUserIdeaEnum)
.WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId) .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
.ProjectTo<TaskMedicalReviewView>(_mapper.ConfigurationProvider); .ProjectTo<TaskMedicalReviewView>(_mapper.ConfigurationProvider);

1
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
View File

@ -1116,6 +1116,7 @@ namespace IRaCIS.Core.Application.Contracts
public bool? IsOverTime { get; set; } public bool? IsOverTime { get; set; }
public Guid? CreateUserId { get; set; } public Guid? CreateUserId { get; set; }
} }
public class QCCRCChallengeViewModel public class QCCRCChallengeViewModel

6
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -2585,13 +2585,13 @@ namespace IRaCIS.Application.Services
#region 两小时 #region 两小时
var cacheDate = DateTime.Parse(value.ToString()); var cacheDate = DateTime.Parse(value.ToString());
int timespanMin = (DateTime.Now - cacheDate).Minutes; int timespanMin = (DateTime.Now - cacheDate).Minutes;
if (timespanMin > 120 && timespanMin < 140) if (timespanMin > 120 && timespanMin < 130)
{ {
throw new BusinessValidationFailedException(_localizer["ReadingImage_NeedRest", 2, 20]); 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)); _provider.Set(cacheKey, cacheDate.ToString(), TimeSpan.FromHours(5));
// _cache.Set(cacheKey, cacheDate.ToString(), TimeSpan.FromHours(5)); // _cache.Set(cacheKey, cacheDate.ToString(), TimeSpan.FromHours(5));