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

修改确认信息

Test_IRC_Net8
he 2025-06-26 13:59:28 +08:00
parent fb66e2c738
commit f13c2bf7cc
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs
View File

@ -242,6 +242,8 @@ namespace IRaCIS.Application.Contracts
public class ConfirmationReviewerDTO : DoctorOptDTO public class ConfirmationReviewerDTO : DoctorOptDTO
{ {
public Guid DoctorId { get; set; }
public int DoctorTrialState { get; set; } public int DoctorTrialState { get; set; }
public string OptUserName { get; set; } = string.Empty; public string OptUserName { get; set; } = string.Empty;
@ -249,6 +251,11 @@ namespace IRaCIS.Application.Contracts
public DateTime? OptTime { get; set; } public DateTime? OptTime { get; set; }
public string? OptTimeStr => OptTime?.ToString("yyyy-MM-dd HH:mm:ss"); public string? OptTimeStr => OptTime?.ToString("yyyy-MM-dd HH:mm:ss");
public UserTypeEnum? AuditTypeEnum { get; set; }
public DateTime? AuditTime { get; set; }
public string AuditUserName { get; set; } = string.Empty;
public string? AuditTimeStr => AuditTime?.ToString("yyyy-MM-dd HH:mm:ss");
//SPM 需要看到 //SPM 需要看到
public DateTime? SubmmitTime { get; set; } public DateTime? SubmmitTime { get; set; }
public string SubmmitUserName { get; set; } = string.Empty; public string SubmmitUserName { get; set; } = string.Empty;

19
IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs
View File

@ -337,14 +337,29 @@ namespace IRaCIS.Core.Application.Service
doctorPageList.CurrentPageData.ToList().ForEach(u => doctorPageList.CurrentPageData.ToList().ForEach(u =>
{ {
u.DoctorTrialState = (int)EnrollStatus.InviteIntoGroup; u.DoctorTrialState = (int)EnrollStatus.InviteIntoGroup;
var opt = enrollStateList.OrderByDescending(x=>x.OptTime).FirstOrDefault(t => t.DoctorId == u.Id);
var lastState= enrollStateList.OrderByDescending(x=>x.OptTime).FirstOrDefault(t => t.DoctorId == u.Id);
if (lastState != null)
{
u.DoctorTrialState = lastState.IntoGroupState;
}
var opt = enrollStateList.Where(x => x.IntoGroupState == 10).FirstOrDefault(t => t.DoctorId == u.Id);
if (opt != null) if (opt != null)
{ {
u.DoctorTrialState = opt.IntoGroupState;
u.OptTime = opt.OptTime; u.OptTime = opt.OptTime;
u.UserTypeEnum = opt.UserTypeEnum; u.UserTypeEnum = opt.UserTypeEnum;
u.OptUserName = opt.OptUserName; u.OptUserName = opt.OptUserName;
} }
var approved = enrollStateList.Where(x => x.IntoGroupState == 8).FirstOrDefault(t => t.DoctorId == u.Id);
if (approved != null)
{
u.AuditTime = approved.OptTime;
u.AuditTypeEnum = approved.UserTypeEnum;
u.AuditUserName = approved.OptUserName;
}
}); });
return doctorPageList; return doctorPageList;