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

x

Uat_Study
hang 2022-07-06 17:07:04 +08:00
parent 2c92fafd81
commit 0c858b51e9
4 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
View File

@ -198,13 +198,13 @@ namespace IRaCIS.Core.Application.Service
SubjectCode = c.Subject.Code, SubjectCode = c.Subject.Code,
TrialSiteCode = c.Subject.TrialSite.TrialSiteCode, TrialSiteCode = c.Subject.TrialSite.TrialSiteCode,
RelationDoctorUserList = c.SameVisitTaskList/*Where(t=>t.ReadingTaskState == ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect)*/.Select(c => new UserSimpleInfo() //RelationDoctorUserList = c.SameVisitTaskList/*Where(t=>t.ReadingTaskState == ReadingTaskState.HaveSigned && t.TaskState == TaskState.Effect)*/.Select(c => new UserSimpleInfo()
{ //{
FullName = c.DoctorUser.FullName, // FullName = c.DoctorUser.FullName,
UserCode = c.DoctorUser.UserCode, // UserCode = c.DoctorUser.UserCode,
UserId = c.DoctorUser.Id, // UserId = c.DoctorUser.Id,
UserName = c.DoctorUser.UserName // UserName = c.DoctorUser.UserName
}).ToList(), //}).ToList(),
IsHaveGeneratedTask = c.Subject.SubjectVisitTaskList.Any(t => t.IsAnalysisCreate && t.DoctorUserId == doctorUserId && t.TaskConsistentRuleId == filterObj.Id), IsHaveGeneratedTask = c.Subject.SubjectVisitTaskList.Any(t => t.IsAnalysisCreate && t.DoctorUserId == doctorUserId && t.TaskConsistentRuleId == filterObj.Id),

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

@ -1303,15 +1303,21 @@ namespace IRaCIS.Core.Application.Service
switch (influenceTask.ReadingCategory) switch (influenceTask.ReadingCategory)
{ {
case ReadingCategory.Visit: case ReadingCategory.Visit:
break;
case ReadingCategory.Global: case ReadingCategory.Global:
case ReadingCategory.Judge:
break;
case ReadingCategory.Oncology: case ReadingCategory.Oncology:
if (influenceTask.ReadingTaskState == ReadingTaskState.HaveSigned)
{
influenceTask.TaskState = TaskState.HaveReturned;
}
else
{
influenceTask.TaskState = TaskState.Adbandon;
}
break; break;
case ReadingCategory.Judge:
default: default:
throw new BusinessValidationFailedException("不支持回退任务类型"); throw new BusinessValidationFailedException("不支持回退任务类型");
@ -1328,6 +1334,7 @@ namespace IRaCIS.Core.Application.Service
influenceTask.AllocateTime = null; influenceTask.AllocateTime = null;
influenceTask.TaskAllocationState = TaskAllocationState.NotAllocate; influenceTask.TaskAllocationState = TaskAllocationState.NotAllocate;
break; break;
case ReadingCategory.Global: case ReadingCategory.Global:
case ReadingCategory.Judge: case ReadingCategory.Judge:
case ReadingCategory.Oncology: case ReadingCategory.Oncology:

2
IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs
View File

@ -150,7 +150,7 @@ namespace IRaCIS.Core.Domain.Share
//未生效 //未生效
NotEffect = 1, NotEffect = 1,
// 废弃（裁判任务，没做，或者做了没签名 ） // 废弃 没做，或者做了没签名
Adbandon = 3, Adbandon = 3,
//重置 （裁判任务做了，签名了 算工作量） //重置 （裁判任务做了，签名了 算工作量）

2
IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
View File

@ -97,7 +97,7 @@ namespace IRaCIS.Core.Infra.EFCore
modelBuilder.Entity<SubjectUser>().HasMany(t => t.SubjectArmVisitTaskList).WithOne(t=>t.SujectArm).HasForeignKey(t => new { t.SubjectId,t.ArmEnum}).HasPrincipalKey(u => new { u.SubjectId,u.ArmEnum }); modelBuilder.Entity<SubjectUser>().HasMany(t => t.SubjectArmVisitTaskList).WithOne(t=>t.SujectArm).HasForeignKey(t => new { t.SubjectId,t.ArmEnum}).HasPrincipalKey(u => new { u.SubjectId,u.ArmEnum });
modelBuilder.Entity<VisitTask>().HasMany(t => t.JudgeVisitList).WithOne(t=>t.JudgeVisitTask); modelBuilder.Entity<VisitTask>().HasMany(t => t.JudgeVisitList).WithOne(t=>t.JudgeVisitTask);
modelBuilder.Entity<VisitTask>().HasMany(t => t.SameVisitTaskList).WithOne().HasForeignKey(t=>t.SourceSubjectVisitId).HasPrincipalKey(u=>u.SourceSubjectVisitId); //modelBuilder.Entity<VisitTask>().HasMany(t => t.SameVisitTaskList).WithOne().HasForeignKey(t=>t.SourceSubjectVisitId).HasPrincipalKey(u=>u.SourceSubjectVisitId);
//modelBuilder.Entity<VisitTask>().HasMany(t => t.AnalysisVisitTaskList).WithOne().HasForeignKey(t => t.TaskConsistentRuleId).HasPrincipalKey(u => u.SourceSubjectVisitId); //modelBuilder.Entity<VisitTask>().HasMany(t => t.AnalysisVisitTaskList).WithOne().HasForeignKey(t => t.TaskConsistentRuleId).HasPrincipalKey(u => u.SourceSubjectVisitId);