项目增加危急值函数

src/Shentun.Peis.Application.Contracts/Asbitems/AsbitemDto.cs

@@ -160,7 +160,7 @@ namespace Shentun.Peis.Asbitems
         /// <summary>
         /// 是否启用危急值函数  Y  N
         /// </summary>
-        public char IsCriticalValueFunction { get; set; } = 'N';
+        public char IsCriticalValueFunction { get; set; }
 
         /// <summary>
         /// 危急值函数 
@@ -171,7 +171,7 @@ namespace Shentun.Peis.Asbitems
         /// <summary>
         /// 是否启用随访函数   Y  N
         /// </summary>
-        public char IsFollowUpFunction { get; set; } = 'N';
+        public char IsFollowUpFunction { get; set; }
 
 
         /// <summary>

src/Shentun.Peis.Application.Contracts/Items/CreateItemDto.cs

@@ -91,5 +91,27 @@ namespace Shentun.Peis.Items
         /// </summary>
         public Guid? DeviceTypeId { get; set; }
 
+        /// <summary>
+        /// 是否启用危急值函数  Y  N
+        /// </summary>
+        public char IsCriticalValueFunction { get; set; } = 'N';
+
+        /// <summary>
+        /// 危急值函数 
+        /// </summary>
+        public string CriticalValueFunction { get; set; }
+
+
+        /// <summary>
+        /// 是否启用随访函数   Y  N
+        /// </summary>
+        public char IsFollowUpFunction { get; set; } = 'N';
+
+
+        /// <summary>
+        /// 随访函数 
+        /// </summary>
+        public string FollowUpFunction { get; set; }
+
     }
 }

src/Shentun.Peis.Application.Contracts/Items/ItemDto.cs

@@ -94,5 +94,27 @@ namespace Shentun.Peis.Items
         /// 仪器类别
         /// </summary>
         public Guid? DeviceTypeId { get; set; }
+
+        /// <summary>
+        /// 是否启用危急值函数  Y  N
+        /// </summary>
+        public char IsCriticalValueFunction { get; set; } 
+
+        /// <summary>
+        /// 危急值函数 
+        /// </summary>
+        public string CriticalValueFunction { get; set; }
+
+
+        /// <summary>
+        /// 是否启用随访函数   Y  N
+        /// </summary>
+        public char IsFollowUpFunction { get; set; } 
+
+
+        /// <summary>
+        /// 随访函数 
+        /// </summary>
+        public string FollowUpFunction { get; set; }
     }
 }

src/Shentun.Peis.Application.Contracts/Items/UpdateItemDto.cs

@@ -88,5 +88,28 @@ namespace Shentun.Peis.Items
         /// 仪器类别
         /// </summary>
         public Guid? DeviceTypeId { get; set; }
+
+        /// <summary>
+        /// 是否启用危急值函数  Y  N
+        /// </summary>
+        public char IsCriticalValueFunction { get; set; } = 'N';
+
+        /// <summary>
+        /// 危急值函数 
+        /// </summary>
+        public string CriticalValueFunction { get; set; }
+
+
+        /// <summary>
+        /// 是否启用随访函数   Y  N
+        /// </summary>
+        public char IsFollowUpFunction { get; set; } = 'N';
+
+
+        /// <summary>
+        /// 随访函数 
+        /// </summary>
+        public string FollowUpFunction { get; set; }
+
     }
 }

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 : "",

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();

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
             };
         }
         /// <summary>
@@ -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, "是否启用随访函数");
         }