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

修改

Browse Source
This commit is contained in:
hang
2023-04-10 13:57:29 +08:00
parent 4955437524
commit 80ef28f640
11 changed files with 103 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+34 -32
View File
@@ -123,26 +123,28 @@ namespace IRaCIS.Core.Application.Service
foreach (var subjectVisit in subjectGroup.SubjectVisitList)
{
var blindTaskName = string.Empty;
//var blindTaskName = string.Empty;
var blindTaskName = subjectVisit.VisitName;
var isNeedClinicalDataSign = IsNeedClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionConfig.TrialReadingCriterionId, clinicalDataConfirmList);
var isClinicalDataSign = IsClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionConfig.TrialReadingCriterionId, clinicalDataConfirmList, subjectVisit.Id, trialId);
if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0)
{
blindTaskName = visitBlindConfig.BlindBaseLineName;
}
else
{
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder)
{
blindTaskName = visitBlindConfig.BlindFollowUpPrefix + " " + visitNumList.IndexOf(subjectVisit.VisitNum);
}
else
{
blindTaskName = visitBlindConfig.BlindFollowUpPrefix;
}
}
//if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0)
//{
// blindTaskName = visitBlindConfig.BlindBaseLineName;
//}
//else
//{
// if (trialReadingCriterionConfig.IsReadingTaskViewInOrder)
// {
// blindTaskName = visitBlindConfig.BlindFollowUpPrefix + " " + visitNumList.IndexOf(subjectVisit.VisitNum);
// }
// else
// {
// blindTaskName = visitBlindConfig.BlindFollowUpPrefix;
// }
//}
//每个访视 根据项目配置生成任务 双审生成两个
@@ -540,27 +542,27 @@ namespace IRaCIS.Core.Application.Service
var assignConfigList = await _subjectUserRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.OrignalSubjectUserId == null && t.IsConfirmed).Select(u => new { u.DoctorUserId, u.ArmEnum }).ToListAsync();
var blindTaskName = string.Empty;
var blindTaskName = subjectVisit.VisitName;
var isNeedClinicalDataSign = IsNeedClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionConfig.TrialReadingCriterionId, clinicalDataConfirmList);
var isClinicalDataSign = IsClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionConfig.TrialReadingCriterionId, clinicalDataConfirmList, subjectVisit.Id, trialId);
if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0)
{
blindTaskName = visitBlindConfig.BlindBaseLineName;
}
else
{
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder)
{
blindTaskName = visitBlindConfig.BlindFollowUpPrefix + " " + visitNumList.IndexOf(subjectVisit.VisitNum);
}
else
{
blindTaskName = visitBlindConfig.BlindFollowUpPrefix;
}
}
//if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0)
//{
// blindTaskName = visitBlindConfig.BlindBaseLineName;
//}
//else
//{
// if (trialReadingCriterionConfig.IsReadingTaskViewInOrder)
// {
// blindTaskName = visitBlindConfig.BlindFollowUpPrefix + " " + visitNumList.IndexOf(subjectVisit.VisitNum);
// }
// else
// {
// blindTaskName = visitBlindConfig.BlindFollowUpPrefix;
// }
//}
//每个访视 根据项目配置生成任务 双审生成两个
IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs
+2 -1
View File
@@ -5,6 +5,7 @@
//--------------------------------------------------------------------
using IRaCIS.Core.Domain.Models;
using IRaCIS.Core.Infrastructure.Extention;
using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -25,7 +26,7 @@ namespace IRaCIS.Core.Application.Contracts
public class UnionDocumentView : SystemDocumentAddOrEdit
{
public string FullFilePath { get; set; } = string.Empty;
public string FullFilePath { get; set; }
public DateTime CreateTime { get; set; }
public DateTime UpdateTime { get; set; }
IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs
+1 -1
View File
@@ -151,7 +151,7 @@ namespace IRaCIS.Core.Application.Services
FileType = sysDoc.FileType.MappedValue,
UpdateTime = sysDoc.UpdateTime,
FullFilePath = sysDoc.Path + "?access_token=" + _userInfo.UserToken,
FullFilePath = sysDoc.Path ,
ConfirmUserId = confirm.ConfirmUserId,
ConfirmTime = confirm.ConfirmTime,
IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
+3
View File
@@ -195,6 +195,9 @@ namespace IRaCIS.Application.Services
trial.IsHaveFirstGiveMedicineDate = false;
trial.TrialStatusStr = StaticData.TrialState.TrialOngoing;
trial.BlindBaseLineName = "Batch 1";
trial.BlindBaseLineName = "Batch ";
#endregion