批量处理实体类空行
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-09-20 14:34:32 +08:00
parent 7524d39213
commit 718ddefe97
163 changed files with 0 additions and 1923 deletions
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@@ -15,9 +12,6 @@ namespace IRaCIS.Core.Domain.Models
public ReadingQuestionTrial TrialReadingQuestion { get; set; }
#endregion
public Guid TrialReadingQuestionId { get; set; }
public Guid SubjectId { get; set; }
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@@ -20,8 +17,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public List<SubjectCriteriaEvaluationVisitFilter> SubjectCriteriaEvaluationVisitFilterList { get; set; }
#endregion
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
@@ -30,9 +25,5 @@ namespace IRaCIS.Core.Domain.Models
/// 是否参与评估
/// </summary>
public bool IsJoinEvaluation { get; set; }
}
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@@ -13,8 +10,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
[JsonIgnore]
public SubjectCriteriaEvaluation SubjectCriteriaEvaluation { get; set; }
@@ -22,15 +17,8 @@ namespace IRaCIS.Core.Domain.Models
public SubjectVisit SubjectVisit { get; set; }
#endregion
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid SubjectVisitId { get; set; }
/// <summary>
@@ -57,8 +45,6 @@ namespace IRaCIS.Core.Domain.Models
{
//待定
None = 0,
//通过
Passed = 1,
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@@ -20,30 +17,19 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("SeriesId")]
[JsonIgnore]
public DicomSeries Series { get; set; }
[ForeignKey("StudyId")]
[JsonIgnore]
public DicomStudy Study { get; set; }
#endregion
public Guid TrialReadingCriterionId { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid StudyId { get; set; }
public Guid SeriesId { get; set; }
public bool IsConfirmed { get; set; }
public bool IsReading { get; set; }
}
}
@@ -1,5 +1,3 @@
using IRaCIS.Core.Domain.Share;
using System.Linq;
@@ -20,14 +18,10 @@ public class ClinicalDataSystemSet : BaseAddAuditEntity
[StringLength(400)]
public string ClinicalDataSetEnName { get; set; } = null!;
[Comment(" 枚举(字典里面取的)")]
public int ClinicalDataSetEnum { get; set; }
public string ClinicalDataSetName { get; set; } = null!;
[Comment("上传方式")]
public ClinicalUploadType ClinicalUploadType { get; set; }
@@ -51,8 +51,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid ReadingId { get; set; }
public Guid? StudyId { get; set; }
public Guid SubjectId { get; set; }
/// <summary>
@@ -64,8 +62,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否为访视
/// </summary>xiu
public bool IsVisit { get; set; }
/// <summary>
/// 是否签名
/// </summary>
@@ -80,23 +76,8 @@ namespace IRaCIS.Core.Domain.Models
/// 是否完整
/// </summary>
public bool? IsComplete { get; set; }
public int FileCount { get; set; }
//临床数据状态
public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; }
}
}
@@ -18,19 +18,9 @@ namespace IRaCIS.Core.Domain.Models
public Guid ReadingClinicalDataId { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public int Size { get; set; } = 0;
public string Type { get; set; } = string.Empty;
}
}
@@ -70,8 +70,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否为访视
/// </summary>xiu
public bool IsVisit { get; set; }
/// <summary>
/// 是否签名
/// </summary>
@@ -86,24 +84,8 @@ namespace IRaCIS.Core.Domain.Models
/// 是否完整
/// </summary>
public bool? IsComplete { get; set; } = true;
public int FileCount { get; set; }
//临床数据状态
public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; }
}
}
@@ -18,8 +18,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid ReadingConsistentClinicalDataId { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public int Size { get; set; } = 0;
@@ -28,13 +26,5 @@ namespace IRaCIS.Core.Domain.Models
/// 文件类型
/// </summary>
public string Type { get; set; } = string.Empty;
}
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@@ -21,12 +18,7 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public Guid TrialClinicalDataSetId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
@@ -114,9 +110,6 @@ namespace IRaCIS.Core.Domain.Models
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 父问题Id
/// </summary>
@@ -156,9 +149,5 @@ namespace IRaCIS.Core.Domain.Models
/// 自定义计算问题
/// </summary>
public string CalculateQuestions { get; set; } = "[]";
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
using System.Linq;
@@ -86,8 +82,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 外层问题Id
/// </summary>
@@ -112,10 +106,5 @@ namespace IRaCIS.Core.Domain.Models
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
@@ -32,9 +28,6 @@ namespace IRaCIS.Core.Domain.Models
}
}
[JsonIgnore]
[ForeignKey("TrialClinicalId")]
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
@@ -119,9 +112,6 @@ namespace IRaCIS.Core.Domain.Models
/// 系统临床问题Id
/// </summary>
public Guid? SystemClinicalQuestionId { get; set; }
/// <summary>
/// 父问题Id
/// </summary>
@@ -167,9 +157,5 @@ namespace IRaCIS.Core.Domain.Models
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
using System.Linq;
@@ -127,9 +123,5 @@ namespace IRaCIS.Core.Domain.Models
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
}
}
@@ -1,10 +1,4 @@
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 临床表单表格问题行记录")]
[Table("ClinicalAnswerRowInfo")]
public class ClinicalAnswerRowInfo : BaseAddAuditEntity
@@ -12,8 +6,6 @@ public class ClinicalAnswerRowInfo : BaseAddAuditEntity
#region
#endregion
[Comment(" 表单Id")]
public Guid ClinicalFormId { get; set; }
@@ -25,6 +17,3 @@ public class ClinicalAnswerRowInfo : BaseAddAuditEntity
[Comment(" 受试者Id")]
public Guid SubjectId { get; set; }
}
@@ -1,9 +1,4 @@
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 临床表单")]
[Table("ClinicalForm")]
public class ClinicalForm : BaseAddAuditEntity
@@ -36,6 +31,3 @@ public class ClinicalForm : BaseAddAuditEntity
public Guid? VisitId { get; set; }
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 临床表单问题答案")]
@@ -8,8 +5,6 @@ namespace IRaCIS.Core.Domain.Models;
public class ClinicalQuestionAnswer : BaseAddAuditEntity
{
#region
[JsonIgnore]
[ForeignKey("ClinicalFormId")]
public ClinicalForm ClinicalForm { get; set; }
@@ -29,7 +24,3 @@ public class ClinicalQuestionAnswer : BaseAddAuditEntity
[Comment(" 受试者Id")]
public Guid SubjectId { get; set; }
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models;
[Comment("受试者 - 临床表单表格问题答案")]
@@ -31,7 +28,3 @@ public partial class ClinicalTableAnswer : BaseAddAuditEntity
public Guid TableQuestionId { get; set; }
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@@ -17,9 +14,6 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("ClinicalFormId")]
public ClinicalForm ClinicalForm { get; set; }
#endregion
public Guid SubjectId { get; set; }
public Guid TrialId { get; set; }
@@ -28,11 +22,5 @@ namespace IRaCIS.Core.Domain.Models
/// 表单Id
/// </summary>
public Guid ClinicalFormId { get; set; }
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
@@ -16,8 +12,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
[ForeignKey("TaskMedicalReviewId")]
public TaskMedicalReview TaskMedicalReview { get; set; }
/// <summary>
/// 文件
/// </summary>
@@ -26,8 +20,6 @@ namespace IRaCIS.Core.Domain.Models
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<OSSImageInfo>>(this.ImagePath);
@@ -72,8 +64,6 @@ namespace IRaCIS.Core.Domain.Models
/// 用户角色枚举
/// </summary>
public int UserTypeEnumInt { get; set; }
/// <summary>
/// 阅片人是否认同
/// </summary>
@@ -98,15 +88,10 @@ namespace IRaCIS.Core.Domain.Models
/// 不同意重阅原因
/// </summary>
public string DisagreeReason { get; set; } = string.Empty;
/// <summary>
/// 是否申请重阅
/// </summary>
public bool? IsApplyHeavyReading { get; set; }
/// <summary>
/// 图片路径
/// </summary>
@@ -116,11 +101,5 @@ namespace IRaCIS.Core.Domain.Models
/// 文件名称
/// </summary>
public string FileName { get; set; } = string.Empty;
}
}
@@ -7,8 +7,6 @@ namespace IRaCIS.Core.Domain.Models
public class ReadingMedicineQuestionAnswer : BaseFullAuditEntity
{
#region
[JsonIgnore]
[ForeignKey("TaskMedicalReviewId")]
public TaskMedicalReview TaskMedicalReview { get; set; }
@@ -26,13 +24,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid TaskMedicalReviewId { get; set; }
public Guid VisitTaskId { get; set; }
public string Answer { get; set; } = string.Empty;
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
@@ -47,8 +43,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否是必须
/// </summary>
public bool IsRequired { get; set; }
/// <summary>
/// 排序
/// </summary>
@@ -58,15 +52,10 @@ namespace IRaCIS.Core.Domain.Models
/// 父问题ID
/// </summary>
public Guid? ParentId { get; set; }
/// <summary>
/// 类型值
/// </summary>
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// 是否启用
/// </summary>
@@ -76,15 +65,8 @@ namespace IRaCIS.Core.Domain.Models
/// 任务类型
/// </summary>
public ReadingCategory ReadingCategory { get; set; }
public CriterionType? CriterionTypeEnum { get; set; }
public bool IsGeneral { get; set; }
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@@ -37,15 +33,10 @@ namespace IRaCIS.Core.Domain.Models
/// 语言类型
/// </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary>
/// 类型值
/// </summary>
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// 项目ID
/// </summary>
@@ -87,10 +78,5 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialReadingCriterionId { get; set; }
public Guid? SystemQuestionId { get; set; }
}
}
@@ -1,12 +1,5 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models;
[Comment("系统标准 - 病灶器官表 (需要同步)")]
[Table("CriterionNidusSystem")]
public class CriterionNidusSystem : BaseAddAuditEntity
@@ -27,6 +20,3 @@ public class CriterionNidusSystem : BaseAddAuditEntity
[Comment("器官类型")]
public OrganType OrganType { get; set; }
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models;
@@ -19,7 +15,3 @@ public class CriterionNidusTrial : BaseAddAuditEntity
public OrganType OrganType { get; set; }
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@@ -49,8 +45,6 @@ namespace IRaCIS.Core.Domain.Models
/// 位置
/// </summary>
public string TULAT { get; set; } = string.Empty;
/// <summary>
/// 位置 英文
/// </summary>
@@ -60,8 +54,6 @@ namespace IRaCIS.Core.Domain.Models
/// 备注
/// </summary>
public string Remark { get; set; } = string.Empty;
/// <summary>
/// 是否是淋巴结
/// </summary>
@@ -76,8 +68,6 @@ namespace IRaCIS.Core.Domain.Models
/// 标准Id
/// </summary>
public Guid SystemCriterionId { get; set; }
/// <summary>
/// 是否可编辑位置
/// </summary>
@@ -87,10 +77,5 @@ namespace IRaCIS.Core.Domain.Models
/// 序号
/// </summary>
public int ShowOrder { get; set; } = 0;
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@@ -28,8 +24,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialId { get; set; }
public bool IsEnable { get; set; }
/// <summary>
/// 标准Id
/// </summary>
@@ -59,8 +53,6 @@ namespace IRaCIS.Core.Domain.Models
/// 位置
/// </summary>
public string TULAT { get; set; } = string.Empty;
/// <summary>
/// 位置 英文
/// </summary>
@@ -95,9 +87,5 @@ namespace IRaCIS.Core.Domain.Models
/// 器官类型
/// </summary>
public OrganType? OrganType { get; set; }
}
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@@ -27,10 +24,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否启用
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
/// 是否公共分页
/// </summary>
@@ -40,12 +33,6 @@ namespace IRaCIS.Core.Domain.Models
/// 排序
/// </summary>
public int ShowOrder { get; set; } = 0;
public Guid ReadingQuestionCriterionTrialId { get; set; }
}
}
@@ -31,8 +31,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否完成配置
/// </summary>
public bool IsCompleteConfig { get; set; }
/// <summary>
/// 确认时间
/// </summary>
@@ -42,15 +40,10 @@ namespace IRaCIS.Core.Domain.Models
/// 描述
/// </summary>
public string Description { get; set; } = string.Empty;
/// <summary>
/// 标准类型
/// </summary>
public CriterionType CriterionType { get; set; }
/// <summary>
/// 肿瘤学阅片
/// </summary>
@@ -65,17 +58,5 @@ namespace IRaCIS.Core.Domain.Models
/// 是否必须全局阅片
/// </summary>
public bool IsMustGlobalReading { get; set; } = false;
}
}
@@ -20,8 +20,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public List<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List<TrialCriterionAdditionalAssessmentType>();
[JsonIgnore]
public List<VisitTask> VisitTaskList { get; set; }
@@ -60,10 +58,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否完成配置
/// </summary>
public bool IsCompleteConfig { get; set; }
/// <summary>
/// 描述
/// </summary>
@@ -79,8 +73,6 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public FormType FormType { get; set; } = FormType.SinglePage;
/// <summary>
/// 修约小数点
/// </summary>
@@ -95,14 +87,10 @@ namespace IRaCIS.Core.Domain.Models
/// 全局阅片评估更新类型
/// </summary>
public string GlobalUpdateType { get; set; } = string.Empty;
/// <summary>
/// 评估原因
/// </summary>
public string EvaluationReason { get; set; } = StaticData.International("CriterionTrial_EvaluationReason");
/// <summary>
/// 是否显示详情
/// </summary>
@@ -112,8 +100,6 @@ namespace IRaCIS.Core.Domain.Models
/// 同步时间
/// </summary>
public DateTime SynchronizeTime { get; set; }
/// <summary>
/// 同步器官时间
/// </summary>
@@ -135,8 +121,6 @@ namespace IRaCIS.Core.Domain.Models
public bool IseCRFShowInDicomReading { get; set; } = false;
#region
public string CriterionModalitys { get; set; } = string.Empty;
/// <summary>
@@ -153,8 +137,6 @@ namespace IRaCIS.Core.Domain.Models
/// 任务组织级别
/// </summary>
public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; }
/// <summary>
/// 阅片是否显示受试者信息
/// </summary>
@@ -164,28 +146,19 @@ namespace IRaCIS.Core.Domain.Models
/// IR阅片页面是否可以查看既往任务结果
/// </summary>
public bool IsReadingShowPreviousResults { get; set; } = true;
/// <summary>
/// 是确认医学审核问题
/// </summary>
public bool IsConfirmMedicineQuestion { get; set; } = false;
/// <summary>
/// 仲裁对象
/// </summary>
public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading;
/// <summary>
/// 阅片模式
/// </summary>
public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
/// <summary>
/// 存在阅片期
/// </summary>
@@ -200,14 +173,10 @@ namespace IRaCIS.Core.Domain.Models
/// 是否签名
/// </summary>
public bool IsSigned { get; set; } = false;
/// <summary>
/// 仲裁阅片
/// </summary>
public bool IsArbitrationReading { get; set; } = true;
/// <summary>
/// 肿瘤学阅片 原字段 IsClinicalReading
/// </summary>
@@ -222,12 +191,8 @@ namespace IRaCIS.Core.Domain.Models
/// 任务展示访视 读片任务显示是否顺序
/// </summary>
public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder;
//任务分配对象
public TaskAllocateObj TaskAllocateObjEnum { get; set; }
//后续访视任务自动分配
public bool IsFollowVisitAutoAssign { get; set; } = true;
@@ -243,8 +208,6 @@ namespace IRaCIS.Core.Domain.Models
//后续全局自动分配默认状态
public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated;
/// <summary>
/// 阅片信息签名时间
/// </summary>
@@ -254,18 +217,11 @@ namespace IRaCIS.Core.Domain.Models
/// 是否必须全局阅片
/// </summary>
public bool IsMustGlobalReading { get; set; } = false;
//是否附加评估
public bool IsAdditionalAssessment { get; set; }
//自动 手动生成任务
public bool IsAutoCreate { get; set; } = true;
#endregion
/// <summary>
/// 阅片过程下载影像
/// </summary>
@@ -304,9 +260,6 @@ namespace IRaCIS.Core.Domain.Models
IRReadingVisitEnable = 2,
}
public enum ReadingOrder
{
Random = 0,
@@ -315,6 +268,4 @@ namespace IRaCIS.Core.Domain.Models
SubjectRandom = 2,
}
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@@ -16,10 +13,5 @@ namespace IRaCIS.Core.Domain.Models
public Guid SystemCriterionId { get; set; }
public string Code { get; set; } = string.Empty;
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Domain.Share.Reading;
@@ -17,20 +13,12 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#endregion
public Guid TrialReadingCriterionId { get; set; }
public CriterionType CriterionType { get; set; }
public AdditionalAssessmentType AdditionalAssessmentType { get; set; }
public bool? IsSelected { get; set; }
}
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@@ -14,15 +11,8 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#endregion
public Guid TrialCriterionId { get; set; }
public string Code { get; set; } = string.Empty;
}
}
@@ -13,8 +13,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
[ForeignKey("GroupId")]
public ReadingQuestionSystem GroupInfo { get; set; }
[JsonIgnore]
[ForeignKey("ReadingQuestionCriterionSystemId")]
public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; }
@@ -22,8 +20,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
[ForeignKey("ParentId")]
public ReadingQuestionSystem ParentReadingQuestionSystem { get; set; }
[JsonIgnore]
[ForeignKey("RelevanceId")]
public ReadingQuestionSystem RelevanceReadingQuestionSystem { get; set; }
@@ -45,8 +41,6 @@ namespace IRaCIS.Core.Domain.Models
}
}
[NotMapped]
public List<string> RelevanceValueList
{
@@ -129,8 +123,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否启用
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
/// 是否是裁判问题
/// </summary>
@@ -195,9 +187,6 @@ namespace IRaCIS.Core.Domain.Models
/// 字典code
/// </summary>
public string DictionaryCode { get; set; } = string.Empty;
/// <summary>
/// 问题类型
/// </summary>
@@ -227,8 +216,6 @@ namespace IRaCIS.Core.Domain.Models
/// 单位
/// </summary>
public ValueUnit? Unit { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
@@ -283,14 +270,5 @@ namespace IRaCIS.Core.Domain.Models
/// 高亮问题的答案
/// </summary>
public string HighlightAnswer { get; set; } = "[]";
}
}
@@ -49,8 +49,6 @@ namespace IRaCIS.Core.Domain.Models
}
}
[NotMapped]
public List<string> RelevanceValueList
{
@@ -68,8 +66,6 @@ namespace IRaCIS.Core.Domain.Models
}
}
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
{
@@ -111,8 +107,6 @@ namespace IRaCIS.Core.Domain.Models
}
#endregion
public bool IsAdditional { get; set; }
/// <summary>
/// 项目标准Id
/// </summary>
@@ -152,8 +146,6 @@ namespace IRaCIS.Core.Domain.Models
/// 父问题ID
/// </summary>
public Guid? ParentId { get; set; }
/// <summary>
/// 类型值
/// </summary>
@@ -180,8 +172,6 @@ namespace IRaCIS.Core.Domain.Models
/// 全局阅片显示类型
/// </summary>
public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow;
/// <summary>
/// 转化显示类型
/// </summary>
@@ -196,9 +186,6 @@ namespace IRaCIS.Core.Domain.Models
/// 分组
/// </summary>
public string GroupName { get; set; } = string.Empty;
/// <summary>
/// 系统问题ID
/// </summary>
@@ -233,9 +220,6 @@ namespace IRaCIS.Core.Domain.Models
/// 裁判百分比或绝对值的相差值匹配规则
/// </summary>
public JudgeDifferenceType JudgeDifferenceType { get; set; }
/// <summary>
/// 标准分页Id
/// </summary>
@@ -285,8 +269,6 @@ namespace IRaCIS.Core.Domain.Models
/// 是否显示在Dicom阅片中
/// </summary>
public bool IsShowInDicom { get; set; } = false;
/// <summary>
/// 序号标记
/// </summary>
@@ -316,8 +298,6 @@ namespace IRaCIS.Core.Domain.Models
/// 自定义单位
/// </summary>
public string CustomUnit { get; set; } = string.Empty;
/// <summary>
/// 自定义计算标记
/// </summary>
@@ -372,31 +352,19 @@ namespace IRaCIS.Core.Domain.Models
/// 分组ID
/// </summary>
public Guid? GroupId { get; set; }
/// <summary>
/// 分组分类
/// </summary>
public GroupClassify? GroupClassify { get; set; }
/// <summary>
/// 问题分类
/// </summary>
public QuestionClassify? QuestionClassify { get; set; }
/// <summary>
/// 高亮问题的答案
/// </summary>
public string HighlightAnswer { get; set; } = "[]";
}
public class CalculateInfo
{
public bool IsTable { get; set; }
@@ -406,7 +374,4 @@ namespace IRaCIS.Core.Domain.Models
public Guid? TableQuestionId { get; set; }
}
}
@@ -15,33 +15,16 @@ namespace IRaCIS.Core.Domain.Models
public Dictionary Dictionary { get; set; }
#endregion
public Guid CriterionId { get; set; }
public Guid DictionaryId { get; set; }
public bool IsSystemCriterion { get; set; } = false;
public string ParentCode { get; set; } = string.Empty;
public bool IsBaseLineUse { get; set; } = false;
public bool IsFollowVisitUse { get; set; } = false;
/// <summary>
/// ±ê×¼×Öµä·Ö×é
/// </summary>
public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General;
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
using System.Linq;
@@ -35,8 +31,6 @@ namespace IRaCIS.Core.Domain.Models
}
}
[NotMapped]
public List<string> RelevanceValueList
{
@@ -62,8 +56,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid ReadingQuestionId { get; set; }
public string Type { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
/// <summary>
@@ -127,8 +119,6 @@ namespace IRaCIS.Core.Domain.Models
/// 数据列
/// </summary>
public string DataTableColumn { get; set; } = string.Empty;
/// <summary>
/// 关联父问题
/// </summary>
@@ -158,8 +148,6 @@ namespace IRaCIS.Core.Domain.Models
/// 字典code
/// </summary>
public string DictionaryCode { get; set; } = string.Empty;
/// <summary>
/// 数值类型
/// </summary>
@@ -199,9 +187,5 @@ namespace IRaCIS.Core.Domain.Models
/// 问题分类
/// </summary>
public QuestionClassify? QuestionClassify { get; set; }
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
using System.Linq;
@@ -38,8 +34,6 @@ namespace IRaCIS.Core.Domain.Models
}
}
[NotMapped]
public List<string> RelevanceValueList
{
@@ -57,8 +51,6 @@ namespace IRaCIS.Core.Domain.Models
}
}
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
{
@@ -85,38 +77,24 @@ namespace IRaCIS.Core.Domain.Models
/// 项目问题的Id ReadingQuestionTrial的id
/// </summary>
public Guid ReadingQuestionId { get; set; }
public string Type { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public string ParentTriggerValue { get; set; } = string.Empty;
public string QuestionName { get; set; } = string.Empty;
public IsRequired IsRequired { get; set; }
public int ShowOrder { get; set; }
public string TypeValue { get; set; } = string.Empty;
public bool IsEnable { get; set; }
public string Remark { get; set; } = string.Empty;
public Guid? RelevanceId { get; set; }
public string RelevanceValue { get; set; } = string.Empty;
public int ShowQuestion { get; set; }
public int? MaxRowCount { get; set; }
public string DataTableName { get; set; } = string.Empty;
@@ -128,16 +106,12 @@ namespace IRaCIS.Core.Domain.Models
public Guid? DependParentId { get; set; }
public IsDepend IsDepend { get; set; }
public Guid TrialCriterionId { get; set; }
/// <summary>
/// 问题标识
/// </summary>
public QuestionMark? QuestionMark { get; set; }
/// <summary>
/// 字典code
/// </summary>
@@ -197,9 +171,6 @@ namespace IRaCIS.Core.Domain.Models
/// 问题分类
/// </summary>
public QuestionClassify? QuestionClassify { get; set; }
/// <summary>
/// 复制病灶的时候 是否复制这个问题
/// </summary>
@@ -209,10 +180,5 @@ namespace IRaCIS.Core.Domain.Models
/// 系统表格问题Id
/// </summary>
public Guid? SystemTableQuestionId { get; set; }
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@@ -24,9 +20,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid CriterionId { get; set; }
public Guid DictionaryId { get; set; }
public string ParentCode { get; set; } = string.Empty;
public bool IsBaseLineUse { get; set; }
@@ -34,10 +27,5 @@ namespace IRaCIS.Core.Domain.Models
public bool IsFollowVisitUse { get; set; }
public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; }
}
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@@ -16,8 +13,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid VisitTaskId { get; set; }
public Guid? StudyId { get; set; }
public Guid? SeriesId { get; set; }
public Guid? InstanceId { get; set; }
@@ -27,6 +22,4 @@ namespace IRaCIS.Core.Domain.Models
public int? NumberOfFrames { get; set; }
}
}
@@ -15,8 +15,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
[ForeignKey("GlobalTaskId")]
public VisitTask GlobalVisitTask { get; set; }
[JsonIgnore]
[ForeignKey("QuestionId")]
public ReadingQuestionTrial TrialReadingQuestion { get; set; }
@@ -43,8 +41,6 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string Answer { get; set; } = string.Empty;
public Guid TrialId { get; set; }
/// <summary>
@@ -55,6 +51,4 @@ namespace IRaCIS.Core.Domain.Models
public Guid SubjectId { get; set; }
}
}
@@ -26,15 +26,8 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
[Required]
public Guid JudgeTaskId { get; set; }
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
}
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
/// <summary>
@@ -38,8 +35,6 @@ namespace IRaCIS.Core.Domain.Models
/// 原因
/// </summary>
public string EvaluationReason { get; set; } = string.Empty;
/// <summary>
/// 项目Id
/// </summary>
@@ -49,9 +44,5 @@ namespace IRaCIS.Core.Domain.Models
/// 受试者Id
/// </summary>
public Guid SubjectId { get; set; }
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
@@ -31,29 +27,17 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
[ForeignKey("QuestionId")]
public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
//病灶答案表
[JsonIgnore]
public List<ReadingTableQuestionAnswer> LesionAnswerList { get; set; } = new List<ReadingTableQuestionAnswer>();
#endregion
public Guid QuestionId { get; set; }
public Guid VisitTaskId { get; set; }
public Guid TrialId { get; set; }
public Guid? InstanceId { get; set; }
public Guid? SeriesId { get; set; }
public Guid? StudyId { get; set; }
public Guid? OtherInstanceId { get; set; }
@@ -69,8 +53,6 @@ namespace IRaCIS.Core.Domain.Models
public int? OtherNumberOfFrames { get; set; }
public bool IsCanEditPosition { get; set; } = false;
/// <summary>
/// 是Dicom阅片
/// </summary>
@@ -119,18 +101,11 @@ namespace IRaCIS.Core.Domain.Models
public Guid? CTSeriesId { get; set; }
public SplitOrMergeType? SplitOrMergeType { get; set; }
public int? NumberOfFrames { get; set; }
/// <summary>
/// 器官Id
/// </summary>
public Guid? OrganInfoId { get; set; }
/// <summary>
/// 窗宽WW
/// </summary>
@@ -150,12 +125,7 @@ namespace IRaCIS.Core.Domain.Models
/// 报告页面显示来自于哪个标记
/// </summary>
public string ReportMark { get; set; } = string.Empty;
public string OtherMeasureData { get; set; } = string.Empty;
//病灶编号
public string RowMark { get; set; } = string.Empty;
@@ -163,10 +133,5 @@ namespace IRaCIS.Core.Domain.Models
/// 标记工具
/// </summary>
public string MarkTool { get; set; } = string.Empty;
}
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@@ -14,27 +11,18 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("RowId")]
public ReadingTableAnswerRowInfo Lesion { get; set; }
[JsonIgnore]
[ForeignKey("QuestionId")]
public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
[JsonIgnore]
[ForeignKey("TableQuestionId")]
public ReadingTableQuestionTrial ReadingTableQuestionTrial { get; set; }
[JsonIgnore]
[ForeignKey("VisitTaskId")]
public VisitTask VisitTask { get; set; }
#endregion
public Guid QuestionId { get; set; }
/// <summary>
@@ -45,18 +33,9 @@ namespace IRaCIS.Core.Domain.Models
public Guid VisitTaskId { get; set; }
public Guid TrialId { get; set; }
public decimal RowIndex { get; set; }
public string Answer { get; set; } = string.Empty;
public Guid RowId { get; set; }
}
}
@@ -41,24 +41,9 @@ namespace IRaCIS.Core.Domain.Models
/// 全局阅片修改的答案
/// </summary>
public string GlobalChangeAnswer { get; set; } = string.Empty;
/// <summary>
/// 全局阅片是否修改
/// </summary>
public bool IsGlobalChange { get; set; } = false;
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@@ -20,8 +16,6 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("VisitTaskId")]
public VisitTask VisitTask { get; set; }
#endregion
public Guid VisitTaskId { get; set; }
public Guid QuestionId { get; set; }
@@ -29,11 +23,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid? InstanceId { get; set; }
public Guid? SeriesId { get; set; }
public Guid? StudyId { get; set; }
public string MarkTool { get; set; } = string.Empty;
public string PicturePath { get; set; } = string.Empty;
@@ -41,13 +31,9 @@ namespace IRaCIS.Core.Domain.Models
public int? NumberOfFrames { get; set; }
public string MeasureData { get; set; } = string.Empty;
public Guid? FirstAddTaskId { get; set; }
public QuestionType? QuestionType { get; set; }
public string OrderMarkName { get; set; } = string.Empty;
public Guid? OtherInstanceId { get; set; }
@@ -62,9 +48,5 @@ namespace IRaCIS.Core.Domain.Models
public int? OtherNumberOfFrames { get; set; }
public string OtherMeasureData { get; set; } = string.Empty;
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@@ -32,11 +28,5 @@ namespace IRaCIS.Core.Domain.Models
/// 类型具体解释 看枚举
/// </summary>
public RelevanceType RelevanceType { get; set; }
}
}
@@ -35,13 +35,8 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
[ForeignKey("TrialId")]
public Trial Trial { get; set; }
[JsonIgnore]
public List<ReadModuleCriterionFrom> ReadModuleCriterionFromList { get; set; } = new List<ReadModuleCriterionFrom>();
[JsonIgnore]
public List<VisitTask> ModuleTaskList { get; set; }
[JsonIgnore]
@@ -50,8 +45,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public List<ReadingClinicalData> ReadingClinicalDataList { get; set; }
#endregion
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
@@ -72,16 +65,12 @@ namespace IRaCIS.Core.Domain.Models
public bool? IsUrgent { get; set; }
public Guid SubjectVisitId { get; set; }
/// <summary>
/// 阅片计划ID
/// </summary>
public Guid? ReadingPeriodSetId { get; set; }
public Guid TrialId { get; set; }
public bool IsCRCConfirm { get; set; } = false;
public bool IsPMConfirm { get; set; } = false;
@@ -92,8 +81,6 @@ namespace IRaCIS.Core.Domain.Models
/// CRC是否正在申请撤回
/// </summary>
public bool IsCRCApplicationRevoke { get; set; } = false;
/// <summary>
/// 临床数据是否完整
/// </summary>
@@ -111,7 +98,4 @@ namespace IRaCIS.Core.Domain.Models
public ReadingStatusEnum ReadingStatus { get; set; } = ReadingStatusEnum.TaskAllocate;
}
}
@@ -30,13 +30,5 @@ namespace IRaCIS.Core.Domain.Models
/// 访视
/// </summary>
public Guid SubjectVisitId { get; set; }
}
}
@@ -53,9 +53,6 @@ namespace IRaCIS.Core.Domain.Models
/// 访视计划ID
/// </summary>
public Guid? VisitStageId { get; set; }
/// <summary>
/// 是否生效
/// </summary>
@@ -65,8 +62,6 @@ namespace IRaCIS.Core.Domain.Models
/// 生效时间
/// </summary>
public DateTime? EffectOfTime { get; set; }
/// <summary>
/// 是否为全局阅片
/// </summary>
@@ -76,10 +71,6 @@ namespace IRaCIS.Core.Domain.Models
/// 阅片配置的类型
/// </summary>
public ReadingSetType ReadingSetType { get; set; }
}
}
@@ -22,14 +22,5 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialId { get; set; }
public Guid TrialSiteId { get; set; }
}
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@@ -26,8 +23,6 @@ namespace IRaCIS.Core.Domain.Models
/// 影像工具类型
/// </summary>
public int ImageToolType { get; set; }
public Guid UserId { get; set; }
public bool AltKey { get; set; } = false;
@@ -43,6 +38,4 @@ namespace IRaCIS.Core.Domain.Models
public string Code { get; set; } = string.Empty;
}
}
@@ -1,6 +1,3 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
@@ -14,19 +11,9 @@ namespace IRaCIS.Core.Domain.Models
#endregion
public string TemplateName { get; set; } = string.Empty;
public Guid UserId { get; set; }
public int WW { get; set; }
public int WL { get; set; }
public int ShowOrder { get; set; } = 0;
/// <summary>
@@ -35,6 +22,4 @@ namespace IRaCIS.Core.Domain.Models
public bool IsPitchOn { get; set; } = true;
}
}
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@@ -1,7 +1,3 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
{
@@ -8,8 +8,6 @@ namespace IRaCIS.Core.Domain.Models
/// Id(阅片期Id 或者 访视ID)
/// </summary>
public new Guid Id { get; set; }
/// <summary>
/// 项目ID
/// </summary>
@@ -44,20 +42,14 @@ namespace IRaCIS.Core.Domain.Models
/// 访视ID
/// </summary>
public Guid? SubjectVisitId { get; set; }
/// <summary>
/// 访视名称
/// </summary>
public string? SubjectVisitName { get; set; }
/// <summary>
/// 截止访视
/// </summary>
public Guid? CutOffVisitId { get; set; }
/// <summary>
/// 截止访视名称
/// </summary>
@@ -72,9 +64,6 @@ namespace IRaCIS.Core.Domain.Models
/// 对应Name
/// </summary>
public string? ReadModuleName { get; set; }
/// <summary>
/// 创建时间
/// </summary>
@@ -129,8 +118,6 @@ namespace IRaCIS.Core.Domain.Models
/// 入组确认评估
/// </summary>
public bool? IsEnrollmentConfirm { get; set; } = false;
/// <summary>
/// 阅片状态
/// </summary>
@@ -140,14 +127,10 @@ namespace IRaCIS.Core.Domain.Models
/// 是否是基线
/// </summary>
public bool? IsBaseLine { get; set; } = false;
/// <summary>
/// 标准Id
/// </summary>
public Guid? TrialReadingCriterionId { get; set; }
/// <summary>
/// 标准名称
/// </summary>
@@ -167,8 +150,6 @@ namespace IRaCIS.Core.Domain.Models
/// 已经签名的临床数据数量
/// </summary>
public int SignClinicalDataCount { get; set; }
public CompleteClinicalDataEnum CompleteClinicalData
{