修改裁判任务列表
parent
d349e049dd
commit
15daf09afa
|
|
@ -57,7 +57,6 @@ namespace IRaCIS.Core.Application.ViewModel
|
|||
public class JudgeVisitTaskView : VisitTaskView
|
||||
{
|
||||
|
||||
public string? JudgeTaskCode { get; set; }
|
||||
|
||||
|
||||
public List<HistoryReadingDoctorUser> HistoryReadingDoctorUserList { get; set; }
|
||||
|
|
@ -68,6 +67,8 @@ namespace IRaCIS.Core.Application.ViewModel
|
|||
|
||||
public class HistoryReadingDoctorUser
|
||||
{
|
||||
|
||||
public string? JudgeTaskCode { get; set; }
|
||||
public Guid DoctorUserId { get; set; }
|
||||
|
||||
public string UserCode { get; set; }
|
||||
|
|
@ -202,7 +203,7 @@ namespace IRaCIS.Core.Application.ViewModel
|
|||
{
|
||||
public Guid SubjectId { get; set; }
|
||||
|
||||
public List<Guid> DoctorUserIdList { get; set; }
|
||||
public List<Guid> DoctorUserIdList { get; set; }=new List<Guid> ();
|
||||
}
|
||||
|
||||
public class AutoSubjectAssignCommand
|
||||
|
|
|
|||
|
|
@ -48,14 +48,15 @@ namespace IRaCIS.Core.Application.Service
|
|||
.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.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>()
|
||||
.ForMember(o => o.UserCode, t => t.MapFrom(u => u.UserCode))
|
||||
.ForMember(o => o.UserName, t => t.MapFrom(u => u.UserName))
|
||||
.ForMember(o => o.FullName, t => t.MapFrom(u => u.FullName))
|
||||
.ForMember(o => o.DoctorUserId, t => t.MapFrom(u => u.Id));
|
||||
CreateMap<VisitTask, HistoryReadingDoctorUser>()
|
||||
.ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
|
||||
.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.JudgeTaskCode, t => t.MapFrom(u => u.TaskCode))
|
||||
.ForMember(o => o.DoctorUserId, t => t.MapFrom(u => u.DoctorUser.Id));
|
||||
|
||||
|
||||
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.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>()
|
||||
//.ForMember(o => o.AssignTime, t => t.MapFrom(u => u.AssignTime))
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ namespace IRaCIS.Core.Domain.Share
|
|||
//全局
|
||||
Global=3,
|
||||
|
||||
//裁判
|
||||
Judge=4
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,127 +11,134 @@ using System.Collections.Generic;
|
|||
|
||||
namespace IRaCIS.Core.Domain.Models
|
||||
{
|
||||
///<summary>
|
||||
///VisitTask
|
||||
///</summary>
|
||||
[Table("VisitTask")]
|
||||
public class VisitTask : Entity, IAuditUpdate, IAuditAdd
|
||||
{
|
||||
|
||||
public Guid TrialId { get; set; }
|
||||
///<summary>
|
||||
///VisitTask
|
||||
///</summary>
|
||||
[Table("VisitTask")]
|
||||
public class VisitTask : Entity, IAuditUpdate, IAuditAdd
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
public Guid TrialId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// CreateUserId
|
||||
/// </summary>
|
||||
[Required]
|
||||
public Guid CreateUserId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
[Required]
|
||||
public Guid CreateUserId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// CreateTime
|
||||
/// </summary>
|
||||
[Required]
|
||||
public DateTime CreateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
[Required]
|
||||
public DateTime CreateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// UpdateTime
|
||||
/// </summary>
|
||||
[Required]
|
||||
public DateTime UpdateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
[Required]
|
||||
public DateTime UpdateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// UpdateUserId
|
||||
/// </summary>
|
||||
[Required]
|
||||
public Guid UpdateUserId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
[Required]
|
||||
public Guid UpdateUserId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// TaskName
|
||||
/// </summary>
|
||||
[Required]
|
||||
public string TaskName { get; set; }=string.Empty;
|
||||
|
||||
/// <summary>
|
||||
[Required]
|
||||
public string TaskName { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// TaskBlindName
|
||||
/// </summary>
|
||||
[Required]
|
||||
public string TaskBlindName { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public string TaskBlindName { get; set; } = string.Empty;
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ReadingCategory
|
||||
/// </summary>
|
||||
[Required]
|
||||
public ReadingCategory ReadingCategory { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// <summary>
|
||||
/// ReadingCategory
|
||||
/// </summary>
|
||||
[Required]
|
||||
public ReadingCategory ReadingCategory { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// CheckPassedTime
|
||||
/// </summary>
|
||||
public DateTime? CheckPassedTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
public DateTime? CheckPassedTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// AllocateTime
|
||||
/// </summary>
|
||||
public DateTime? AllocateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
public DateTime? AllocateTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// SubjectId
|
||||
/// </summary>
|
||||
[Required]
|
||||
public Guid SubjectId { get; set; }
|
||||
[Required]
|
||||
public Guid SubjectId { get; set; }
|
||||
|
||||
public Subject Subject { get; set; }
|
||||
|
||||
/// <summary>
|
||||
public Subject Subject { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Code
|
||||
/// </summary>
|
||||
[Required]
|
||||
public int Code { get; set; }
|
||||
|
||||
/// <summary>
|
||||
[Required]
|
||||
public int Code { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// TaskCode
|
||||
/// </summary>
|
||||
[Required]
|
||||
public string TaskCode { get; set; } = string.Empty;
|
||||
[Required]
|
||||
public string TaskCode { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// IsUrgent
|
||||
/// </summary>
|
||||
[Required]
|
||||
public bool IsUrgent { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// <summary>
|
||||
/// IsUrgent
|
||||
/// </summary>
|
||||
[Required]
|
||||
public bool IsUrgent { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// ArmEnum
|
||||
/// </summary>
|
||||
[Required]
|
||||
public int ArmEnum { get; set; }
|
||||
[Required]
|
||||
public int ArmEnum { get; set; }
|
||||
|
||||
public TaskState TaskState { get; set; }
|
||||
public TaskState TaskState { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// DoctorUserId
|
||||
/// </summary>
|
||||
public Guid? DoctorUserId { get; set; }
|
||||
[ForeignKey("DoctorUserId")]
|
||||
/// <summary>
|
||||
/// DoctorUserId
|
||||
/// </summary>
|
||||
public Guid? DoctorUserId { get; set; }
|
||||
[ForeignKey("DoctorUserId")]
|
||||
|
||||
public User DoctorUser { get; set; }
|
||||
public User DoctorUser { get; set; }
|
||||
|
||||
public TaskAllocationRule DoctorTaskAllocationRule { get; set; }
|
||||
public TaskAllocationRule DoctorTaskAllocationRule { get; set; }
|
||||
|
||||
//裁判任务的Id
|
||||
public Guid? JudgeVisitTaskId { get; set; }
|
||||
//裁判任务的Id
|
||||
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; }
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue