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

修改 Follow Up 0

Uat_Study
{872297557@qq.com} 2022-12-08 16:53:21 +08:00
parent 5c3701012a
commit 8fbbc0a4e2
2 changed files with 29 additions and 9 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

@ -110,6 +110,14 @@ namespace IRaCIS.Core.Application.Service
{ {
var blindTaskName = string.Empty; var blindTaskName = string.Empty;
if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0)
{
blindTaskName = "Baseline";
}
else
{
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder) if (trialReadingCriterionConfig.IsReadingTaskViewInOrder)
{ {
blindTaskName = AppSettings.BlindTaskPrefix + visitNumList.IndexOf(subjectVisit.VisitNum); blindTaskName = AppSettings.BlindTaskPrefix + visitNumList.IndexOf(subjectVisit.VisitNum);
@ -118,6 +126,8 @@ namespace IRaCIS.Core.Application.Service
{ {
blindTaskName = AppSettings.BlindTaskPrefix; blindTaskName = AppSettings.BlindTaskPrefix;
} }
}
if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double) if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double)
{ {
@ -280,6 +290,13 @@ namespace IRaCIS.Core.Application.Service
var blindTaskName = string.Empty; var blindTaskName = string.Empty;
if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0)
{
blindTaskName = "Baseline";
}
else
{
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder) if (trialReadingCriterionConfig.IsReadingTaskViewInOrder)
{ {
blindTaskName = AppSettings.BlindTaskPrefix + visitNumList.IndexOf(subjectVisit.VisitNum); blindTaskName = AppSettings.BlindTaskPrefix + visitNumList.IndexOf(subjectVisit.VisitNum);
@ -288,6 +305,9 @@ namespace IRaCIS.Core.Application.Service
{ {
blindTaskName = AppSettings.BlindTaskPrefix; blindTaskName = AppSettings.BlindTaskPrefix;
} }
}
if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double) if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double)

4
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -492,8 +492,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
#region 裁判、肿瘤学、全局 都是通用的 #region 裁判、肿瘤学、全局 都是通用的
//裁判任务 //裁判任务 结果的保存 和签名提交
if (entity.JudgeResultTaskId != null && (_userInfo.RequestUrl == "ReadingImageTask/SaveJudgeVisitTaskResult" || _userInfo.RequestUrl == "ReadingImageTask/saveJudgeVisitTaskResult")) if (entity.JudgeResultTaskId != null && (_userInfo.RequestUrl == "ReadingImageTask/SaveJudgeVisitTaskResult" || _userInfo.RequestUrl == "ReadingImageTask/SubmitJudgeVisitTaskResult"))
{ {
var list = await _dbContext.VisitTask.Where(t => t.TaskState == TaskState.Effect && t.SubjectId == entity.SubjectId && t.VisitTaskNum == entity.VisitTaskNum).Select(t => new { t.Id, t.DoctorUser.FullName, t.ArmEnum }).OrderBy(t => t.ArmEnum).ToListAsync(); var list = await _dbContext.VisitTask.Where(t => t.TaskState == TaskState.Effect && t.SubjectId == entity.SubjectId && t.VisitTaskNum == entity.VisitTaskNum).Select(t => new { t.Id, t.DoctorUser.FullName, t.ArmEnum }).OrderBy(t => t.ArmEnum).ToListAsync();