From 46be0d4907dba3149259885371aaac05c7160874 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Mon, 25 Mar 2024 10:43:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=9C=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreateItemResultTemplateDto.cs            |  3 +++
 .../Asbitems/AsbitemAppService.cs             | 11 +--------
 .../Asbitems/AsbitemManager.cs                | 10 +-------
 .../ItemResultTemplateManager.cs              | 23 +++++++++++++++++--
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/Shentun.Peis.Application.Contracts/ItemResultTemplates/CreateItemResultTemplateDto.cs b/src/Shentun.Peis.Application.Contracts/ItemResultTemplates/CreateItemResultTemplateDto.cs
index 64b4b06..b89c966 100644
--- a/src/Shentun.Peis.Application.Contracts/ItemResultTemplates/CreateItemResultTemplateDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/ItemResultTemplates/CreateItemResultTemplateDto.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Text;
 
 namespace Shentun.Peis.ItemResultTemplates
@@ -9,11 +10,13 @@ namespace Shentun.Peis.ItemResultTemplates
         /// <summary>
         /// 项目编号
         /// </summary>
+        [Required(ErrorMessage ="项目ID不能为空")]
         public Guid ItemId { get; set; }
 
         /// <summary>
         /// 结果
         /// </summary>
+        [Required(ErrorMessage = "项目结果不能为空")]
         public string Result { get; set; }
 
 
diff --git a/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs b/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs
index 049eee4..12ee3d1 100644
--- a/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs
+++ b/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs
@@ -231,16 +231,7 @@ namespace Shentun.Peis.Asbitems
             await _manager.CheckAndDeleteAsync(id);
         }
 
-        /// <summary>
-        /// 修改排序  相邻之间
-        /// </summary>
-        /// <param name="id">需要修改的ID</param>
-        /// <param name="targetid">目标ID</param>
-        [HttpPut("api/app/asbitem/updatesort")]
-        public async Task UpdateSortAsync(Guid id, Guid targetid)
-        {
-            await _manager.UpdateSortAsync(id, targetid);
-        }
+     
 
         /// <summary>
         /// 修改排序  置顶，置底
diff --git a/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs b/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs
index e207bea..ba7d6ee 100644
--- a/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs
+++ b/src/Shentun.Peis.Domain/Asbitems/AsbitemManager.cs
@@ -144,15 +144,7 @@ namespace Shentun.Peis.Asbitems
 
 
 
-        /// <summary>
-        /// 修改排序  相邻之间
-        /// </summary>
-        /// <param name="id">需要修改的ID</param>
-        /// <param name="targetid">目标ID</param>
-        public async Task UpdateSortAsync(Guid id, Guid targetid)
-        {
-            await EntityHelper.UpdateSort(_repository, id, targetid);
-        }
+     
 
         /// <summary>
         /// 修改排序  置顶，置底
diff --git a/src/Shentun.Peis.Domain/ItemResultTemplates/ItemResultTemplateManager.cs b/src/Shentun.Peis.Domain/ItemResultTemplates/ItemResultTemplateManager.cs
index 583c78b..2b2b68c 100644
--- a/src/Shentun.Peis.Domain/ItemResultTemplates/ItemResultTemplateManager.cs
+++ b/src/Shentun.Peis.Domain/ItemResultTemplates/ItemResultTemplateManager.cs
@@ -1,4 +1,5 @@
-using Shentun.Peis.HelperDto;
+using Shentun.Peis.Enums;
+using Shentun.Peis.HelperDto;
 using Shentun.Peis.Models;
 using Shentun.Utilities;
 using System;
@@ -33,6 +34,7 @@ namespace Shentun.Peis.ItemResultTemplates
           ItemResultTemplate entity
          )
         {
+            Verify(entity);
             return new ItemResultTemplate
             {
                 DiagnosisId = entity.DiagnosisId,
@@ -41,7 +43,7 @@ namespace Shentun.Peis.ItemResultTemplates
                 ItemId = entity.ItemId,
                 Result = entity.Result,
                 ResultStatusId = entity.ResultStatusId,
-                SimpleCode = entity.SimpleCode,
+                SimpleCode = LanguageConverter.GetPYSimpleCode(entity.SimpleCode),
                 DisplayOrder = await EntityHelper.CreateMaxDisplayOrder<ItemResultTemplate>(_repository),
             };
         }
@@ -56,6 +58,8 @@ namespace Shentun.Peis.ItemResultTemplates
            ItemResultTemplate targetEntity
           )
         {
+            DataHelper.CheckEntityIsNull(targetEntity);
+            Verify(sourceEntity);
             targetEntity.DiagnosisId = sourceEntity.DiagnosisId;
             targetEntity.IsNameIntoSummary = sourceEntity.IsNameIntoSummary;
             targetEntity.IsResultIntoSummary = sourceEntity.IsResultIntoSummary;
@@ -65,6 +69,21 @@ namespace Shentun.Peis.ItemResultTemplates
             targetEntity.SimpleCode = sourceEntity.SimpleCode;
         }
 
+        /// <summary>
+        /// 验证新增、修改字段
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <exception cref="ArgumentException"></exception>
+        private void Verify(ItemResultTemplate entity)
+        {
+            DataHelper.CheckEntityIsNull(entity);
+            DataHelper.CheckStringIsNull(entity.Result, "名称");
+            DataHelper.CheckGuidIsDefaultValue(entity.ItemId, "项目编号");
+            DataHelper.CheckCharIsYOrN(entity.IsNameIntoSummary, "小结前是否加名称");
+            DataHelper.CheckCharIsYOrN(entity.IsResultIntoSummary, "是否进入小结");
+            DataHelper.CheckStringIsNull(entity.ResultStatusId, "结果状态ID");
+        }
+
 
         /// <summary>
         /// 修改排序  置顶，置底