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

修改入组

Uat_Study
{872297557@qq.com} 2022-12-02 09:08:26 +08:00
parent 15bbd79e7d
commit 11baf5e887
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,10 +221,6 @@ namespace IRaCIS.Core.Application.Service
}
public async Task AddTaskAsync(GenerateTaskCommand generateTaskCommand)
{
@ -233,10 +229,6 @@ namespace IRaCIS.Core.Application.Service
var trialReadingCriterionConfigList = _trialReadingCriterionRepository.Where(t => t.TrialId == trialId && t.ReadingInfoSignTime !=null).Select(t => new { TrialReadingCriterionId= t.Id ,t.ReadingTool,t.ReadingType, t.IsReadingTaskViewInOrder, t.IsFollowVisitAutoAssign, t.IsFollowGlobalVisitAutoAssign, t.FollowGlobalVisitAutoAssignDefaultState, t.FollowVisitAutoAssignDefaultState,t.TaskAllocateObjEnum } ).ToList();
//var trialConfig = (await _trialRepository.Where(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.IsFollowVisitAutoAssign, t.IsFollowGlobalVisitAutoAssign, t.FollowGlobalVisitAutoAssignDefaultState, t.FollowVisitAutoAssignDefaultState, t.TaskAllocateObjEnum, }).FirstOrDefaultAsync()).IfNullThrowException();
//var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == trialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
var dbMaxCode = _visitTaskRepository.Where(t => t.TrialId == trialId).Select(t => t.Code).DefaultIfEmpty().Max();
@ -250,11 +242,9 @@ namespace IRaCIS.Core.Application.Service
foreach (var subjectVisit in generateTaskCommand.VisitGenerataTaskList)
{
foreach (var trialReadingCriterionConfig in trialReadingCriterionConfigList)
{
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();

2
IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
View File

@ -782,7 +782,7 @@ namespace IRaCIS.Core.Application.Contracts
if (!await _trialUserRepository.AnyAsync(t => t.TrialId == trialId && t.UserId == userId, true))
{
await _repository.AddAsync(new TrialUser() { TrialId = trialId, UserId = userId });
await _repository.AddAsync(new TrialUser() { TrialId = trialId, UserId = userId ,JoinTime=DateTime.Now});
await _repository.AddAsync(new TrialSiteUser() { TrialId = trialId, SiteId = siteId, UserId = userId });

8
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
View File

@ -84,6 +84,8 @@ namespace IRaCIS.Core.Application.Services
svCommand.VisitExecuted = svCommand.IsLostVisit ? VisitExecutedEnum.Executed : svCommand.VisitExecuted;
SubjectVisit? dbBeforeEntity = null;
//Add
if (svCommand.Id == null)
@ -96,6 +98,12 @@ namespace IRaCIS.Core.Application.Services
{
throw new BusinessValidationFailedException("设置末次评估后，不允许添加计划外访视。");
}
if (await _repository.AnyAsync<VisitTask>(t=>t.SubjectId==svCommand.SubjectId && t.TaskState==TaskState.Effect && t.VisitTaskNum > svCommand.VisitNum && t.SignTime != null))
{
throw new BusinessValidationFailedException("该受试者后续访视已有任务完成阅片，不允许在此添加，如果确实需要，请回退");
}
}
dbBeforeEntity = await _subjectVisitRepository.InsertFromDTOAsync(svCommand, false, verifyExp1, verifyExp2, verifyExp3);

2
IRaCIS.Core.Domain/Visit/VisitStage.cs
View File

@ -12,6 +12,8 @@ namespace IRaCIS.Core.Domain.Models
public string BlindName { get; set; } = string.Empty;
[Column(TypeName = "decimal(18,1)")]
public decimal VisitNum { get; set; }
public string VisitName { get; set; } = string.Empty;