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

修改查询

Uat_Study
hang 2023-09-01 14:00:54 +08:00
parent 4ba2aa4769
commit 13fbf36de0
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -207,7 +207,7 @@ namespace IRaCIS.Core.Application.ViewModel
public class PIReadingResult
{
public string QuestionName { get; set; }
public Guid QuestionId { get; set; }
public string Answer { get; set; }
}

5
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -370,6 +370,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
var trialTaskConfig = _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).ProjectTo<TrialUrgentConfig>(_mapper.ConfigurationProvider).FirstOrDefault();
var questionList = _trialReadingCriterionRepository.Where(t => t.TrialId == queryVisitTask.TrialId && t.Id == queryVisitTask.TrialReadingCriterionId).SelectMany(d => d.ReadingQuestionTrialList)
.Where(t => t.IsJudgeQuestion == true)
.Select(t => new { QuestionId = t.Id, QuestionName = _userInfo.IsEn_Us ? t.QuestionEnName : t.QuestionName }).ToList();
trialTaskConfig!.OtherObj = questionList;
return ResponseOutput.Ok(pageList, trialTaskConfig);
}

2
IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
View File

@ -83,7 +83,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<VisitTask, ReadingTaskView>().IncludeBase<VisitTask, VisitTaskView>()
.ForMember(t=>t.PIReadingResultList,u=>u.MapFrom(c=>c.ReadingTaskQuestionAnswerList
.Where(t=>t.ReadingQuestionTrial.IsJudgeQuestion==true ).Select(d=>new PIReadingResult() { QuestionName= isEn_Us?d.ReadingQuestionTrial.QuestionEnName:d.ReadingQuestionTrial.QuestionName,Answer=d.Answer})));
.Where(t=>t.ReadingQuestionTrial.IsJudgeQuestion==true ).Select(d=>new PIReadingResult() { QuestionId= d.ReadingQuestionTrialId,Answer=d.Answer})));
CreateMap<VisitTask, PIReaingTaskView>().IncludeBase<VisitTask, ReadingTaskView>()
.ForMember(o => o.FirstAuditUserName, t => t.MapFrom(u => u.FirstAuditUser.UserName))

6
IRaCIS.Core.Application/Service/Document/EmailSendService.cs
View File

@ -302,8 +302,10 @@ namespace IRaCIS.Core.Application.Service
var info = await _repository.Where<VisitTask>(t => t.Id == visitTaskId, ignoreQueryFilters: true).Select(t => new { t.TrialId, t.Trial.ResearchProgramNo, t.Trial.TrialCode, t.SourceSubjectVisit.VisitName, t.Subject.Code }).FirstOrDefaultAsync();
var answerList= await _repository.Where<VisitTask>(t => t.Id == visitTaskId, ignoreQueryFilters: true).SelectMany(t=>t.ReadingTaskQuestionAnswerList).Select(t=>new { QuestionName= isEn_us? t.ReadingQuestionTrial.QuestionEnName:t.ReadingQuestionTrial.QuestionName,t.Answer}).ToListAsync();
//var template = " <div style=\"margin-left: 2ch;\"> Role: {2} </div>";
var piResult=string.Empty;
var template = " <div style=\"margin-left: 2ch;\"> {0}: {1} </div>";
var piResult= string.Join(' ', answerList.Select(t => string.Format(template, t.QuestionName, t.Answer))) ;
Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc = trialEmailConfig =>
{

2
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
View File

@ -333,7 +333,7 @@ namespace IRaCIS.Core.Application.Contracts
public UserTypeEnum? PDProgressDefaultUserType { get; set; }
public object OtherObj { get; set; }
}
public class TrialStateChangeDTO