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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
he 2023-03-16 16:34:54 +08:00
parent 54db21b08d a42472fb39
commit 00dddb2383
2 changed files with 48 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
IRaCIS.Core.Application/Service/Fixed/CriterionAdditionalAssessment.cs
View File

@ -1,5 +1,7 @@
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Domain.Share.Reading;
using NPOI.POIFS.NIO;
using System;
using System.Collections.Generic;
using System.Linq;
@ -29,7 +31,26 @@ namespace IRaCIS.Core.Application.Service
static AdditionalAssessment()
{
//Resist1.1 脑转移 默认评估问题
SystemDefeaultAdditionalAssessmentList.Add(new CriterionAdditionalAssessment() { CriterionType = CriterionType.RECIST1Point1, AdditionalAssessmentType = AdditionalAssessmentType.BrainMetastasis });
SystemDefeaultAdditionalAssessmentList.Add(new CriterionAdditionalAssessment()
{
CriterionType = CriterionType.RECIST1Point1,
AdditionalAssessmentType = AdditionalAssessmentType.BrainMetastasis,
AdditionalQuestionList = new List<ReadingQuestionTrial>(){ new ReadingQuestionTrial()
{
LimitEdit=LimitEdit.OnlyBaseLine,
DictionaryCode="ReadingYesOrNo",
IsJudgeQuestion=false,
IsShowInDicom=false,
GlobalReadingShowType=GlobalReadingShowType.NotShow,
QuestionEnName="存在脑转移",
QuestionName="Brain metastases present",
Type="radio",
QuestionGenre=TableQuestionType.Dictionary,
DataSource=DataSources.ManualEntry,
ShowQuestion=ShowQuestion.Show
} }
});
}

50
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
View File

@ -32,22 +32,22 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 类型
/// </summary>
public string Type { get; set; }
public string Type { get; set; } = string.Empty;
/// <summary>
/// 父问题触发
/// </summary>
public string ParentTriggerValue { get; set; }
/// <summary>
/// 父问题触发
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary>
/// 问题名称
/// </summary>
public string QuestionName { get; set; }
/// <summary>
/// 问题名称
/// </summary>
public string QuestionName { get; set; } = string.Empty;
/// <summary>
/// 是否是必须
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 是否是必须
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 排序
@ -63,9 +63,9 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 类型值
/// </summary>
public string TypeValue { get; set; }
public string TypeValue { get; set; } = string.Empty;
public bool IsEnable { get; set; }
public bool IsEnable { get; set; }
/// <summary>
/// 是否是裁判问题
@ -90,17 +90,17 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
public string Remark { get; set; } = string.Empty;
/// <summary>
/// 分组
/// </summary>
public string GroupName { get; set; }
/// <summary>
/// 分组
/// </summary>
public string GroupName { get; set; } = string.Empty;
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 系统问题ID
@ -175,7 +175,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 文件类型
/// </summary>
public string? FileType { get; set; }
public string? FileType { get; set; }
/// <summary>
/// 是否显示在Dicom阅片中