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

修改

Uat_Study
he 2023-03-23 15:39:07 +08:00
parent d339f5f476
commit 02883db402
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
View File

@ -102,6 +102,7 @@ namespace IRaCIS.Core.Application.Service
var taskInfo = await _visitTaskRepository.Where(x => x.Id == taskId).IgnoreAutoIncludes().AsNoTracking().FirstNotNullAsync(); var taskInfo = await _visitTaskRepository.Where(x => x.Id == taskId).IgnoreAutoIncludes().AsNoTracking().FirstNotNullAsync();
taskInfo.ReadingTaskState = ReadingTaskState.WaitReading; taskInfo.ReadingTaskState = ReadingTaskState.WaitReading;
taskInfo.IsConvertedTask = true; taskInfo.IsConvertedTask = true;
taskInfo.BeforeConvertedTaskId = taskId;
taskInfo.Id = NewId.NextGuid(); taskInfo.Id = NewId.NextGuid();
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => await _visitTaskRepository.BatchUpdateNoTrackingAsync(x =>

4
IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
View File

@ -724,8 +724,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
x.IsAnalysisCreate== taskinfo.IsAnalysisCreate&& x.IsAnalysisCreate== taskinfo.IsAnalysisCreate&&
x.DoctorUserId == taskinfo.DoctorUserId && x.DoctorUserId == taskinfo.DoctorUserId &&
x.IsSelfAnalysis== taskinfo.IsSelfAnalysis && x.IsSelfAnalysis== taskinfo.IsSelfAnalysis &&
x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum) x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
&& ((x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect)||(x.VisitTaskNum==taskinfo.VisitTaskNum&&x.TaskState==TaskState.Freeze) ) && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect)||(x.Id==taskinfo.BeforeConvertedTaskId)
).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync(); ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();

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

@ -294,6 +294,8 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public bool IsConvertedTask { get; set; } = false; public bool IsConvertedTask { get; set; } = false;
public Guid BeforeConvertedTaskId { get; set; }
[NotMapped] [NotMapped]
public List<CrterionDictionaryGroup> CrterionDictionaryGroup public List<CrterionDictionaryGroup> CrterionDictionaryGroup
{ {