From 1c546fcb2b7a1da591b10cd8f9fa9b70570c1f11 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 2 Feb 2023 17:06:43 +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

---
 .../Service/Common/DTO/DictionaryModel.cs             |  2 ++
 .../Service/Common/DictionaryService.cs               |  6 ++++++
 .../Service/Reading/Dto/OrganInfoViewModel.cs         |  7 +++++++
 .../Service/Reading/Dto/ReadingQuestionViewModel.cs   | 11 +++++++----
 .../Reading/ReadingCriterion/OrganInfoService.cs      |  4 ++++
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
index 83c88f70e..a89a813d4 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
@@ -111,6 +111,8 @@ namespace IRaCIS.Application.Contracts
         public string ValueCN { get; set; } = string.Empty;
         public string Value { get; set; } = string.Empty;
 
+        public string Description { get; set; } = string.Empty;
+
         public int ShowOrder { get; set; }
 
         public Guid? ParentId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
index 7188c9f54..053fe1c0b 100644
--- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
+++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
@@ -158,6 +158,11 @@ namespace IRaCIS.Application.Services
         [HttpDelete("{id:guid}")]
         public async Task<IResponseOutput> DeleteDictionary(Guid id)
         {
+            if (await _readingCriterionDictionaryRepository.AnyAsync(x => x.DictionaryId == id))
+            {
+                return ResponseOutput.NotOk("当前字典在标准中被引用,不允许删除！");
+            }
+
             if (await _dicRepository.AnyAsync(t => t.ParentId == id))
             {
                 return ResponseOutput.NotOk("有子项数据，不允许直接删除！");
@@ -314,6 +319,7 @@ namespace IRaCIS.Application.Services
                 {
                     ChildGroup = x.Dictionary.ChildGroup,
                     Code = x.Dictionary.Code,
+                    Description=x.Dictionary.Description,
                     DataTypeEnum = x.Dictionary.DataTypeEnum,
                     ParentChildCodeEnum = x.Dictionary.Parent.ChildCodeEnum,
                     ShowOrder = x.Dictionary.ShowOrder,
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
index 79b3108e8..6e339098b 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
@@ -202,6 +202,13 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid OriginalId { get; set; }
     }
 
+
+    public class SynchronizeSystemOrganInDto
+    {
+      
+    }
+
+
     public class SynchronizeSystemOrganToTrialInDto
     {
 
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 7b03369a6..6e5d70773 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -950,6 +950,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueOfType? ValueType { get; set; }
 
+		/// <summary>
+		/// 备注
+		/// </summary>
+		public string Remark { get; set; }
+
 		/// <summary>
 		/// 数据来源
 		/// </summary>
@@ -1021,10 +1026,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string RelevanceValue { get; set; } = string.Empty;
 
-		/// <summary>
-		/// 备注
-		/// </summary>
-		public string Remark { get; set; }
 
 		/// <summary>
 		/// 系统标准Id
@@ -1570,6 +1571,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public LesionType? LesionType { get; set; }
 
 
+
+
 		/// <summary>
 		/// 问题类型
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs
index c902d36a8..3257cf065 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs
@@ -369,6 +369,10 @@ namespace IRaCIS.Core.Application.Service
 
         #endregion
 
+        //public async Task<IResponseOutput> SynchronizeSystemOrgan()
+        //{
+            
+        //}
 
 
         /// <summary>