代码修改

2023-09-05 17:44:29 +08:00
parent b006fff6ed
commit bad5f32ffc
4 changed files with 387 additions and 1 deletions
@@ -6,6 +6,8 @@
 using System;
 using IRaCIS.Core.Domain.Share;
 using System.Collections.Generic;
+using System.Reflection.Metadata.Ecma335;
+
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {

@@ -153,6 +155,27 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
        public List<decimal> ShortBigger10Indexs { get; set; }
    }

+    public class CalculationDto
+    {
+        public List<string> Column1 { get; set; } = new List<string>();
+
+        public List<string> Column2 { get; set; } = new List<string>();
+
+        public List<string> Column3 { get; set; } = new List<string>();
+        public List<string> Column4 { get; set; } = new List<string>();
+
+        public List<string> Column5 { get; set; } = new List<string>();
+
+        public List<string> Column6 { get; set; } = new List<string>();
+
+        public List<string> Column7 { get; set; } = new List<string>();
+
+        /// <summary>
+        /// 不等于
+        /// </summary>
+        public List<int> NotEq { get; set; } = new List<int>();
+    }
+
    /// <summary>
    /// 阅片计算Dto
    /// </summary>
@@ -358,6 +358,8 @@ namespace IRaCIS.Application.Services

                .Select(x => new CriterionOtherQuestionOutDto()
                {
+                    DictionaryCode=x.DictionaryCode,
+                    
                    QuestionId = x.Id,
                    QuestionName = x.QuestionName,
                    TypeValue = x.TypeValue,
@@ -678,6 +680,7 @@ namespace IRaCIS.Application.Services
                .Select(x => new CriterionOtherQuestionOutDto()
                {
                    QuestionId = x.Id,
+                    DictionaryCode = x.DictionaryCode,
                    QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
                    TypeValue = x.TypeValue,
                }).ToListAsync();