稽查修改
parent
2be9daa443
commit
2a51de03b7
|
@ -95,6 +95,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
public async Task CalculateTask(CalculateTaskInDto inDto)
|
public async Task CalculateTask(CalculateTaskInDto inDto)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
_userInfo.IsNotNeedInspection = true;
|
||||||
var service = await this.GetService(inDto.VisitTaskId);
|
var service = await this.GetService(inDto.VisitTaskId);
|
||||||
if (service != null)
|
if (service != null)
|
||||||
{
|
{
|
||||||
|
|
|
@ -51,6 +51,8 @@ namespace IRaCIS.Core.Domain.Share
|
||||||
|
|
||||||
Guid? BatchId { get; set; }
|
Guid? BatchId { get; set; }
|
||||||
|
|
||||||
|
bool IsNotNeedInspection { get; set; }
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 字符串形式 标识时区
|
/// 字符串形式 标识时区
|
||||||
|
|
|
@ -298,6 +298,11 @@ namespace IRaCIS.Core.Domain.Share
|
||||||
|
|
||||||
get; set;
|
get; set;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否不需要记录稽查
|
||||||
|
/// </summary>
|
||||||
|
public bool IsNotNeedInspection { get; set; } = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class ClaimAttributes
|
public static class ClaimAttributes
|
||||||
|
|
|
@ -2696,6 +2696,14 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
//保存影像质量 多条记录,只记录一条稽查
|
//保存影像质量 多条记录,只记录一条稽查
|
||||||
if (entitys.Any(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)))
|
if (entitys.Any(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)))
|
||||||
|
{
|
||||||
|
//判断是否不需要记录稽查
|
||||||
|
if (_userInfo.IsNotNeedInspection)
|
||||||
|
{
|
||||||
|
_userInfo.IsNotNeedInspection = false;
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
// 保存影像质量 、 修改整体肿瘤评估结果 、 非dicom 保存访视阅片结果 、附加评估
|
// 保存影像质量 、 修改整体肿瘤评估结果 、 非dicom 保存访视阅片结果 、附加评估
|
||||||
if (_userInfo.RequestUrl == "ReadingImageTask/changeDicomReadingQuestionAnswer"
|
if (_userInfo.RequestUrl == "ReadingImageTask/changeDicomReadingQuestionAnswer"
|
||||||
|
@ -2802,8 +2810,14 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
t => t.ReadingQuestionTrialId,
|
t => t.ReadingQuestionTrialId,
|
||||||
u => u.QuestionId,
|
u => u.QuestionId,
|
||||||
(t, u) =>
|
(t, u) =>
|
||||||
new { Answer = u.AnswerType == "upload" ? "❄❅❆❇❈❉❊" + t.Answer : t.Answer + unitDataList.Where(y => y.Unit == u.Unit).Select(x => x.UnitName).FirstIsNullReturnEmpty()
|
new {
|
||||||
, u.DictionaryCode, u.QuestionName, u.QuestionEnName, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList()
|
Answer = u.AnswerType == "upload" ? "❄❅❆❇❈❉❊" + t.Answer : t.Answer + unitDataList.Where(y => y.Unit == u.Unit).Select(x => x.UnitName).FirstIsNullReturnEmpty()
|
||||||
|
,
|
||||||
|
u.DictionaryCode,
|
||||||
|
u.QuestionName,
|
||||||
|
u.QuestionEnName,
|
||||||
|
u.ShowOrder
|
||||||
|
}).OrderBy(t => t.ShowOrder).ToList()
|
||||||
,
|
,
|
||||||
TableQuestionAndAnswerList = tableQuesionAndAnswerList
|
TableQuestionAndAnswerList = tableQuesionAndAnswerList
|
||||||
}
|
}
|
||||||
|
@ -2811,6 +2825,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue