XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一版

Test.EIImageViewer
he 2023-03-07 17:33:13 +08:00
parent 54976b389b
commit 66a65a770d
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,6 +158,8 @@ namespace IRaCIS.Core.Application.Service
taskUrgentType = TaskUrgentType.VisitUrgent; taskUrgentType = TaskUrgentType.VisitUrgent;
} }
bool isCanEditUrgentState = taskUrgentType == TaskUrgentType.EnrollmentConfirm || taskUrgentType == TaskUrgentType.PDProgress ? false : true;
if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double) if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double)
{ {
//未防止脏数据 这里也多判断一次 //未防止脏数据 这里也多判断一次
@ -184,6 +186,7 @@ namespace IRaCIS.Core.Application.Service
TaskName = subjectVisit.VisitName, TaskName = subjectVisit.VisitName,
VisitTaskNum = subjectVisit.VisitNum, VisitTaskNum = subjectVisit.VisitNum,
TaskUrgentType = taskUrgentType, TaskUrgentType = taskUrgentType,
IsCanEditUrgentState= isCanEditUrgentState,
//CheckPassedTime = subjectVisit.CheckPassedTime, //CheckPassedTime = subjectVisit.CheckPassedTime,
ArmEnum = Arm.DoubleReadingArm1,//特殊 ArmEnum = Arm.DoubleReadingArm1,//特殊
Code = currentMaxCodeInt, Code = currentMaxCodeInt,
@ -211,6 +214,7 @@ namespace IRaCIS.Core.Application.Service
TaskBlindName = blindTaskName, TaskBlindName = blindTaskName,
TaskName = subjectVisit.VisitName, TaskName = subjectVisit.VisitName,
TaskUrgentType = taskUrgentType, TaskUrgentType = taskUrgentType,
IsCanEditUrgentState = isCanEditUrgentState,
VisitTaskNum = subjectVisit.VisitNum, VisitTaskNum = subjectVisit.VisitNum,
//CheckPassedTime = subjectVisit.CheckPassedTime, //CheckPassedTime = subjectVisit.CheckPassedTime,
ArmEnum = Arm.DoubleReadingArm2,//特殊 ArmEnum = Arm.DoubleReadingArm2,//特殊
@ -265,6 +269,7 @@ namespace IRaCIS.Core.Application.Service
TaskName = subjectVisit.VisitName, TaskName = subjectVisit.VisitName,
VisitTaskNum = subjectVisit.VisitNum, VisitTaskNum = subjectVisit.VisitNum,
TaskUrgentType = taskUrgentType, TaskUrgentType = taskUrgentType,
IsCanEditUrgentState = isCanEditUrgentState,
//CheckPassedTime = subjectVisit.CheckPassedTime, //CheckPassedTime = subjectVisit.CheckPassedTime,
ArmEnum = Arm.SingleReadingArm, //特殊 ArmEnum = Arm.SingleReadingArm, //特殊
Code = currentMaxCodeInt + 1, Code = currentMaxCodeInt + 1,
@ -478,6 +483,8 @@ namespace IRaCIS.Core.Application.Service
taskUrgentType = TaskUrgentType.VisitUrgent; taskUrgentType = TaskUrgentType.VisitUrgent;
} }
bool isCanEditUrgentState = taskUrgentType == TaskUrgentType.EnrollmentConfirm || taskUrgentType == TaskUrgentType.PDProgress ? false : true;
var visitNumList = _subjectVisitRepository.Where(t => t.SubjectId == subjectGroup.SubjectId && t.IsLostVisit == false).OrderBy(t => t.VisitNum).Select(t => t.VisitNum).ToList(); var visitNumList = _subjectVisitRepository.Where(t => t.SubjectId == subjectGroup.SubjectId && t.IsLostVisit == false).OrderBy(t => t.VisitNum).Select(t => t.VisitNum).ToList();
@ -535,7 +542,7 @@ namespace IRaCIS.Core.Application.Service
IsUrgent = subjectVisit.IsUrgent, IsUrgent = subjectVisit.IsUrgent,
TaskBlindName = blindTaskName, TaskBlindName = blindTaskName,
TaskUrgentType = taskUrgentType, TaskUrgentType = taskUrgentType,
IsCanEditUrgentState = isCanEditUrgentState,
TaskName = subjectVisit.VisitName, TaskName = subjectVisit.VisitName,
VisitTaskNum = subjectVisit.VisitNum, VisitTaskNum = subjectVisit.VisitNum,
//CheckPassedTime = subjectVisit.CheckPassedTime, //CheckPassedTime = subjectVisit.CheckPassedTime,
@ -562,6 +569,7 @@ namespace IRaCIS.Core.Application.Service
TaskBlindName = blindTaskName, TaskBlindName = blindTaskName,
TaskName = subjectVisit.VisitName, TaskName = subjectVisit.VisitName,
TaskUrgentType = taskUrgentType, TaskUrgentType = taskUrgentType,
IsCanEditUrgentState = isCanEditUrgentState,
VisitTaskNum = subjectVisit.VisitNum, VisitTaskNum = subjectVisit.VisitNum,
//CheckPassedTime = subjectVisit.CheckPassedTime, //CheckPassedTime = subjectVisit.CheckPassedTime,
ArmEnum = Arm.DoubleReadingArm2,//特殊 ArmEnum = Arm.DoubleReadingArm2,//特殊
@ -845,6 +853,7 @@ namespace IRaCIS.Core.Application.Service
TaskBlindName = blindTaskName, TaskBlindName = blindTaskName,
TaskName = subjectVisit.VisitName, TaskName = subjectVisit.VisitName,
TaskUrgentType = taskUrgentType, TaskUrgentType = taskUrgentType,
IsCanEditUrgentState = isCanEditUrgentState,
VisitTaskNum = subjectVisit.VisitNum, VisitTaskNum = subjectVisit.VisitNum,
//CheckPassedTime = subjectVisit.CheckPassedTime, //CheckPassedTime = subjectVisit.CheckPassedTime,
ArmEnum = Arm.SingleReadingArm, //特殊 ArmEnum = Arm.SingleReadingArm, //特殊
@ -1099,7 +1108,7 @@ namespace IRaCIS.Core.Application.Service
{ {
taskUrgent = TaskUrgentType.VisitUrgent; taskUrgent = TaskUrgentType.VisitUrgent;
} }
bool isCanEditUrgent = taskUrgent == TaskUrgentType.EnrollmentConfirm || taskUrgent == TaskUrgentType.PDProgress ? false : true;
var newTask = await _visitTaskRepository.AddAsync(new VisitTask() var newTask = await _visitTaskRepository.AddAsync(new VisitTask()
{ {
@ -1111,7 +1120,7 @@ namespace IRaCIS.Core.Application.Service
IsUrgent = reReadingVisitTask.IsAnalysisCreate?false: subjectVisitUrgentInfo.IsUrgent, IsUrgent = reReadingVisitTask.IsAnalysisCreate?false: subjectVisitUrgentInfo.IsUrgent,
TaskUrgentType = reReadingVisitTask.IsAnalysisCreate ? null : taskUrgent, TaskUrgentType = reReadingVisitTask.IsAnalysisCreate ? null : taskUrgent,
IsCanEditUrgentState = isCanEditUrgent,
VisitTaskNum = reReadingVisitTask.VisitTaskNum, VisitTaskNum = reReadingVisitTask.VisitTaskNum,
ReadingCategory = reReadingVisitTask.ReadingCategory, ReadingCategory = reReadingVisitTask.ReadingCategory,
SourceSubjectVisitId = reReadingVisitTask.SourceSubjectVisitId, SourceSubjectVisitId = reReadingVisitTask.SourceSubjectVisitId,
@ -1282,7 +1291,7 @@ namespace IRaCIS.Core.Application.Service
VisitTaskNum = firstTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Judge], VisitTaskNum = firstTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Judge],
TrialId = firstTask.TrialId, TrialId = firstTask.TrialId,
Code = currentMaxCodeInt + 1, Code = currentMaxCodeInt + 1,
IsCanEditUrgentState= firstTask.IsCanEditUrgentState,
SourceSubjectVisitId = firstTask.SourceSubjectVisitId, SourceSubjectVisitId = firstTask.SourceSubjectVisitId,
SouceReadModuleId = firstTask.SouceReadModuleId, SouceReadModuleId = firstTask.SouceReadModuleId,
TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)), TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
@ -1340,7 +1349,8 @@ namespace IRaCIS.Core.Application.Service
TaskName = item.ReadingName, TaskName = item.ReadingName,
ArmEnum = originalTaskInfo.ArmEnum,//特殊 ArmEnum = originalTaskInfo.ArmEnum,//特殊
TaskUrgentType= originalTaskInfo.TaskUrgentType, TaskUrgentType= originalTaskInfo.TaskUrgentType,
TaskUrgentRemake= originalTaskInfo.TaskUrgentRemake, IsCanEditUrgentState= originalTaskInfo.IsCanEditUrgentState,
TaskUrgentRemake = originalTaskInfo.TaskUrgentRemake,
DoctorUserId = originalTaskInfo.DoctorUserId, DoctorUserId = originalTaskInfo.DoctorUserId,
AllocateTime = DateTime.Now, AllocateTime = DateTime.Now,
TaskAllocationState = TaskAllocationState.Allocated, TaskAllocationState = TaskAllocationState.Allocated,