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

修改阅片标准

Uat_Study
hang 2022-10-27 15:18:25 +08:00
parent 217a618082
commit 0fcaa46aae
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,9 +65,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
public async Task<List<TrialReadingCriterionDto>> GetTrialCriterionList(Guid trialId,bool isHaveSigned=true) public async Task<List<TrialReadingCriterionDto>> GetTrialCriterionList(Guid trialId,bool isHaveSigned=true)
{ {
var list = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.IsConfirm) var list = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.IsConfirm)
.WhereIf(isHaveSigned=true,t=>t.ReadingInfoSignTime!=null)
.OrderBy(t => t.ShowOrder) .OrderBy(t => t.ShowOrder)
.Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, ReadingType = t.ReadingType }) .Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, ReadingType = t.ReadingType , ReadingInfoSignTime=t.ReadingInfoSignTime})
.ToListAsync(); .ToListAsync();
if (list.Count == 0) if (list.Count == 0)
@ -75,7 +74,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
throw new BusinessValidationFailedException("该项目还未确认任何一个阅片标准"); throw new BusinessValidationFailedException("该项目还未确认任何一个阅片标准");
} }
return list;
return list.AsQueryable().WhereIf(isHaveSigned=true,t=>t.ReadingInfoSignTime!=null).ToList();
} }

2
IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
View File

@ -294,6 +294,8 @@ namespace IRaCIS.Application.Contracts
public ReadingMethod ReadingType { get; set; } public ReadingMethod ReadingType { get; set; }
public CriterionType? CriterionType { get; set; } public CriterionType? CriterionType { get; set; }
public DateTime? ReadingInfoSignTime { get; set; }
} }
public class TrialCriterionReadingCategory public class TrialCriterionReadingCategory