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

bug

Uat_Study
hang 2022-07-18 17:28:36 +08:00
parent 3e462fa3b3
commit 3651be1ffb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,10 +234,10 @@ namespace IRaCIS.Core.Application.Service
IsUrgent = subjectVisit.IsUrgent, IsUrgent = subjectVisit.IsUrgent,
ArmEnum = Arm.DoubleReadingArm1,//特殊 ArmEnum = Arm.DoubleReadingArm1,//特殊
Code = currentMaxCodeInt + 1, Code = currentMaxCodeInt + 1,
SourceSubjectVisitId = subjectVisit.Id,
TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)), TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
ReadingCategory = ReadingCategory.Visit, ReadingCategory = ReadingCategory.Visit,
SourceSubjectVisitId = latestTask.Id,
VisitTaskNum = latestTask.VisitTaskNum, VisitTaskNum = latestTask.VisitTaskNum,
TaskBlindName = latestTask.TaskBlindName, TaskBlindName = latestTask.TaskBlindName,
TaskName = latestTask.TaskName, TaskName = latestTask.TaskName,
@ -276,10 +276,10 @@ namespace IRaCIS.Core.Application.Service
//CheckPassedTime = subjectVisit.CheckPassedTime, //CheckPassedTime = subjectVisit.CheckPassedTime,
ArmEnum = Arm.DoubleReadingArm2,//特殊 ArmEnum = Arm.DoubleReadingArm2,//特殊
Code = currentMaxCodeInt + 1, Code = currentMaxCodeInt + 1,
SourceSubjectVisitId = subjectVisit.Id,
TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)), TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
ReadingCategory = ReadingCategory.Visit, ReadingCategory = ReadingCategory.Visit,
SourceSubjectVisitId = latestTask.Id,
VisitTaskNum = latestTask.VisitTaskNum, VisitTaskNum = latestTask.VisitTaskNum,
TaskBlindName = latestTask.TaskBlindName, TaskBlindName = latestTask.TaskBlindName,
TaskName = latestTask.TaskName, TaskName = latestTask.TaskName,

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

@ -907,14 +907,14 @@ namespace IRaCIS.Core.Application.Service
if (visitTask.SourceSubjectVisitId != null) if (visitTask.SourceSubjectVisitId != null)
{ {
if (await _visitTaskRepository.AnyAsync(t => t.SourceSubjectVisitId == visitTask.SourceSubjectVisitId && t.DoctorUserId == assignSubjectTaskToDoctorCommand.DoctorUserId && t.Id != visitTask.Id)) if (await _visitTaskRepository.AnyAsync(t => t.SourceSubjectVisitId == visitTask.SourceSubjectVisitId && t.TaskAllocationState == TaskAllocationState.Allocated && t.DoctorUserId == assignSubjectTaskToDoctorCommand.DoctorUserId && t.Id != visitTask.Id))
{ {
return ResponseOutput.NotOk("其中一个任务已分配给该医生，不允许分配"); return ResponseOutput.NotOk("其中一个任务已分配给该医生，不允许分配");
} }
} }
else if (visitTask.SouceReadModuleId != null) else if (visitTask.SouceReadModuleId != null)
{ {
if (await _visitTaskRepository.AnyAsync(t => t.SouceReadModuleId == visitTask.SouceReadModuleId && t.DoctorUserId == assignSubjectTaskToDoctorCommand.DoctorUserId && t.Id != visitTask.Id)) if (await _visitTaskRepository.AnyAsync(t => t.SouceReadModuleId == visitTask.SouceReadModuleId && t.TaskAllocationState == TaskAllocationState.Allocated && t.DoctorUserId == assignSubjectTaskToDoctorCommand.DoctorUserId && t.Id != visitTask.Id))
{ {
return ResponseOutput.NotOk("其中一个任务已分配给该医生，不允许分配"); return ResponseOutput.NotOk("其中一个任务已分配给该医生，不允许分配");
} }
@ -1026,9 +1026,9 @@ namespace IRaCIS.Core.Application.Service
//当前访视之前 已有任务申请 //当前访视之前 已有任务申请
if (trialConfig.IsReadingTaskViewInOrder && await _visitTaskRepository.AnyAsync(t => t.TrialId == task.TrialId && t.SubjectId == task.SubjectId && t.TaskState == TaskState.Effect && t.ReadingCategory==ReadingCategory.Visit if (trialConfig.IsReadingTaskViewInOrder && await _visitTaskRepository.AnyAsync(t => t.TrialId == task.TrialId && t.SubjectId == task.SubjectId && t.TaskState == TaskState.Effect && t.ReadingCategory==ReadingCategory.Visit
&& t.ReadingTaskState == ReadingTaskState.HaveSigned && t.VisitTaskNum< task.VisitTaskNum &&( t.ReReadingApplyState == ReReadingApplyState.HaveApplyed) )) && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.VisitTaskNum <= task.VisitTaskNum && t.Id!= task.Id && t.ReReadingApplyState == ReReadingApplyState.HaveApplyed ))
{ {
return ResponseOutput.NotOk("当前为有序阅片，之前有访视已申请重阅，还未处理，当前访视不允许申请"); return ResponseOutput.NotOk("当前为有序阅片，之前有访视,或其他IR的本次访视已申请重阅，还未处理，不允许申请");
} }