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

修改

IRC_NewDev
he 2024-03-29 13:24:57 +08:00
parent c718ec8446
commit be088d8ba2
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
View File

@ -8,6 +8,7 @@ using IRaCIS.Core.Infrastructure;
using System.Linq; using System.Linq;
using System.Linq.Expressions; using System.Linq.Expressions;
using System; using System;
using MathNet.Numerics.Optimization.LineSearch;
namespace IRaCIS.Application.Services namespace IRaCIS.Application.Services
{ {
@ -281,11 +282,12 @@ namespace IRaCIS.Application.Services
if (inDto.CriterionIds != null) if (inDto.CriterionIds != null)
{ {
List<string> criterionTypes = (await _iReadingQuestionCriterionTrialRepository.Where(x => inDto.CriterionIds.Contains(x.Id)).Select(x => x.CriterionType).ToListAsync())
.Select(x => ((int)x).ToString()).ToList();
predicate = x => x.IsConfirm || x.SystemClinicalDataSetId == null; predicate = x => x.IsConfirm || x.SystemClinicalDataSetId == null;
foreach (var item in inDto.CriterionIds) foreach (var item in criterionTypes)
{ {
Expression<Func<ClinicalDataTrialSet, bool>> typeExpression = x => x.TrialClinicalDataSetCriteriaList.Any(x=>x.TrialReadingCriterionId== item); Expression<Func<ClinicalDataTrialSet, bool>> typeExpression = x =>x.ClinicalDataSystemSet==null|| x.ClinicalDataSystemSet.CriterionEnumListStr.Contains(item);
predicate = predicate.Or(typeExpression); predicate = predicate.Or(typeExpression);
} }

5
IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs
View File

@ -48,6 +48,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public Guid? SystemClinicalDataSetId { get; set; } public Guid? SystemClinicalDataSetId { get; set; }
/// <summary>
/// 系统的ClinicalDataSet
/// </summary>
public ClinicalDataSystemSet? ClinicalDataSystemSet { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
/// </summary> /// </summary>