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

修改提示

Uat_Study
hang 2022-05-17 09:47:07 +08:00
parent 6c94c6e432
commit 4843b7f73e
6 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -466,6 +466,9 @@ namespace IRaCIS.Core.Application.Contracts.DTO
public UserTypeEnum UserTypeEnum { get; set; } public UserTypeEnum UserTypeEnum { get; set; }
} }
public class QCChanllengeDialogDTO : CheckChanllengeDialogDTO public class QCChanllengeDialogDTO : CheckChanllengeDialogDTO
{ {
public Guid QCChallengeId { get; set; } public Guid QCChallengeId { get; set; }

11
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
View File

@ -1,4 +1,5 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Application.Contracts.DTO;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Application.Contracts namespace IRaCIS.Core.Application.Contracts
@ -318,6 +319,14 @@ namespace IRaCIS.Core.Application.Contracts
} }
public class CheckDialogDTO
{
public QCCheckViewModel SubjectVisitCheck { get; set; }
public List<CheckChanllengeDialogDTO> DialogList { get; set; }
}
public class QCCheckViewModel public class QCCheckViewModel
{ {
public string? TalkContent { get; set; } = String.Empty; public string? TalkContent { get; set; } = String.Empty;

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

@ -7,7 +7,7 @@ namespace IRaCIS.Core.Application.Image.QA
{ {
public interface IQCListService public interface IQCListService
{ {
Task<List<CheckChanllengeDialogDTO>> GetCheckChallengeDialogList(Guid subjectVisitId); Task<CheckDialogDTO> GetCheckChallengeDialogList(Guid subjectVisitId);
Task<IResponseOutput<PageOutput<QCCheckViewModel>, TrialSubjectAndSVConfig>> GetConsistencyVerificationList(CheckQuery checkQuery); Task<IResponseOutput<PageOutput<QCCheckViewModel>, TrialSubjectAndSVConfig>> GetConsistencyVerificationList(CheckQuery checkQuery);
Task<IResponseOutput<PageOutput<QCCRCChallengeViewModel>, TrialSubjectAndSVConfig>> GetCRCChallengeList(ChallengeQuery challengeQuery); Task<IResponseOutput<PageOutput<QCCRCChallengeViewModel>, TrialSubjectAndSVConfig>> GetCRCChallengeList(ChallengeQuery challengeQuery);
Task<List<ChallengeAndDialog>> GetCRCVisitChallengeAndDialog(Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess); Task<List<ChallengeAndDialog>> GetCRCVisitChallengeAndDialog(Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess);

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

@ -554,15 +554,15 @@ namespace IRaCIS.Core.Application.Image.QA
/// ///
[HttpGet("{subjectVisitId:guid}")] [HttpGet("{subjectVisitId:guid}")]
public async Task<List<CheckChanllengeDialogDTO>> GetCheckChallengeDialogList(Guid subjectVisitId) public async Task<CheckDialogDTO> GetCheckChallengeDialogList(Guid subjectVisitId)
{ {
var list = await _repository.Where<CheckChallengeDialog>(t => t.SubjectVisitId == subjectVisitId).OrderBy(t => t.CreateTime) var sv = (await _subjectVisitRepository.Where(t => t.Id == subjectVisitId)
.ProjectTo<CheckChanllengeDialogDTO>(_mapper.ConfigurationProvider).ToListAsync(); .ProjectTo<CheckDialogDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
list.ForEach(t => t.IsCurrentUser = _userInfo.Id == t.CreateUserId); sv.DialogList.ForEach(t => t.IsCurrentUser = _userInfo.Id == t.CreateUserId);
return list; return sv;
} }
/// <summary> /// <summary>

4
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
View File

@ -949,9 +949,11 @@ namespace IRaCIS.Core.Application.Image.QA
#endregion #endregion
[HttpGet] [HttpGet]
public async Task IsQCCanOpt([FromQuery,Required]Guid subjectVisitId) public async Task<IResponseOutput> IsQCCanOpt([FromQuery,Required]Guid subjectVisitId)
{ {
await VerifyIsCanQCAsync(null, subjectVisitId); await VerifyIsCanQCAsync(null, subjectVisitId);
return ResponseOutput.Ok();
} }

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

@ -148,6 +148,15 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.Subject.Code)) .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.Subject.Code))
.ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode)); .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode));
//一致性核查 质疑对话
CreateMap<CheckChallengeDialog, CheckChanllengeDialogDTO>()
.ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.CreateUser.UserName))
.ForMember(d => d.CreateUserFullName, u => u.MapFrom(t => t.CreateUser.FullName));
CreateMap<SubjectVisit, CheckDialogDTO>()
.ForMember(d => d.SubjectVisitCheck, u => u.MapFrom(t => t))
.ForMember(d => d.DialogList, u => u.MapFrom(t => t.CheckChallengeDialogList.OrderBy(t => t.CreateTime)));
CreateMap<SubjectVisit, ForWardViewModel>() CreateMap<SubjectVisit, ForWardViewModel>()
.ForMember(d => d.ForwardUserName, u => u.MapFrom(s => s.ForwardUser.UserName)) .ForMember(d => d.ForwardUserName, u => u.MapFrom(s => s.ForwardUser.UserName))
@ -179,10 +188,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap<PreviousSurgery, PreviousSurgeryView>() CreateMap<PreviousSurgery, PreviousSurgeryView>()
.ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path + "?access_token=" + token)); .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path + "?access_token=" + token));
//一致性核查 质疑对话
CreateMap<CheckChallengeDialog, CheckChanllengeDialogDTO>()
.ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.CreateUser.UserName))
.ForMember(d => d.CreateUserFullName, u => u.MapFrom(t => t.CreateUser.FullName));
//QC 质疑对话 //QC 质疑对话