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

修改裁判任务列表

Test.EIImageViewer
hang 2022-06-14 09:54:04 +08:00
parent d349e049dd
commit 15daf09afa
4 changed files with 99 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,6 @@ namespace IRaCIS.Core.Application.ViewModel
public class JudgeVisitTaskView : VisitTaskView public class JudgeVisitTaskView : VisitTaskView
{ {
public string? JudgeTaskCode { get; set; }
public List<HistoryReadingDoctorUser> HistoryReadingDoctorUserList { get; set; } public List<HistoryReadingDoctorUser> HistoryReadingDoctorUserList { get; set; }
@ -68,6 +67,8 @@ namespace IRaCIS.Core.Application.ViewModel
public class HistoryReadingDoctorUser public class HistoryReadingDoctorUser
{ {
public string? JudgeTaskCode { get; set; }
public Guid DoctorUserId { get; set; } public Guid DoctorUserId { get; set; }
public string UserCode { get; set; } public string UserCode { get; set; }
@ -202,7 +203,7 @@ namespace IRaCIS.Core.Application.ViewModel
{ {
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
public List<Guid> DoctorUserIdList { get; set; } public List<Guid> DoctorUserIdList { get; set; }=new List<Guid> ();
} }
public class AutoSubjectAssignCommand public class AutoSubjectAssignCommand

17
IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
View File

@ -48,14 +48,15 @@ namespace IRaCIS.Core.Application.Service
.ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName)) .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
.ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName)) .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
.ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName)) .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName))
.ForMember(o => o.JudgeTaskCode, t => t.MapFrom(u => u.JudgeVisitTask.TaskCode))
.ForMember(o => o.HistoryReadingDoctorUserList, t => t.MapFrom(u => u.JudgeVisitList.Select(u=>u.DoctorUser))); .ForMember(o => o.HistoryReadingDoctorUserList, t => t.MapFrom(u => u.JudgeVisitList));
CreateMap<User, HistoryReadingDoctorUser>() CreateMap<VisitTask, HistoryReadingDoctorUser>()
.ForMember(o => o.UserCode, t => t.MapFrom(u => u.UserCode)) .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
.ForMember(o => o.UserName, t => t.MapFrom(u => u.UserName)) .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
.ForMember(o => o.FullName, t => t.MapFrom(u => u.FullName)) .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
.ForMember(o => o.DoctorUserId, t => t.MapFrom(u => u.Id)); .ForMember(o => o.JudgeTaskCode, t => t.MapFrom(u => u.TaskCode))
.ForMember(o => o.DoctorUserId, t => t.MapFrom(u => u.DoctorUser.Id));
CreateMap<Subject, SubjectAssignView>() CreateMap<Subject, SubjectAssignView>()
@ -65,7 +66,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(o => o.IsAssignedDoctorUser, t => t.MapFrom(u => u.SubjectDoctorList.Any())) .ForMember(o => o.IsAssignedDoctorUser, t => t.MapFrom(u => u.SubjectDoctorList.Any()))
.ForMember(o => o.DoctorUserList, t => t.MapFrom(u => u.SubjectDoctorList.OrderByDescending(t=>t.ArmEnum))); .ForMember(o => o.DoctorUserList, t => t.MapFrom(u => u.SubjectDoctorList.OrderBy(t=>t.ArmEnum)));
CreateMap<SubjectUser, AssignDoctorView>() CreateMap<SubjectUser, AssignDoctorView>()
//.ForMember(o => o.AssignTime, t => t.MapFrom(u => u.AssignTime)) //.ForMember(o => o.AssignTime, t => t.MapFrom(u => u.AssignTime))

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

@ -13,6 +13,7 @@ namespace IRaCIS.Core.Domain.Share
//全局 //全局
Global=3, Global=3,
//裁判
Judge=4 Judge=4
} }

165
IRaCIS.Core.Domain/Allocation/VisitTask.cs
View File

