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

x

Uat_Study
hang 2022-07-01 09:45:53 +08:00
parent e515970a30
commit 32466cd16d
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -207,7 +207,6 @@
申请重阅 1:IR 2:PM 申请重阅 1:IR 2:PM
</summary> </summary>
<param name="applyReReadingCommand"></param> <param name="applyReReadingCommand"></param>
<param name="_visitTaskCommonService"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.VisitTaskService.ConfirmReReading(IRaCIS.Core.Application.ViewModel.ConfirmReReadingCommand,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)"> <member name="M:IRaCIS.Core.Application.Service.VisitTaskService.ConfirmReReading(IRaCIS.Core.Application.ViewModel.ConfirmReReadingCommand,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)">

25
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -251,8 +251,8 @@ namespace IRaCIS.Core.Application.ViewModel
//public Guid SiteId { get; set; } //public Guid SiteId { get; set; }
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
public String TrialSiteCode { get; set; } = String.Empty; public String TrialSiteCode => VisitTaskList.Select(t=>t.TrialSiteCode).First();
public string SubjectCode { get; set; } = String.Empty; public string SubjectCode => VisitTaskList.Select(t => t.TrialSiteCode).First();
public int? VisitValidTaskCount { get; set; } public int? VisitValidTaskCount { get; set; }
@ -263,20 +263,23 @@ namespace IRaCIS.Core.Application.ViewModel
public class VisitTaskSimpleView public class VisitTaskSimpleView
{ {
public Guid Id { get; set; } public Guid? Id { get; set; }
public Guid TrialId { get; set; } public Guid? TrialId { get; set; }
public Guid SubjectId { get; set; } public Guid? SubjectId { get; set; }
public Arm ArmEnum { get; set; } public Arm? ArmEnum { get; set; }
public string TaskCode { get; set; } public string? TaskCode { get; set; }
public string TaskName { get; set; } public string? TaskName { get; set; }
public string TaskBlindName { get; set; } public string? TaskBlindName { get; set; }
public ReadingCategory ReadingCategory { get; set; } public ReadingCategory? ReadingCategory { get; set; }
public TaskState TaskState { get; set; } public TaskState? TaskState { get; set; }
public String? TrialSiteCode { get; set; } = String.Empty;
public string? SubjectCode { get; set; } = String.Empty;
} }

27
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -241,16 +241,11 @@ namespace IRaCIS.Core.Application.Service
.Where(t => t.ReReadingApplyState != ReReadingApplyState.Agree) .Where(t => t.ReReadingApplyState != ReReadingApplyState.Agree)
.WhereIf(inQuery.IsHaveReadingPeriod == false, t => t.ReadingCategory == ReadingCategory.Visit) .WhereIf(inQuery.IsHaveReadingPeriod == false, t => t.ReadingCategory == ReadingCategory.Visit)
.WhereIf(inQuery.IsHaveReadingPeriod == true, t => t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Global) .WhereIf(inQuery.IsHaveReadingPeriod == true, t => t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Global)
.GroupBy(t => new { t.SubjectId, /*t.TrialId, t.Subject.SiteId,*/ t.Subject.Code, t.Subject.TrialSite.TrialSiteCode }) .GroupBy(t => t.SubjectId)
.Select(g => new SelfConsistentView() .Select(g => new SelfConsistentView()
{ {
SubjectId = g.Key.SubjectId, SubjectId = g.Key,
//TrialId = g.Key.TrialId,
//SiteId = g.Key.SiteId,
SubjectCode = g.Key.Code,
TrialSiteCode = g.Key.TrialSiteCode,
VisitTaskList = g.OrderBy(t => t.SubjectVisit.VisitNum).Select(c => new VisitTaskSimpleView() VisitTaskList = g.OrderBy(t => t.SubjectVisit.VisitNum).Select(c => new VisitTaskSimpleView()
{ {
Id = c.Id, Id = c.Id,
@ -261,13 +256,22 @@ namespace IRaCIS.Core.Application.Service
TaskState = c.TaskState, TaskState = c.TaskState,
ArmEnum = c.ArmEnum, ArmEnum = c.ArmEnum,
SubjectId = c.SubjectId, SubjectId = c.SubjectId,
TrialId = c.TrialId TrialId = c.TrialId,
}).ToList(), SubjectCode = c.Subject.Code,
TrialSiteCode = c.Subject.TrialSite.TrialSiteCode,
}).Take(2).ToList(),
VisitValidTaskCount = g.Count() VisitValidTaskCount = g.Count()
}); });
var count = query.Count();
var list= query.Skip(0).Take(10).ToList();
return query.ToList(); return query.ToList();
} }
@ -968,7 +972,6 @@ namespace IRaCIS.Core.Application.Service
/// 申请重阅 1:IR 2:PM /// 申请重阅 1:IR 2:PM
/// </summary> /// </summary>
/// <param name="applyReReadingCommand"></param> /// <param name="applyReReadingCommand"></param>
/// <param name="_visitTaskCommonService"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[UnitOfWork] [UnitOfWork]
@ -1094,7 +1097,7 @@ namespace IRaCIS.Core.Application.Service
{ {
var origenalAnswerList = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList(); var origenalAnswerList = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
origenalAnswerList.ForEach(t => { t.VisitTaskId = newTask.Id; }); origenalAnswerList.ForEach(t => { t.VisitTaskId = newTask.Id; t.Id=Guid.Empty });
_readingTaskQuestionAnswerRepository.AddRangeAsync(origenalAnswerList); _readingTaskQuestionAnswerRepository.AddRangeAsync(origenalAnswerList);
} }