diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs index 86d65b479..405e061b7 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs @@ -476,6 +476,8 @@ namespace IRaCIS.Core.Application.ViewModel public UserTypeEnum UserTypeEnum { get; set; } + + } diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index e8854d97c..f4d13a114 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -215,7 +215,7 @@ namespace IRaCIS.Core.Application.Service.Allocation .WhereIf(!string.IsNullOrEmpty(queryVisitTask.SubjectCode), t => (t.Subject.Code.Contains(queryVisitTask.SubjectCode) && t.IsAnalysisCreate == false) || (t.BlindSubjectCode.Contains(queryVisitTask.SubjectCode) && t.IsAnalysisCreate)) .WhereIf(queryVisitTask.BeginAllocateDate != null, t => t.AllocateTime > queryVisitTask.BeginAllocateDate) .WhereIf(queryVisitTask.EndAllocateDate != null, t => t.AllocateTime < queryVisitTask.EndAllocateDate!.Value.AddDays(1)) - + .WhereIf(trialConfig?.EnrollConfirmDefaultUserType == UserTypeEnum.MIM && _userInfo.UserTypeEnumInt == (int)UserTypeEnum.MIM, t => t.SourceSubjectVisit.IsBaseLine == true) .WhereIf(trialConfig?.PDProgressDefaultUserType == UserTypeEnum.MIM && _userInfo.UserTypeEnumInt == (int)UserTypeEnum.MIM, t => t.SourceSubjectVisit.IsBaseLine == false) .WhereIf(queryVisitTask.IsWaitPIAudit == true, t => t.FirstAuditUserId == null) @@ -276,6 +276,8 @@ namespace IRaCIS.Core.Application.Service.Allocation //发送对话 var addDialig = _mapper.Map(incommand); + addDialig.PIAuditImagePath = visitTask.PIAuditImagePath; + await _PIAuditRepository.AddAsync(addDialig); await _visitTaskRepository.SaveChangesAsync(); @@ -292,7 +294,8 @@ namespace IRaCIS.Core.Application.Service.Allocation var visitTask = await _visitTaskRepository.FirstOrDefaultAsync(t => t.Id == incommand.VisitTaskId); visitTask.IsEnrollment = incommand.IsEnrollment != null ? incommand.IsEnrollment : visitTask.IsEnrollment; visitTask.IsPDConfirm = incommand.IsPDConfirm != null ? incommand.IsPDConfirm : visitTask.IsPDConfirm; - + visitTask.LatestReplyUserId = _userInfo.Id; + visitTask.LatestReplyTime = DateTime.Now; await _visitTaskRepository.SaveChangesAsync(); @@ -1500,7 +1503,7 @@ namespace IRaCIS.Core.Application.Service.Allocation return ResponseOutput.NotOk(_localizer["VisitTask_NoImageReturn"]); } - if (task.TaskState != TaskState.Effect || task.ReadingCategory != ReadingCategory.Visit || task.ReadingTaskState == ReadingTaskState.HaveSigned) + if (task.TaskState != TaskState.Effect || task.ReadingCategory != ReadingCategory.Visit /*|| task.ReadingTaskState == ReadingTaskState.HaveSigned*/) { //---仅仅允许针对生效、未完成的访视任务进行退回操作,请刷新页面数据 return ResponseOutput.NotOk(_localizer["VisitTask_NonEffectiveTaskCannotBeReturned"]); diff --git a/IRaCIS.Core.Domain/Allocation/PIAudit.cs b/IRaCIS.Core.Domain/Allocation/PIAudit.cs index 8a5ec78fd..a61aeeec8 100644 --- a/IRaCIS.Core.Domain/Allocation/PIAudit.cs +++ b/IRaCIS.Core.Domain/Allocation/PIAudit.cs @@ -55,7 +55,7 @@ namespace IRaCIS.Core.Domain.Models try { - return this.PIAuditImagePath.Trim().Split('|').ToList(); + return this.PIAuditImagePath?.Trim().Split('|').ToList(); } catch (Exception) { diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index decee508a..8fd3a53e3 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -437,7 +437,7 @@ namespace IRaCIS.Core.Domain.Models try { - return this.PIAuditImagePath.Trim().Split('|').ToList(); + return this.PIAuditImagePath?.Trim().Split('|').ToList(); } catch (Exception) {