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

修改筛选医生

Uat_Study
hang 2022-08-11 17:22:51 +08:00
parent 028a8afece
commit e0913805d4
2 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,7 +197,17 @@ namespace IRaCIS.Application.Contracts
public string OptUserName { get; set; } = string.Empty; public string OptUserName { get; set; } = string.Empty;
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");
//SPM 需要看到
public DateTime? SubmmitTime { get; set; }
public string SubmmitUserName { get; set; } = string.Empty;
public string BlindName { get; set; }
public string BlindNameCN { get; set; } = string.Empty;
} }
public class DoctorStateModelDTO public class DoctorStateModelDTO
{ {
public Guid DoctorId { get; set; } public Guid DoctorId { get; set; }
@ -659,6 +669,8 @@ namespace IRaCIS.Application.Contracts
public bool IsVirtual { get; set; } public bool IsVirtual { get; set; }
public string BlindName { get; set; } = String.Empty; public string BlindName { get; set; } = String.Empty;
public string BlindNameCN { get; set; } = string.Empty;
public string BlindPublications { get; set; }
} }
#endregion #endregion

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

@ -149,6 +149,8 @@ namespace IRaCIS.Application.Services
.ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync(); .ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
doctorPageList.CurrentPageData.ToList().ForEach(u => doctorPageList.CurrentPageData.ToList().ForEach(u =>
{ {
var opt = enrollStateList.FirstOrDefault(t => t.DoctorId == u.Id); var opt = enrollStateList.FirstOrDefault(t => t.DoctorId == u.Id);
@ -160,12 +162,70 @@ namespace IRaCIS.Application.Services
} }
}); });
if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM)
{
//SPM 要看到提交的时间 提交人
var enrollCommitList = await _repository.Where<EnrollDetail>(x => x.TrialId == param.TrialId)
//提交CRO 以及下载简历列表
.WhereIf(param.IntoGroupSearchState == 4, t => t.EnrollStatus == (int)EnrollStatus.HasCommittedToCRO)
.ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
doctorPageList.CurrentPageData.ToList().ForEach(u =>
{
var opt = enrollCommitList.FirstOrDefault(t => t.DoctorId == u.Id);
if (opt != null)
{
u.SubmmitTime = opt.OptTime;
u.SubmmitUserName = opt.OptUserName;
}
});
}
return doctorPageList; return doctorPageList;
} }
//public async Task<PageOutput<ConfirmationReviewerDTO>> GetSPMSubmissionOrApprovalReviewerList(
// ReviewerSubmissionQueryDTO param)
//{
// var doctorQuery = _repository.Where<Enroll>(x => x.TrialId == param.TrialId)
// //提交CRO 以及下载简历列表
// .WhereIf(param.IntoGroupSearchState == 1, t => t.EnrollStatus >= (int)EnrollStatus.HasApplyDownloadResume)
// //CRO确认列表 状态为 已提交CRO
// .WhereIf(param.IntoGroupSearchState == 4, t => t.EnrollStatus >= (int)EnrollStatus.HasCommittedToCRO)
// .ProjectTo<ConfirmationReviewerDTO>(_mapper.ConfigurationProvider);
// var doctorPageList = await doctorQuery.ToPagedListAsync(param.PageIndex, param.PageSize, param.SortField == "" ? "Code" : param.SortField, param.Asc);
// var enrollStateList = await _repository.Where<EnrollDetail>(x => x.TrialId == param.TrialId)
// //提交CRO 以及下载简历列表
// .WhereIf(param.IntoGroupSearchState == 1, t => t.EnrollStatus == (int)EnrollStatus.HasCommittedToCRO)
// //CRO确认列表 状态为 已提交CRO
// .WhereIf(param.IntoGroupSearchState == 4, t => t.EnrollStatus == (int)EnrollStatus.InviteIntoGroup)
// .ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
// doctorPageList.CurrentPageData.ToList().ForEach(u =>
// {
// var opt = enrollStateList.FirstOrDefault(t => t.DoctorId == u.Id);
// if (opt != null)
// {
// u.DoctorTrialState = param.IntoGroupSearchState == 1 ? (int)EnrollStatus.HasCommittedToCRO : (int)EnrollStatus.InviteIntoGroup;
// u.OptTime = opt.OptTime;
// u.OptUserName = opt.OptUserName;
// }
// });
// return doctorPageList;
//}
/// <summary> /// <summary>
/// 获取项目下医生入组状态列表[Confirmation] /// 获取项目下医生入组状态列表[Confirmation]
/// </summary> /// </summary>