From bfea26342e7eb082abe496548cfb67d5ebb09cc1 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 22 Mar 2023 10:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs | 4 +++-
 IRaCIS.Core.Application/Service/Common/DictionaryService.cs   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
index 1c72b5ed9..716a5c9ed 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
@@ -141,7 +141,9 @@ namespace IRaCIS.Application.Contracts
 
         public DicDataTypeEnum DataTypeEnum { get; set; }
 
-        public bool IsEnumInt => System.Text.RegularExpressions.Regex.IsMatch(Code, @"^[-+]?\d*$") && DataTypeEnum== DicDataTypeEnum.Enum;
+        public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = IRaCIS.Core.Domain.Share.CrterionDictionaryGroup.Genera;
+
+       public bool IsEnumInt => System.Text.RegularExpressions.Regex.IsMatch(Code, @"^[-+]?\d*$") && DataTypeEnum== DicDataTypeEnum.Enum;
 
 
     }
diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
index 0ebb9b0d9..bd02d6989 100644
--- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
+++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
@@ -359,6 +359,7 @@ namespace IRaCIS.Application.Services
                     ParentChildCodeEnum = x.Dictionary.Parent.ChildCodeEnum,
                     ShowOrder = x.Dictionary.ShowOrder,
                     ParentCode = x.ParentCode,
+                    CrterionDictionaryGroup=x.CrterionDictionaryGroup,
                     Id = x.DictionaryId,
                     ParentId = x.Dictionary.ParentId,
                     Value = x.Dictionary.Value,
@@ -430,6 +431,7 @@ namespace IRaCIS.Application.Services
                     ShowOrder = x.Dictionary.ShowOrder,
                     ParentCode = x.ParentCode,
                     Id = x.DictionaryId,
+                    CrterionDictionaryGroup=x.CrterionDictionaryGroup,
                     ParentId = x.Dictionary.ParentId,
                     Value = x.Dictionary.Value,
                     ValueCN = x.Dictionary.ValueCN