Uat_Study
parent
cf03ff62e7
commit
a7e7f19c6c
|
@ -1514,7 +1514,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
|
|||
var origenalTask = (await _visitTaskRepository.Where(t => item.OriginalReReadingTaskId == t.Id).FirstOrDefaultAsync()).IfNullThrowException();
|
||||
|
||||
|
||||
if (origenalTask.TaskState != TaskState.Effect)
|
||||
if ( (origenalTask.TaskState != TaskState.Effect|| origenalTask.TaskState != TaskState.Freeze))
|
||||
{
|
||||
//---当前申请重阅任务的状态,已被其他任务重阅已影响,不允许对该状态下的任务进行重阅同意与否操作
|
||||
return ResponseOutput.NotOk(_localizer["VisitTask_ReapplyStatusConflict"]);
|
||||
|
|
|
@ -245,6 +245,7 @@ namespace IRaCIS.Core.Application.Service.Common
|
|||
{
|
||||
PreserveReferencesHandling = PreserveReferencesHandling.All,
|
||||
Formatting = Formatting.Indented,
|
||||
|
||||
};
|
||||
dynamic data = JsonConvert.DeserializeObject(json, settings);
|
||||
|
||||
|
|
Loading…
Reference in New Issue