项目

src/Shentun.Peis.Application/ItemResultTemplates/ItemResultTemplateAppService.cs

@@ -170,18 +170,6 @@ namespace Shentun.Peis.ItemResultTemplates
         }
 
 
-
-        /// <summary>
-        /// 修改排序  相邻之间
-        /// </summary>
-        /// <param name="id">需要修改的ID</param>
-        /// <param name="targetid">目标ID</param>
-        [HttpPut("api/app/itemresulttemplate/updatesort")]
-        public async Task UpdateSortAsync(Guid id, Guid targetid)
-        {
-            await _manager.UpdateSortAsync(id, targetid);
-        }
-
         /// <summary>
         /// 修改排序  置顶，置底
         /// </summary>

src/Shentun.Peis.Application/Items/ItemAppService.cs

@@ -220,17 +220,7 @@ namespace Shentun.Peis.Items
             await _manager.UpdateRangeTypeAsync(input.ItemId, input.ReferenceRangeTypeFlag);  //更新
         }
 
-
-        /// <summary>
-        /// 修改排序  相邻之间
-        /// </summary>
-        /// <param name="id">需要修改的ID</param>
-        /// <param name="targetid">目标ID</param>
-        [HttpPut("api/app/item/updatesort")]
-        public async Task UpdateSortAsync(Guid id, Guid targetid)
-        {
-            await _manager.UpdateSortAsync(id, targetid);
-        }
+ 
 
         /// <summary>
         /// 修改排序  置顶，置底

src/Shentun.Peis.Domain/CardRegisters/CardRegisterManager.cs

@@ -97,12 +97,8 @@ namespace Shentun.Peis.CardRegisters
         public async Task UpdateActive(CardRegister entity, char isActive)
         {
             DataHelper.CheckVerifyData(entity);
-            DataHelper.CheckVerifyData(isActive, "使用标志");
-            if (isActive != 'Y' && isActive != 'N')
-            {
-                throw new ArgumentException($"IsActive参数为:{isActive},是无效值");
-            }
-
+            DataHelper.CheckVerifyData(isActive, "使用标志", true);
+           
             if (isActive == 'N')
             {
                 entity.IsActive = isActive;
@@ -180,7 +176,7 @@ namespace Shentun.Peis.CardRegisters
             };
             entity.CardBills.Add(cardBill);
         }
-        public void Verify(CardRegister entity)
+        private void Verify(CardRegister entity)
         {
             DataHelper.CheckVerifyData(entity);
             DataHelper.CheckVerifyData(entity.CardNo, "卡号");
@@ -189,11 +185,7 @@ namespace Shentun.Peis.CardRegisters
             DataHelper.CheckVerifyData(entity.IdNo, "手机号");
             DataHelper.CheckVerifyData(entity.CardTypeId, "卡类型");
             DataHelper.CheckVerifyData(entity.OrganizationUnitId, "体检中心");
-            DataHelper.CheckVerifyData(entity.IsActive, "使用标志");
-            if (entity.IsActive != 'Y' && entity.IsActive != 'N')
-            {
-                throw new ArgumentException($"IsActive参数为:{entity.IsActive},是无效值");
-            }
+            DataHelper.CheckVerifyData(entity.IsActive, "使用标志", true);
         }
     }
 }

src/Shentun.Peis.Domain/DataHelper.cs

@@ -397,16 +397,23 @@ namespace Shentun.Peis
         /// </summary>
         /// <param name="value">需要验证的值</param>
         /// <param name="parameterName">字段名称</param>
+        /// <param name="IsVerifyValue"> 默认false(true 验证为Y跟N    false 不验证)</param>
         /// <param name="ExceptionMessage">异常提示后缀</param>
         /// <exception cref="ArgumentException"></exception>
-        public static void CheckVerifyData(char? value, string parameterName, string ExceptionMessage = "不能为空")
+        public static void CheckVerifyData(char? value, string parameterName, bool IsVerifyValue = false, string ExceptionMessage = "不能为空")
         {
             if (value == null || value == '0')
             {
                 throw new ArgumentException($"{parameterName}{ExceptionMessage}");
             }
+
+            if (IsVerifyValue && value != 'Y' && value != 'N')
+            {
+                throw new ArgumentException($"{parameterName}参数为:{value},是无效值");
+            }
         }
 
+
         /// <summary>
         /// 数据检查 整型
         /// </summary>

src/Shentun.Peis.Domain/ItemResultTemplates/ItemResultTemplateManager.cs

