修改一版
parent
72870224b9
commit
4413634a44
|
@ -125,8 +125,7 @@ namespace IRaCIS.Application.Services
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
await _readingQuestionCriterionSystemRepository.AddRangeAsync(needAddCriterionList);
|
await _readingQuestionCriterionSystemRepository.AddRangeAsync(needAddCriterionList);
|
||||||
|
await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
|
||||||
await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///// <summary>
|
///// <summary>
|
||||||
|
@ -183,7 +182,6 @@ namespace IRaCIS.Application.Services
|
||||||
var types = new List<string>()
|
var types = new List<string>()
|
||||||
{
|
{
|
||||||
"select","radio"
|
"select","radio"
|
||||||
|
|
||||||
};
|
};
|
||||||
var questionList =await _readingQuestionSystemRepository.Where(x => x.ReadingQuestionCriterionSystemId == inDto.ReadingQuestionCriterionSystemId)
|
var questionList =await _readingQuestionSystemRepository.Where(x => x.ReadingQuestionCriterionSystemId == inDto.ReadingQuestionCriterionSystemId)
|
||||||
.Where(x=> types.Contains(x.Type))
|
.Where(x=> types.Contains(x.Type))
|
||||||
|
@ -258,7 +256,6 @@ namespace IRaCIS.Application.Services
|
||||||
private void SetChildParentQuestion(Guid ReadingQuestionCriterionTrialId, Guid trialId, List<ReadingQuestionSystem> systemQuesitonList,List<ReadingQuestionTrial> needQuestionList)
|
private void SetChildParentQuestion(Guid ReadingQuestionCriterionTrialId, Guid trialId, List<ReadingQuestionSystem> systemQuesitonList,List<ReadingQuestionTrial> needQuestionList)
|
||||||
{
|
{
|
||||||
var parentIdIsNullList = systemQuesitonList.Where(x => x.ParentId == null).ToList();
|
var parentIdIsNullList = systemQuesitonList.Where(x => x.ParentId == null).ToList();
|
||||||
|
|
||||||
parentIdIsNullList.ForEach(x =>
|
parentIdIsNullList.ForEach(x =>
|
||||||
{
|
{
|
||||||
var quesiton = x.Clone();
|
var quesiton = x.Clone();
|
||||||
|
@ -421,7 +418,6 @@ namespace IRaCIS.Application.Services
|
||||||
var types = new List<string>()
|
var types = new List<string>()
|
||||||
{
|
{
|
||||||
"select","radio"
|
"select","radio"
|
||||||
|
|
||||||
};
|
};
|
||||||
var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.ReadingQuestionCriterionTrialId)
|
var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.ReadingQuestionCriterionTrialId)
|
||||||
.Where(x => types.Contains(x.Type))
|
.Where(x => types.Contains(x.Type))
|
||||||
|
|
|
@ -0,0 +1,59 @@
|
||||||
|
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using IRaCIS.Core.Domain.Share;
|
||||||
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
|
using IRaCIS.Core.Domain.Share.Reading;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace IRaCIS.Core.Domain.Models
|
||||||
|
{
|
||||||
|
///<summary>
|
||||||
|
/// 项目阅片问题答案
|
||||||
|
///</summary>
|
||||||
|
[Table("ReadingQuestionAnswerTrial")]
|
||||||
|
public class ReadingQuestionAnswerTrial : Entity, IAuditAdd
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 项目问题Id
|
||||||
|
/// </summary>
|
||||||
|
public Guid ReadingQuestionTrialId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 项目ID
|
||||||
|
/// </summary>
|
||||||
|
public Guid TrialId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 受试者Id
|
||||||
|
/// </summary>
|
||||||
|
public Guid SubjectId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 阅片Id
|
||||||
|
/// </summary>
|
||||||
|
public Guid ReadingId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 答案
|
||||||
|
/// </summary>
|
||||||
|
public string Answer { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime CreateTime { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建人
|
||||||
|
/// </summary>
|
||||||
|
public Guid CreateUserId { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -20,6 +20,9 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Guid? ReadingQuestionCriterionSystemId { get; set; }
|
public Guid? ReadingQuestionCriterionSystemId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 项目Id
|
||||||
|
/// </summary>
|
||||||
public Guid TrialId { get; set; }
|
public Guid TrialId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -42,7 +45,6 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Guid CreateUserId { get; set; }
|
public Guid CreateUserId { get; set; }
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 是否确认
|
/// 是否确认
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -50,13 +50,14 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Guid? ParentId { get; set; }
|
public Guid? ParentId { get; set; }
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 类型值
|
/// 类型值
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string TypeValue { get; set; }
|
public string TypeValue { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否启用
|
||||||
|
/// </summary>
|
||||||
public bool IsEnable { get; set; }
|
public bool IsEnable { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -20,6 +20,9 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Guid ReadingQuestionCriterionTrialId { get; set; }
|
public Guid ReadingQuestionCriterionTrialId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 项目Id
|
||||||
|
/// </summary>
|
||||||
public Guid TrialId { get; set; }
|
public Guid TrialId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
Loading…
Reference in New Issue