修改

2024-10-17 10:14:50 +08:00
parent 546d65ab16
commit 553fa097b4
6 changed files with 94 additions and 13 deletions
@@ -1,4 +1,5 @@
 using IRaCIS.Core.Domain.Share;
+using Newtonsoft.Json;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

@@ -2536,6 +2537,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
        /// 问题标识
        /// </summary>
        public QuestionMark? QuestionMark { get; set; }
+
+
+
+        [Comment("复制病灶的时候 是否复制这个问题")]
+        public bool IsCopy { get; set; } = false;
+
+        [Comment("分类问题表格Id")]
+        public Guid? ClassifyTableQuestionId { get; set; }
+
+        [Comment("分类算法")]
+        public string ClassifyAlgorithms { get; set; } = string.Empty;
    }


@@ -2749,6 +2761,47 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
            }

        }
+
+
+        [Comment("导出标识")]
+        public ExportIdentification? ExportIdentification { get; set; }
+
+        [Comment("导出结果")]
+        public string ExportResultStr { get; set; } = "[]";
+
+        [Comment("分类算法")]
+        public string ClassifyAlgorithms { get; set; } = string.Empty;
+
+        [Comment("分类问题Id")]
+        public Guid? ClassifyQuestionId { get; set; }
+
+        [NotMapped]
+        public List<ExportResult> ExportResult
+        {
+            get
+            {
+                try
+                {
+                    var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
+                    return result == null ? new List<ExportResult>() : result;
+                }
+                catch (Exception)
+                {
+
+                    return new List<ExportResult>();
+                }
+
+            }
+        }
+
+
+
+        [Comment("复制病灶的时候 是否复制这个问题")]
+        public bool IsCopy { get; set; } = false;
+
+        [Comment("分类问题表格Id")]
+        public Guid? ClassifyTableQuestionId { get; set; }
+
    }

    public class GetTrialReadingQuestionOutDto
@@ -2968,6 +3021,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto



+        [Comment("复制病灶的时候 是否复制这个问题")]
+        public bool IsCopy { get; set; } = false;
+
+        [Comment("分类问题表格Id")]
+        public Guid? ClassifyTableQuestionId { get; set; }
+
+        [Comment("分类算法")]
+        public string ClassifyAlgorithms { get; set; } = string.Empty;
+

    }

@@ -1336,6 +1336,9 @@ namespace IRaCIS.Core.Application.Service
                    Remark = x.Remark,
                    ValueType = x.ValueType,
                    Unit = x.Unit,
+                    ClassifyAlgorithms=x.ClassifyAlgorithms,
+                    IsCopy=x.IsCopy,
+                    ClassifyTableQuestionId=x.ClassifyTableQuestionId,
                }).ToList();
            });

@@ -271,7 +271,6 @@ namespace IRaCIS.Core.Application.Service
                Childrens = new List<GetSystemReadingQuestionOutDto>(),
                ShowOrder = x.ShowOrder,
                GroupName = string.Empty,
-
                Id = x.Id,
                Type = x.Type,
                DictionaryCode = x.DictionaryCode,
@@ -288,6 +287,9 @@ namespace IRaCIS.Core.Application.Service
                DataTableColumn = x.DataTableColumn,
                LesionType = item.LesionType,
                QuestionName = x.QuestionName,
+                IsCopy=x.IsCopy,
+                ClassifyTableQuestionId= x.ClassifyTableQuestionId,
+                ClassifyAlgorithms=x.ClassifyAlgorithms,
                RelationQuestions = tableQuestions.Where(z => (z.DependParentId ?? default(Guid)) == x.Id).Select(x => new GetSystemReadingQuestionOutDto
                {
                    Childrens = new List<GetSystemReadingQuestionOutDto>(),
@@ -310,6 +312,9 @@ namespace IRaCIS.Core.Application.Service
                    QuestionName = x.QuestionName,
                    RelationQuestions = new List<GetSystemReadingQuestionOutDto>(),
                    Remark = x.Remark,
+                    IsCopy = x.IsCopy,
+                    ClassifyTableQuestionId = x.ClassifyTableQuestionId,
+                    ClassifyAlgorithms = x.ClassifyAlgorithms,

                }).ToList(),
                Remark = x.Remark,