diff --git a/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs
index 1a9b052a..b4566e22 100644
--- a/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs
@@ -160,7 +160,7 @@ namespace Shentun.Peis.Asbitems
///
/// 是否启用危急值函数 Y N
///
- public char IsCriticalValueFunction { get; set; } = 'N';
+ public char IsCriticalValueFunction { get; set; }
///
/// 危急值函数
@@ -171,7 +171,7 @@ namespace Shentun.Peis.Asbitems
///
/// 是否启用随访函数 Y N
///
- public char IsFollowUpFunction { get; set; } = 'N';
+ public char IsFollowUpFunction { get; set; }
///
diff --git a/src/Shentun.Peis.Application.Contracts/Items/CreateItemDto.cs b/src/Shentun.Peis.Application.Contracts/Items/CreateItemDto.cs
index a8a48a37..009c72e1 100644
--- a/src/Shentun.Peis.Application.Contracts/Items/CreateItemDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/Items/CreateItemDto.cs
@@ -91,5 +91,27 @@ namespace Shentun.Peis.Items
///
public Guid? DeviceTypeId { get; set; }
+ ///
+ /// 是否启用危急值函数 Y N
+ ///
+ public char IsCriticalValueFunction { get; set; } = 'N';
+
+ ///
+ /// 危急值函数
+ ///
+ public string CriticalValueFunction { get; set; }
+
+
+ ///
+ /// 是否启用随访函数 Y N
+ ///
+ public char IsFollowUpFunction { get; set; } = 'N';
+
+
+ ///
+ /// 随访函数
+ ///
+ public string FollowUpFunction { get; set; }
+
}
}
diff --git a/src/Shentun.Peis.Application.Contracts/Items/ItemDto.cs b/src/Shentun.Peis.Application.Contracts/Items/ItemDto.cs
index 2f4c63d4..5a6ba83d 100644
--- a/src/Shentun.Peis.Application.Contracts/Items/ItemDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/Items/ItemDto.cs
@@ -94,5 +94,27 @@ namespace Shentun.Peis.Items
/// 仪器类别
///
public Guid? DeviceTypeId { get; set; }
+
+ ///
+ /// 是否启用危急值函数 Y N
+ ///
+ public char IsCriticalValueFunction { get; set; }
+
+ ///
+ /// 危急值函数
+ ///
+ public string CriticalValueFunction { get; set; }
+
+
+ ///
+ /// 是否启用随访函数 Y N
+ ///
+ public char IsFollowUpFunction { get; set; }
+
+
+ ///
+ /// 随访函数
+ ///
+ public string FollowUpFunction { get; set; }
}
}
diff --git a/src/Shentun.Peis.Application.Contracts/Items/UpdateItemDto.cs b/src/Shentun.Peis.Application.Contracts/Items/UpdateItemDto.cs
index 342033d3..44a4b5b5 100644
--- a/src/Shentun.Peis.Application.Contracts/Items/UpdateItemDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/Items/UpdateItemDto.cs
@@ -88,5 +88,28 @@ namespace Shentun.Peis.Items
/// 仪器类别
///
public Guid? DeviceTypeId { get; set; }
+
+ ///
+ /// 是否启用危急值函数 Y N
+ ///
+ public char IsCriticalValueFunction { get; set; } = 'N';
+
+ ///
+ /// 危急值函数
+ ///
+ public string CriticalValueFunction { get; set; }
+
+
+ ///
+ /// 是否启用随访函数 Y N
+ ///
+ public char IsFollowUpFunction { get; set; } = 'N';
+
+
+ ///
+ /// 随访函数
+ ///
+ public string FollowUpFunction { get; set; }
+
}
}
diff --git a/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs b/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs
index 1c929df9..73714beb 100644
--- a/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs
+++ b/src/Shentun.Peis.Application/Asbitems/AsbitemAppService.cs
@@ -146,6 +146,11 @@ namespace Shentun.Peis.Asbitems
DiseaseScreeningTypeId = s.a.DiseaseScreeningTypeId,
Warn = s.a.Warn,
ForPregnantFlag = s.a.ForPregnantFlag,
+ CriticalValueFunction = s.a.CriticalValueFunction,
+ FollowUpFunction = s.a.FollowUpFunction,
+ IsCriticalValueFunction = s.a.IsCriticalValueFunction,
+ IsFollowUpFunction = s.a.IsFollowUpFunction,
+ IsPrivacy = s.a.IsPrivacy,
//IsDisablePregnancy = s.a.IsDisablePregnancy,
//IsDisablePreparePregnancy = s.a.IsDisablePreparePregnancy,
CreatorName = s.ab != null ? s.ab.Surname : "",
diff --git a/src/Shentun.Peis.Application/Items/ItemAppService.cs b/src/Shentun.Peis.Application/Items/ItemAppService.cs
index 3660cf52..9fae89fd 100644
--- a/src/Shentun.Peis.Application/Items/ItemAppService.cs
+++ b/src/Shentun.Peis.Application/Items/ItemAppService.cs
@@ -113,6 +113,10 @@ namespace Shentun.Peis.Items
LineModeFlag = s.LineModeFlag,
DiagnosisFunction = s.DiagnosisFunction,
DeviceTypeId = s.DeviceTypeId,
+ CriticalValueFunction = s.CriticalValueFunction,
+ FollowUpFunction = s.FollowUpFunction,
+ IsCriticalValueFunction = s.IsCriticalValueFunction,
+ IsFollowUpFunction = s.IsFollowUpFunction,
CreatorName = _cacheService.GetSurnameAsync(s.CreatorId).Result,
LastModifierName = _cacheService.GetSurnameAsync(s.LastModifierId).Result
}).OrderBy(o => o.DisplayOrder).ToList();
@@ -162,6 +166,10 @@ namespace Shentun.Peis.Items
LineModeFlag = s.LineModeFlag,
DiagnosisFunction = s.DiagnosisFunction,
DeviceTypeId = s.DeviceTypeId,
+ CriticalValueFunction = s.CriticalValueFunction,
+ FollowUpFunction = s.FollowUpFunction,
+ IsFollowUpFunction = s.IsFollowUpFunction,
+ IsCriticalValueFunction = s.IsCriticalValueFunction,
CreatorName = _cacheService.GetSurnameAsync(s.CreatorId).Result,
LastModifierName = _cacheService.GetSurnameAsync(s.LastModifierId).Result
}).OrderBy(o => o.DisplayOrder).ToList();
diff --git a/src/Shentun.Peis.Domain/Items/ItemManager.cs b/src/Shentun.Peis.Domain/Items/ItemManager.cs
index 064edb92..2568c887 100644
--- a/src/Shentun.Peis.Domain/Items/ItemManager.cs
+++ b/src/Shentun.Peis.Domain/Items/ItemManager.cs
@@ -95,8 +95,11 @@ namespace Shentun.Peis.Items
ResultTemplateTypeFlag = entity.ResultTemplateTypeFlag,
UnitId = entity.UnitId,
LineModeFlag = entity.LineModeFlag,
- DeviceTypeId = entity.DeviceTypeId
-
+ DeviceTypeId = entity.DeviceTypeId,
+ IsCriticalValueFunction = entity.IsCriticalValueFunction,
+ IsFollowUpFunction = entity.IsFollowUpFunction,
+ FollowUpFunction = entity.FollowUpFunction,
+ CriticalValueFunction = entity.CriticalValueFunction
};
}
///
@@ -144,6 +147,10 @@ namespace Shentun.Peis.Items
targetEntity.UnitId = sourceEntity.UnitId;
targetEntity.LineModeFlag = sourceEntity.LineModeFlag;
targetEntity.DeviceTypeId = sourceEntity.DeviceTypeId;
+ targetEntity.IsCriticalValueFunction = sourceEntity.IsCriticalValueFunction;
+ targetEntity.IsFollowUpFunction = sourceEntity.IsFollowUpFunction;
+ targetEntity.CriticalValueFunction = sourceEntity.CriticalValueFunction;
+ targetEntity.FollowUpFunction = sourceEntity.FollowUpFunction;
}
@@ -165,6 +172,8 @@ namespace Shentun.Peis.Items
{
throw new ArgumentException($"参考范围类别参数为:{entity.ReferenceRangeTypeFlag},是无效值,只能为'{ItemReferenceRangeTypeFlag.None}','{ItemReferenceRangeTypeFlag.Number}','{ItemReferenceRangeTypeFlag.Character}','{ItemReferenceRangeTypeFlag.SexHormone}'");
}
+ DataHelper.CheckCharIsYOrN(entity.IsCriticalValueFunction, "是否启用危急值函数");
+ DataHelper.CheckCharIsYOrN(entity.IsFollowUpFunction, "是否启用随访函数");
}