@ -11,127 +11,134 @@ using System.Collections.Generic;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models
{ {
///<summary> ///<summary>
///VisitTask ///VisitTask
///</summary> ///</summary>
[Table("VisitTask")] [Table("VisitTask")]
public class VisitTask : Entity, IAuditUpdate, IAuditAdd public class VisitTask : Entity, IAuditUpdate, IAuditAdd
{ {
public Guid TrialId { get; set; }
/// <summary> public Guid TrialId { get; set; }
/// <summary>
/// CreateUserId /// CreateUserId
/// </summary> /// </summary>
[Required] [Required]
public Guid CreateUserId { get; set; } public Guid CreateUserId { get; set; }
/// <summary> /// <summary>
/// CreateTime /// CreateTime
/// </summary> /// </summary>
[Required] [Required]
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary> /// <summary>
/// UpdateTime /// UpdateTime
/// </summary> /// </summary>
[Required] [Required]
public DateTime UpdateTime { get; set; } public DateTime UpdateTime { get; set; }
/// <summary> /// <summary>
/// UpdateUserId /// UpdateUserId
/// </summary> /// </summary>
[Required] [Required]
public Guid UpdateUserId { get; set; } public Guid UpdateUserId { get; set; }
/// <summary> /// <summary>
/// TaskName /// TaskName
/// </summary> /// </summary>
[Required] [Required]
public string TaskName { get; set; }=string.Empty; public string TaskName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// TaskBlindName /// TaskBlindName
/// </summary> /// </summary>
[Required] [Required]
public string TaskBlindName { get; set; } = string.Empty; public string TaskBlindName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// ReadingCategory /// ReadingCategory
/// </summary> /// </summary>
[Required] [Required]
public ReadingCategory ReadingCategory { get; set; } public ReadingCategory ReadingCategory { get; set; }
/// <summary> /// <summary>
/// CheckPassedTime /// CheckPassedTime
/// </summary> /// </summary>
public DateTime? CheckPassedTime { get; set; } public DateTime? CheckPassedTime { get; set; }
/// <summary> /// <summary>
/// AllocateTime /// AllocateTime
/// </summary> /// </summary>
public DateTime? AllocateTime { get; set; } public DateTime? AllocateTime { get; set; }
/// <summary> /// <summary>
/// SubjectId /// SubjectId
/// </summary> /// </summary>
[Required] [Required]
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
public Subject Subject { get; set; } public Subject Subject { get; set; }
/// <summary> /// <summary>
/// Code /// Code
/// </summary> /// </summary>
[Required] [Required]
public int Code { get; set; } public int Code { get; set; }
/// <summary> /// <summary>
/// TaskCode /// TaskCode
/// </summary> /// </summary>
[Required] [Required]
public string TaskCode { get; set; } = string.Empty; public string TaskCode { get; set; } = string.Empty;
/// <summary> /// <summary>
/// IsUrgent /// IsUrgent
/// </summary> /// </summary>
[Required] [Required]
public bool IsUrgent { get; set; } public bool IsUrgent { get; set; }
/// <summary> /// <summary>
/// ArmEnum /// ArmEnum
/// </summary> /// </summary>
[Required] [Required]
public int ArmEnum { get; set; } public int ArmEnum { get; set; }
public TaskState TaskState { get; set; } public TaskState TaskState { get; set; }
/// <summary> /// <summary>
/// DoctorUserId /// DoctorUserId
/// </summary> /// </summary>
public Guid? DoctorUserId { get; set; } public Guid? DoctorUserId { get; set; }
[ForeignKey("DoctorUserId")] [ForeignKey("DoctorUserId")]
public User DoctorUser { get; set; } public User DoctorUser { get; set; }
public TaskAllocationRule DoctorTaskAllocationRule { get; set; } public TaskAllocationRule DoctorTaskAllocationRule { get; set; }
//裁判任务的Id //裁判任务的Id
public Guid? JudgeVisitTaskId { get; set; } public Guid? JudgeVisitTaskId { get; set; }
public VisitTask JudgeVisitTask { get; set; } public VisitTask JudgeVisitTask { get; set; }
//对于裁判项而言，触发裁判的列表
public List<VisitTask> JudgeVisitList { get; set; }
//对于裁判项而言，触发裁判的列表 //建议完成时间
public int SuggesteDays { get; set; }
public List<VisitTask> JudgeVisitList { get; set; } public int ReadingTaskState { get; set; }
public DateTime? SignTime { get; set; }
//是否回退过
public bool IsReturned { get; set; }
} }
} }