From aad44f7a30015aebdfed46fd8ff0a01b8bef478c Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Mon, 18 Mar 2024 18:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ItemResultTemplateAppService.cs | 12 -------
.../Items/ItemAppService.cs | 12 +------
.../CardRegisters/CardRegisterManager.cs | 16 +++-------
src/Shentun.Peis.Domain/DataHelper.cs | 9 +++++-
.../ItemResultTemplateManager.cs | 11 -------
.../ItemTypes/ItemTypeManager.cs | 12 +++----
src/Shentun.Peis.Domain/Items/ItemManager.cs | 31 ++++++++++++-------
7 files changed, 36 insertions(+), 67 deletions(-)
diff --git a/src/Shentun.Peis.Application/ItemResultTemplates/ItemResultTemplateAppService.cs b/src/Shentun.Peis.Application/ItemResultTemplates/ItemResultTemplateAppService.cs
index 12214ba..144ad37 100644
--- a/src/Shentun.Peis.Application/ItemResultTemplates/ItemResultTemplateAppService.cs
+++ b/src/Shentun.Peis.Application/ItemResultTemplates/ItemResultTemplateAppService.cs
@@ -170,18 +170,6 @@ namespace Shentun.Peis.ItemResultTemplates
}
-
- ///
- /// 修改排序 相邻之间
- ///
- /// 需要修改的ID
- /// 目标ID
- [HttpPut("api/app/itemresulttemplate/updatesort")]
- public async Task UpdateSortAsync(Guid id, Guid targetid)
- {
- await _manager.UpdateSortAsync(id, targetid);
- }
-
///
/// 修改排序 置顶，置底
///
diff --git a/src/Shentun.Peis.Application/Items/ItemAppService.cs b/src/Shentun.Peis.Application/Items/ItemAppService.cs
index 9ec95f2..2b92cb8 100644
--- a/src/Shentun.Peis.Application/Items/ItemAppService.cs
+++ b/src/Shentun.Peis.Application/Items/ItemAppService.cs
@@ -220,17 +220,7 @@ namespace Shentun.Peis.Items
await _manager.UpdateRangeTypeAsync(input.ItemId, input.ReferenceRangeTypeFlag); //更新
}
-
- ///
- /// 修改排序 相邻之间
- ///
- /// 需要修改的ID
- /// 目标ID
- [HttpPut("api/app/item/updatesort")]
- public async Task UpdateSortAsync(Guid id, Guid targetid)
- {
- await _manager.UpdateSortAsync(id, targetid);
- }
+
///
/// 修改排序 置顶，置底
diff --git a/src/Shentun.Peis.Domain/CardRegisters/CardRegisterManager.cs b/src/Shentun.Peis.Domain/CardRegisters/CardRegisterManager.cs
index ef02a57..a34aab1 100644
--- a/src/Shentun.Peis.Domain/CardRegisters/CardRegisterManager.cs
+++ b/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);
}
}
}
diff --git a/src/Shentun.Peis.Domain/DataHelper.cs b/src/Shentun.Peis.Domain/DataHelper.cs
index d94cbe2..72037eb 100644
--- a/src/Shentun.Peis.Domain/DataHelper.cs
+++ b/src/Shentun.Peis.Domain/DataHelper.cs
@@ -397,16 +397,23 @@ namespace Shentun.Peis
///
/// 需要验证的值
/// 字段名称
+ /// 默认false(true 验证为Y跟N false 不验证)
/// 异常提示后缀
///
- 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},是无效值");
+ }
}
+
///
/// 数据检查 整型
///
diff --git a/src/Shentun.Peis.Domain/ItemResultTemplates/ItemResultTemplateManager.cs b/src/Shentun.Peis.Domain/ItemResultTemplates/ItemResultTemplateManager.cs
index a93e513..4be2a4f 100644
--- a/src/Shentun.Peis.Domain/ItemResultTemplates/ItemResultTemplateManager.cs
+++ b/src/Shentun.Peis.Domain/ItemResultTemplates/ItemResultTemplateManager.cs
@@ -68,17 +68,6 @@ namespace Shentun.Peis.ItemResultTemplates
}
-
- ///
- /// 修改排序 相邻之间
- ///
- /// 需要修改的ID
- /// 目标ID
- public async Task UpdateSortAsync(Guid id, Guid targetid)
- {
- await EntityHelper.UpdateSort(_repository, id, targetid);
- }
-
///
/// 修改排序 置顶，置底
///
diff --git a/src/Shentun.Peis.Domain/ItemTypes/ItemTypeManager.cs b/src/Shentun.Peis.Domain/ItemTypes/ItemTypeManager.cs
index 24a74fc..31650c9 100644
--- a/src/Shentun.Peis.Domain/ItemTypes/ItemTypeManager.cs
+++ b/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
///
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, "体检报告类别");
-
+
}
///
diff --git a/src/Shentun.Peis.Domain/Items/ItemManager.cs b/src/Shentun.Peis.Domain/Items/ItemManager.cs
index 91df3ce..9b86626 100644
--- a/src/Shentun.Peis.Domain/Items/ItemManager.cs
+++ b/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(_repository, entity.DisplayName);
return new Item
{
DisplayName = entity.DisplayName,
SimpleCode = LanguageConverter.GetPYSimpleCode(entity.DisplayName),
DisplayOrder = await EntityHelper.CreateMaxDisplayOrder- (_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(_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);
+ }
+
+
///
/// 更新参考范围类型
@@ -151,15 +166,7 @@ namespace Shentun.Peis.Items
- ///
- /// 修改排序 相邻之间
- ///
- /// 需要修改的ID
- /// 目标ID
- public async Task UpdateSortAsync(Guid id, Guid targetid)
- {
- await EntityHelper.UpdateSort(_repository, id, targetid);
- }
+
///
/// 修改排序 置顶，置底