@@ -68,17 +68,6 @@ namespace Shentun.Peis.ItemResultTemplates
         }
 
 
-
-        /// <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>
         /// 修改排序  置顶，置底
         /// </summary>

src/Shentun.Peis.Domain/ItemTypes/ItemTypeManager.cs

@@ -81,7 +81,7 @@ namespace Shentun.Peis.ItemTypes
             targetEntity.IsMergeAsbitem = sourceEntity.IsMergeAsbitem;
             targetEntity.MedicalReportTypeId = sourceEntity.MedicalReportTypeId;
             targetEntity.LineModeFlag = sourceEntity.LineModeFlag;
-            if (sourceEntity.PathCode != targetEntity.PathCode)
+            if (!string.IsNullOrEmpty(sourceEntity.PathCode) && sourceEntity.PathCode != targetEntity.PathCode)
             {
                 throw new ArgumentException($"路径编码不支持修改");
             }
@@ -94,17 +94,13 @@ namespace Shentun.Peis.ItemTypes
         /// <param name="entity"></param>
         private void Verify(ItemType entity)
         {
-         
+
             DataHelper.CheckVerifyData(entity);
             DataHelper.CheckVerifyData(entity.DisplayName, "名称");
             DataHelper.CheckVerifyData(entity.GuidTypeId, "指引类别");
-            DataHelper.CheckVerifyData(entity.IsMergeAsbitem, "是否合并组合项目");
-            if (entity.IsMergeAsbitem != 'Y' && entity.IsMergeAsbitem != 'N')
-            {
-                throw new ArgumentException($"IsMergeAsbitem参数为:{entity.IsMergeAsbitem},是无效值");
-            }
+            DataHelper.CheckVerifyData(entity.IsMergeAsbitem, "是否合并组合项目", true);
             DataHelper.CheckVerifyData(entity.MedicalReportTypeId, "体检报告类别");
-       
+
         }
 
         /// <summary>

src/Shentun.Peis.Domain/Items/ItemManager.cs

@@ -62,14 +62,13 @@ namespace Shentun.Peis.Items
           Item entity
          )
         {
-            DataHelper.CheckVerifyData(entity.DisplayName, "名称");
+            Verify(entity);
             await EntityHelper.CheckSameName<Item, Guid>(_repository, entity.DisplayName);
             return new Item
             {
                 DisplayName = entity.DisplayName,
                 SimpleCode = LanguageConverter.GetPYSimpleCode(entity.DisplayName),
                 DisplayOrder = await EntityHelper.CreateMaxDisplayOrder<Item>(_repository),
-
                 DefaultResult = entity.DefaultResult,
                 DiagnosisFunction = entity.DiagnosisFunction,
                 IsActive = entity.IsActive,
@@ -102,7 +101,8 @@ namespace Shentun.Peis.Items
            Item targetEntity
           )
         {
-            DataHelper.CheckVerifyData(sourceEntity.DisplayName, "名称");
+            DataHelper.CheckVerifyData(targetEntity);
+            Verify(sourceEntity);
             if (sourceEntity.DisplayName != targetEntity.DisplayName)
             {
                 await EntityHelper.CheckSameName<Item, Guid>(_repository, sourceEntity.DisplayName, targetEntity);
@@ -131,6 +131,21 @@ namespace Shentun.Peis.Items
         }
 
 
+        private void Verify(Item entity)
+        {
+            DataHelper.CheckVerifyData(entity);
+            DataHelper.CheckVerifyData(entity.DisplayName, "名称");
+            DataHelper.CheckVerifyData(entity.ItemTypeId, "项目类别");
+            DataHelper.CheckVerifyData(entity.Price, "价格");
+            DataHelper.CheckVerifyData(entity.IsProduceSummary, "是否生成小结", true);
+            DataHelper.CheckVerifyData(entity.IsNameIntoSummary, "名称是否进入小结", true);
+            DataHelper.CheckVerifyData(entity.IsDiagnosisFunction, "是否启用诊断函数", true);
+            DataHelper.CheckVerifyData(entity.IsCalculationItem, "是否计算项目", true);
+            DataHelper.CheckVerifyData(entity.IsContinueProcess, "是否继续处理", true);
+            DataHelper.CheckVerifyData(entity.IsActive, "是否启用", true);
+        }
+
+
 
         /// <summary>
         /// 更新参考范围类型
@@ -151,15 +166,7 @@ namespace Shentun.Peis.Items
 
 
 
-        /// <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>
         /// 修改排序  置顶，置底