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

修改字段

Uat_Study
hang 2022-06-24 17:39:34 +08:00
parent ab1b62df6b
commit 1853fd8559
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -80,13 +80,11 @@ namespace IRaCIS.Core.Application.ViewModel
public DateTime? SignTime { get; set; } public DateTime? SignTime { get; set; }
//是否回退过
public bool IsReturned { get; set; }
public RequestReReadingResult RequestReReadingResultEnum { get; set; } public RequestReReadingResult RequestReReadingResultEnum { get; set; }
//是否 重阅 ////是否 重阅
public bool IsReReading { get; set; } //public bool IsReReading { get; set; }
public DateTime? SuggesteFinishedTime { get; set; } public DateTime? SuggesteFinishedTime { get; set; }
} }

5
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -901,7 +901,7 @@ namespace IRaCIS.Core.Application.Service
{ {
throw new BusinessValidationFailedException("已申请，或者同意状态不允许再次申请重阅"); throw new BusinessValidationFailedException("已申请，或者同意状态不允许再次申请重阅");
} }
task.ReReadingApplyState = ReReadingApplyState.HaveApplyed;
//产生了裁判 //产生了裁判
if (task.JudgeVisitTaskId != null) if (task.JudgeVisitTaskId != null)
@ -960,8 +960,7 @@ namespace IRaCIS.Core.Application.Service
{ {
await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == item.OriginalReReadingTaskId, u => new VisitTask() await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == item.OriginalReReadingTaskId, u => new VisitTask()
{ {
ReReadingApplyState = (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? ReReadingApplyState.Agree : ReReadingApplyState.Reject), ReReadingApplyState = (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? ReReadingApplyState.Agree : ReReadingApplyState.Reject)
IsReReading=true
}); });
await _visitTaskReReadingRepository.UpdatePartialFromQueryAsync(t => t.Id == item.Id, u => new VisitTaskReReading() await _visitTaskReReadingRepository.UpdatePartialFromQueryAsync(t => t.Id == item.Id, u => new VisitTaskReReading()

4
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -591,8 +591,10 @@ namespace IRaCIS.Application.Services
/// <returns></returns> /// <returns></returns>
private async Task TriggerJudgeQuestion(Guid visitTaskId) private async Task TriggerJudgeQuestion(Guid visitTaskId)
{ {
//x.ReReadingApplyState!=ReReadingApplyState.Agree 排除重阅的
var visitTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstOrDefaultAsync(); var visitTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstOrDefaultAsync();
var visitTaskids = await _visitTaskRepository.Where(x => x.ReadingTaskState == ReadingTaskState.HaveSigned &&x.ReadingCategory!= ReadingCategory.Judge&&!x.IsReReading && x.SourceSubjectVisitId == visitTask.SourceSubjectVisitId && x.SouceReadModuleId == visitTask.SouceReadModuleId).Select(x => x.Id).ToListAsync(); var visitTaskids = await _visitTaskRepository.Where(x => x.ReadingTaskState == ReadingTaskState.HaveSigned &&x.ReadingCategory!= ReadingCategory.Judge && x.ReReadingApplyState!=ReReadingApplyState.Agree && x.SourceSubjectVisitId == visitTask.SourceSubjectVisitId && x.SouceReadModuleId == visitTask.SouceReadModuleId).Select(x => x.Id).ToListAsync();
if (visitTaskids.Count == 2) if (visitTaskids.Count == 2)
{ {
var query = from questionAnswet in _readingTaskQuestionAnswerRepository.Where(x => visitTaskids.Contains(x.VisitTaskId)) var query = from questionAnswet in _readingTaskQuestionAnswerRepository.Where(x => visitTaskids.Contains(x.VisitTaskId))

7
IRaCIS.Core.Domain/Allocation/VisitTask.cs
View File

@ -133,8 +133,8 @@ namespace IRaCIS.Core.Domain.Models
//是否 重阅 ////是否 重阅
public bool IsReReading { get; set; } //public bool IsReReading { get; set; }
/// <summary> /// <summary>
/// DoctorUserId /// DoctorUserId
@ -147,8 +147,7 @@ namespace IRaCIS.Core.Domain.Models
public TaskAllocationRule DoctorTaskAllocationRule { get; set; } public TaskAllocationRule DoctorTaskAllocationRule { get; set; }
//是否回退过
public bool IsReturned { get; set; }
//裁判任务的Id //裁判任务的Id
public Guid? JudgeVisitTaskId { get; set; } public Guid? JudgeVisitTaskId { get; set; }