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

修改对话

Uat_Study
hang 2022-05-16 11:59:06 +08:00
parent 72b8b579e2
commit 482c42cd73
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
View File

@ -195,15 +195,11 @@ namespace IRaCIS.Core.Application.Contracts.DTO
}
public QCChanllengeDialogDTO[] DialogList { get; set; } = new QCChanllengeDialogDTO[0];
//public int ReplyCount { get; set; }
}
public class CRCChallengeAndDialog
public class ChallengeAndDialog: QCChallengeWithUser
{
public QCChallengeWithUser QCChallenge { get; set; } = new QCChallengeWithUser();
public List<QCChanllengeDialogDTO> DialogList { get; set; } = new List<QCChanllengeDialogDTO>();
}
@ -296,14 +292,6 @@ namespace IRaCIS.Core.Application.Contracts.DTO
public class QARecordDTO
{
public QCChallengeWithUser QARecord { get; set; } = new QCChallengeWithUser();
public List<QADicView> QADictionaryList { get; set; } = new List<QADicView>();
}
public class QARelationInfo
{
public int TrialClinicalInformationTransmissionEnum { get; set; }
@ -485,6 +473,10 @@ namespace IRaCIS.Core.Application.Contracts.DTO
}
public class DialogDTO
{
public Guid Id { get; set; }

4
IRaCIS.Core.Application/Service/QC/Interface/IQCListService.cs
View File

@ -10,12 +10,12 @@ namespace IRaCIS.Core.Application.Image.QA
Task<List<CheckChanllengeDialogDTO>> GetCheckChallengeDialogList(Guid subjectVisitId);
Task<IResponseOutput<PageOutput<QCCheckViewModel>, TrialSubjectAndSVConfig>> GetConsistencyVerificationList(CheckQuery checkQuery);
Task<IResponseOutput<PageOutput<QCCRCChallengeViewModel>, TrialSubjectAndSVConfig>> GetCRCChallengeList(ChallengeQuery challengeQuery);
Task<List<QCChallengeWithUser>> GetCRCVisitChallengeAndDialog(Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess);
Task<List<ChallengeAndDialog>> GetCRCVisitChallengeAndDialog(Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess);
Task<IResponseOutput<PageOutput<QCCRCVisitViewModel>, TrialSubjectAndSVConfig>> GetCRCVisitList(CRCVisitSearchDTO visitSearchDTO);
Task<IResponseOutput<PageOutput<ForWardViewModel>>> GetForwardList(ForwardQuery forwardQuery);
Task<List<QCChallengeWithUser>> GetHistoryChallengeList(Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType);
Task<List<QCChanllengeCreatorDto>> GetQCChallengeCreatorList(Guid trialId);
Task<List<QCChanllengeDialogDTO>> GetQCChallengeDialogList(Guid qaChallengeId);
Task<List<ChallengeAndDialog>> GetQCChallengeDialogList(Guid qaChallengeId);
Task<IResponseOutput<PageOutput<QCCRCChallengeViewModel>, TrialSubjectAndSVConfig>> GetQCChallengeList(ChallengeQuery challengeQuery);
Task<List<ParticipantDTO>> GetQCParticipantList(Guid trialId);
Task<List<QCQuestionAnswerItemDto>> GetQCQuestionAnswerList(Guid subjectVisitId, Guid trialId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType);

8
IRaCIS.Core.Application/Service/QC/QCListService.cs
View File

@ -732,11 +732,11 @@ namespace IRaCIS.Core.Application.Image.QA
/// <param name="qaChallengeId"></param>
/// <returns></returns>
[HttpGet("{qaChallengeId:guid}")]
public async Task<List<QCChanllengeDialogDTO>> GetQCChallengeDialogList(Guid qaChallengeId)
public async Task<List<ChallengeAndDialog>> GetQCChallengeDialogList(Guid qaChallengeId)
{
var list = await _repository.Where<QCChallengeDialog>(t => t.QCChallengeId == qaChallengeId).OrderBy(t => t.CreateTime)
.ProjectTo<QCChanllengeDialogDTO>(_mapper.ConfigurationProvider, new { currentUserId = _userInfo.Id }).ToListAsync();
.ProjectTo<ChallengeAndDialog>(_mapper.ConfigurationProvider, new { currentUserId = _userInfo.Id }).ToListAsync();
//利用automapper 运行时映射
//list.ForEach(t => t.IsCurrentUser = _userInfo.Id == t.CreateUserId);
@ -754,11 +754,11 @@ namespace IRaCIS.Core.Application.Image.QA
/// <param name="trialQCProcess"></param>
/// <returns></returns>
[HttpGet("{subjectVisitId:guid}/{trialQCProcess:int}")]
public async Task<List<QCChallengeWithUser>> GetCRCVisitChallengeAndDialog(Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess)
public async Task<List<ChallengeAndDialog>> GetCRCVisitChallengeAndDialog(Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess)
{
var qaChallengeQuery = _repository.Where<QCChallenge>(t => t.SubjectVisitId == subjectVisitId && t.QCProcessEnum == trialQCProcess)
.ProjectTo<QCChallengeWithUser>(_mapper.ConfigurationProvider, new { currentUserId = _userInfo.Id });
.ProjectTo<ChallengeAndDialog>(_mapper.ConfigurationProvider, new { currentUserId = _userInfo.Id });
var list = await qaChallengeQuery.ToListAsync();

10
IRaCIS.Core.Application/Service/QC/_MapConfig.cs
View File

@ -201,6 +201,16 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.SubjectId, u => u.MapFrom(t => t.SubjectVisit.SubjectId ))
.ForMember(d => d.ChallengeCode, u => u.MapFrom(s => "Q" + s.ChallengeCode.ToString("D5")));
CreateMap<QCChallenge, ChallengeAndDialog>()
.ForMember(d => d.LatestReplyUserName, u => u.MapFrom(t => t.LatestReplyUser.UserName))
.ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.CreateUser.UserName))
.ForMember(d => d.CurrentActionUserId, u => u.MapFrom(t => t.SubjectVisit.CurrentActionUserId))
.ForMember(d => d.CurrentActionUserName, u => u.MapFrom(t => t.SubjectVisit.CurrentActionUser.UserName))
.ForMember(d => d.SubjectId, u => u.MapFrom(t => t.SubjectVisit.SubjectId))
.ForMember(d => d.ChallengeCode, u => u.MapFrom(s => "Q" + s.ChallengeCode.ToString("D5")));
//CRC 质疑列表
CreateMap<QCChallenge, QCCRCChallengeViewModel>()
.ForMember(d => d.PreliminaryAuditUserName, u => u.MapFrom(s => s.SubjectVisit.PreliminaryAuditUser.UserName))

2
IRaCIS.Core.Domain/QC/QCChallenge.cs
View File

@ -20,8 +20,6 @@ namespace IRaCIS.Core.Domain.Models
public string Note { get; set; } = string.Empty;
public QCChanllengeReuploadEnum ReuploadEnum { get; set; }

2
IRaCIS.Core.Domain/Trial/Trial.cs
View File

@ -132,7 +132,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 受试者编号具体规则
/// </summary>
public string SubjectCodeRule { get; set; } = "筛选号由5位数字组成，前2位为中心编号，后3位为顺序号，请与EDC录入的编号保持一致";
public string SubjectCodeRule { get; set; } = "编号由5位数字组成，前2位为中心编号，后3位为顺序号，请与EDC录入的编号保持一致";
/// <summary>
/// 是否 提醒受试者编号规则
/// </summary>