Uat_Study
parent
744229da06
commit
d78e5469b2
|
@ -8421,6 +8421,27 @@
|
||||||
详情、编辑-获取医生工作信息 Employment
|
详情、编辑-获取医生工作信息 Employment
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:IRaCIS.Application.Services.DoctorService.AddDoctorCriterionFile(IRaCIS.Application.Contracts.AddDoctorCriterionFileDto)">
|
||||||
|
<summary>
|
||||||
|
添加医生标准文件
|
||||||
|
</summary>
|
||||||
|
<param name="inDto"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:IRaCIS.Application.Services.DoctorService.DeleteDoctorCriterionFile(IRaCIS.Application.Contracts.DeleteDoctorCriterionFile)">
|
||||||
|
<summary>
|
||||||
|
删除医生标准文件
|
||||||
|
</summary>
|
||||||
|
<param name="inDto"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:IRaCIS.Application.Services.DoctorService.GetDoctorCriterionFile(IRaCIS.Application.Contracts.GetDoctorCriterionFileInDto)">
|
||||||
|
<summary>
|
||||||
|
获取医生标准文件
|
||||||
|
</summary>
|
||||||
|
<param name="inDto"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="M:IRaCIS.Application.Services.DoctorService.GetDoctorIntoGroupInfo(System.Guid)">
|
<member name="M:IRaCIS.Application.Services.DoctorService.GetDoctorIntoGroupInfo(System.Guid)">
|
||||||
<summary>
|
<summary>
|
||||||
获取医生入组信息 正在提交的数量 已同意入组项目个数 正在读的
|
获取医生入组信息 正在提交的数量 已同意入组项目个数 正在读的
|
||||||
|
@ -9955,6 +9976,46 @@
|
||||||
入组 Selection 列表查询参数
|
入组 Selection 列表查询参数
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Application.Contracts.AddDoctorCriterionFileDto.FileName">
|
||||||
|
<summary>
|
||||||
|
文件名称
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Application.Contracts.AddDoctorCriterionFileDto.FilePath">
|
||||||
|
<summary>
|
||||||
|
文件路径
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Application.Contracts.AddDoctorCriterionFileDto.CriterionType">
|
||||||
|
<summary>
|
||||||
|
标准类型
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Application.Contracts.AddDoctorCriterionFileDto.DoctorId">
|
||||||
|
<summary>
|
||||||
|
医生Id
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Application.Contracts.AddDoctorCriterionFileDto.Remark">
|
||||||
|
<summary>
|
||||||
|
备注
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Application.Contracts.AddDoctorCriterionFileDto.FileType">
|
||||||
|
<summary>
|
||||||
|
文件类型
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Application.Contracts.GetDoctorCriterionFileInDto.FileType">
|
||||||
|
<summary>
|
||||||
|
文件类型
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Application.Contracts.GetDoctorCriterionFileInDto.CriterionType">
|
||||||
|
<summary>
|
||||||
|
标准类型
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="T:IRaCIS.Application.Contracts.UserAddedReturnDTO">
|
<member name="T:IRaCIS.Application.Contracts.UserAddedReturnDTO">
|
||||||
<summary>
|
<summary>
|
||||||
添加用户是的返回模型
|
添加用户是的返回模型
|
||||||
|
|
|
@ -677,6 +677,60 @@ namespace IRaCIS.Application.Contracts
|
||||||
public string BlindPublications { get; set; }
|
public string BlindPublications { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
public class DeleteDoctorCriterionFile
|
||||||
|
{
|
||||||
|
public Guid Id { get; set; }
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public class AddDoctorCriterionFileDto
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 文件名称
|
||||||
|
/// </summary>
|
||||||
|
public string FileName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 文件路径
|
||||||
|
/// </summary>
|
||||||
|
public string FilePath { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 标准类型
|
||||||
|
/// </summary>
|
||||||
|
public CriterionType CriterionType { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 医生Id
|
||||||
|
/// </summary>
|
||||||
|
public Guid DoctorId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 备注
|
||||||
|
/// </summary>
|
||||||
|
public string Remark { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 文件类型
|
||||||
|
/// </summary>
|
||||||
|
public CriterionFileType FileType { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class GetDoctorCriterionFileInDto
|
||||||
|
{
|
||||||
|
public Guid DoctorId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 文件类型
|
||||||
|
/// </summary>
|
||||||
|
public CriterionFileType? FileType { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 标准类型
|
||||||
|
/// </summary>
|
||||||
|
public CriterionType? CriterionType { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
public class ResumeConfirmDTO
|
public class ResumeConfirmDTO
|
||||||
{
|
{
|
||||||
|
|
|
@ -16,6 +16,7 @@ namespace IRaCIS.Application.Services
|
||||||
private readonly IRepository<Enroll> _enrollRepository;
|
private readonly IRepository<Enroll> _enrollRepository;
|
||||||
private readonly IRepository<DoctorDictionary> _doctorDictionaryRepository;
|
private readonly IRepository<DoctorDictionary> _doctorDictionaryRepository;
|
||||||
private readonly IRepository<Attachment> _attachmentRepository;
|
private readonly IRepository<Attachment> _attachmentRepository;
|
||||||
|
private readonly IRepository<DoctorCriterionFile> _doctorCriterionFileRepository;
|
||||||
private readonly IRepository<UserDoctor> _userDoctorRepository;
|
private readonly IRepository<UserDoctor> _userDoctorRepository;
|
||||||
private readonly IRepository<Trial> _trialRepository;
|
private readonly IRepository<Trial> _trialRepository;
|
||||||
private readonly IRepository<TrialPaymentPrice> _trialExtRepository;
|
private readonly IRepository<TrialPaymentPrice> _trialExtRepository;
|
||||||
|
@ -28,6 +29,7 @@ namespace IRaCIS.Application.Services
|
||||||
IRepository<Message> sysMessageRepository, IRepository<Enroll> intoGroupRepository,
|
IRepository<Message> sysMessageRepository, IRepository<Enroll> intoGroupRepository,
|
||||||
IRepository<DoctorDictionary> doctorDictionaryRepository,
|
IRepository<DoctorDictionary> doctorDictionaryRepository,
|
||||||
IRepository<Attachment> attachmentRepository,
|
IRepository<Attachment> attachmentRepository,
|
||||||
|
IRepository<DoctorCriterionFile> doctorCriterionFileRepository,
|
||||||
IRepository<UserDoctor> userDoctorRepository,
|
IRepository<UserDoctor> userDoctorRepository,
|
||||||
IRepository<Trial> trialRepository,
|
IRepository<Trial> trialRepository,
|
||||||
IRepository<TrialPaymentPrice> trialExtRepository, IRepository<Vacation> vacationRepository)
|
IRepository<TrialPaymentPrice> trialExtRepository, IRepository<Vacation> vacationRepository)
|
||||||
|
@ -37,6 +39,7 @@ namespace IRaCIS.Application.Services
|
||||||
_enrollRepository = intoGroupRepository;
|
_enrollRepository = intoGroupRepository;
|
||||||
_doctorDictionaryRepository = doctorDictionaryRepository;
|
_doctorDictionaryRepository = doctorDictionaryRepository;
|
||||||
_attachmentRepository = attachmentRepository;
|
_attachmentRepository = attachmentRepository;
|
||||||
|
this._doctorCriterionFileRepository = doctorCriterionFileRepository;
|
||||||
_userDoctorRepository = userDoctorRepository;
|
_userDoctorRepository = userDoctorRepository;
|
||||||
_trialRepository = trialRepository;
|
_trialRepository = trialRepository;
|
||||||
_trialExtRepository = trialExtRepository;
|
_trialExtRepository = trialExtRepository;
|
||||||
|
@ -467,7 +470,48 @@ namespace IRaCIS.Application.Services
|
||||||
return ResponseOutput.Result(success);
|
return ResponseOutput.Result(success);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 添加医生标准文件
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="inDto"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
public async Task<IResponseOutput> AddDoctorCriterionFile(AddDoctorCriterionFileDto inDto)
|
||||||
|
{
|
||||||
|
|
||||||
|
var entity = await _doctorCriterionFileRepository.InsertOrUpdateAsync(inDto, true);
|
||||||
|
return ResponseOutput.Ok(entity.Id.ToString());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 删除医生标准文件
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="inDto"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
public async Task<IResponseOutput> DeleteDoctorCriterionFile(DeleteDoctorCriterionFile inDto)
|
||||||
|
{
|
||||||
|
var result = await _doctorCriterionFileRepository.DeleteFromQueryAsync(inDto.Id, true);
|
||||||
|
return ResponseOutput.Ok(result.Id.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取医生标准文件
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="inDto"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
public async Task<List<DoctorCriterionFile>> GetDoctorCriterionFile(GetDoctorCriterionFileInDto inDto)
|
||||||
|
{
|
||||||
|
var result = await _doctorCriterionFileRepository.Where(x => x.DoctorId == inDto.DoctorId)
|
||||||
|
.WhereIf(inDto.CriterionType != null, x => x.CriterionType == inDto.CriterionType)
|
||||||
|
.WhereIf(inDto.FileType != null, x => x.FileType == inDto.FileType)
|
||||||
|
.ToListAsync();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
[HttpGet("{doctorId:guid}")]
|
[HttpGet("{doctorId:guid}")]
|
||||||
public async Task<ResumeConfirmDTO> GetAuditState(Guid doctorId)
|
public async Task<ResumeConfirmDTO> GetAuditState(Guid doctorId)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,7 +33,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
CreateMap<ReviewerAckDTO, Attachment>().EqualityComparison((odto, o) => odto.Id == o.Id);
|
CreateMap<ReviewerAckDTO, Attachment>().EqualityComparison((odto, o) => odto.Id == o.Id);
|
||||||
|
|
||||||
|
CreateMap<AddDoctorCriterionFileDto, DoctorCriterionFile>();
|
||||||
CreateMap<Doctor, DoctorBasicInfoCommand>();
|
CreateMap<Doctor, DoctorBasicInfoCommand>();
|
||||||
CreateMap<Education, EducationInfoViewModel>();
|
CreateMap<Education, EducationInfoViewModel>();
|
||||||
|
|
||||||
|
|
|
@ -178,6 +178,25 @@ namespace IRaCIS.Core.Domain.Share
|
||||||
PACS = 3,
|
PACS = 3,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 标准文件类型
|
||||||
|
/// </summary>
|
||||||
|
public enum CriterionFileType
|
||||||
|
{
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 声明
|
||||||
|
/// </summary>
|
||||||
|
Statement = 0,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 回执
|
||||||
|
/// </summary>
|
||||||
|
Acknowledgement = 1
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 标准类型
|
/// 标准类型
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -44,7 +44,7 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 文件类型
|
/// 文件类型
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int FileType { get; set; }
|
public CriterionFileType FileType { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// CreateUserId
|
/// CreateUserId
|
||||||
|
|
Loading…
Reference in New Issue