修改返回数据信息
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-12-12 15:16:51 +08:00
parent df7022b2e3
commit 9f7bc4be75
1 changed files with 10 additions and 10 deletions

View File

@ -30,11 +30,11 @@ public class TrialStatService(
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<List<VisitFinishedStatViewModel>> GetTrialVisitFinishedStatList(VisitFinishedStatQuery inQuery)
public async Task<VisitFinishedStatViewModel> GetTrialVisitFinishedStatList(VisitFinishedStatQuery inQuery)
{
var list = await _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new VisitFinishedStatViewModel()
var result = await _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new VisitFinishedStatViewModel()
{
UploadedCount = t.SubjectVisitList.Where(t => inQuery.TrialSiteId != null ? t.TrialSiteId == inQuery.TrialSiteId : true)
.Where(t => t.SubmitState == SubmitStateEnum.Submitted).Count(),
@ -59,10 +59,10 @@ public class TrialStatService(
}).ToList()
}).ToListAsync();
}).FirstOrDefaultAsync();
return list;
return result;
}
@ -71,11 +71,11 @@ public class TrialStatService(
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task<List<VisitQuestionViewModel>> GetTrialQuestionStatList(VisitQuestionStatQuery inQuery)
public async Task<VisitQuestionViewModel> GetTrialQuestionStatList(VisitQuestionStatQuery inQuery)
{
var list = await _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new VisitQuestionViewModel()
var result = await _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new VisitQuestionViewModel()
{
@ -98,10 +98,10 @@ public class TrialStatService(
.Where(t => t.VisitTask.IsAnalysisCreate == false && t.IsClosedDialog == false).Count(),
}).ToListAsync();
}).FirstOrDefaultAsync();
return list;
return result;
}
@ -171,7 +171,7 @@ public class TrialStatService(
JudgeNote = t.ReadingCategory == ReadingCategory.Judge ? t.JudgeResultRemark : "",
SubjectCriterionReadingPeriodVisitNumList = t.Subject.ReadModuleList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.ReadingSetType == ReadingSetType.ImageReading).Select(c => c.SubjectVisit.VisitNum).ToList(),
DictionaryCode = t.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == questionType).Select(t=>t.ReadingQuestionTrial.DictionaryCode).FirstOrDefault(),
DictionaryCode = t.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == questionType).Select(t => t.ReadingQuestionTrial.DictionaryCode).FirstOrDefault(),
//整体肿瘤评估答案
OverallTumorEvaluation = t.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == questionType).FirstOrDefault()!.Answer
});
@ -200,7 +200,7 @@ public class TrialStatService(
//判断subject的逻辑需要确认这么多次访视任务有的符合有的不符合准则是什么
return list.GroupBy(t => t.OverallTumorEvaluation).Select(g => new EfficacyEvaluationStatViewModel()
{
DictionaryCode=g.FirstOrDefault()?.DictionaryCode,
DictionaryCode = g.FirstOrDefault()?.DictionaryCode,
OverallTumorEvaluation = g.Key,
SubjectCount = g.Select(t => t.SubjectId).Distinct().Count()
}).ToList();