From e7c73f92021cc96f350a9954cdce976e32c8d446 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Tue, 8 Oct 2024 11:32:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E6=80=A5=E5=80=BC=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReferenceRanges/CreateReferenceRangeDto.cs      | 13 ++++++++++++-
 .../ReferenceRanges/ReferenceRangeDto.cs            | 11 ++++++++++-
 .../ReferenceRanges/ReferenceRangeManager.cs        |  6 ++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/Shentun.Peis.Application.Contracts/ReferenceRanges/CreateReferenceRangeDto.cs b/src/Shentun.Peis.Application.Contracts/ReferenceRanges/CreateReferenceRangeDto.cs
index 6f2b5eb..a7253e8 100644
--- a/src/Shentun.Peis.Application.Contracts/ReferenceRanges/CreateReferenceRangeDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/ReferenceRanges/CreateReferenceRangeDto.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
 using System.Text;
 
 namespace Shentun.Peis.ReferenceRanges
@@ -21,7 +23,16 @@ namespace Shentun.Peis.ReferenceRanges
 
         public string ReferenceRangeValue { get; set; }
 
-        public string? CriticalRangeValue { get; set; }
+        /// <summary>
+        /// 危急范围值
+        /// </summary>
+        public string CriticalRangeValue { get; set; }
+
+
+        /// <summary>
+        /// 随访范围值
+        /// </summary>
+        public string FollowUpRangeValue { get; set; }
 
         /// <summary>
         /// 偏低诊断
diff --git a/src/Shentun.Peis.Application.Contracts/ReferenceRanges/ReferenceRangeDto.cs b/src/Shentun.Peis.Application.Contracts/ReferenceRanges/ReferenceRangeDto.cs
index d808c81..0c99952 100644
--- a/src/Shentun.Peis.Application.Contracts/ReferenceRanges/ReferenceRangeDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/ReferenceRanges/ReferenceRangeDto.cs
@@ -24,7 +24,16 @@ namespace Shentun.Peis.ReferenceRanges
 
         public string ReferenceRangeValue { get; set; }
 
-        public string? CriticalRangeValue { get; set; }
+        /// <summary>
+        /// 危急范围值
+        /// </summary>
+        public string CriticalRangeValue { get; set; }
+
+
+        /// <summary>
+        /// 随访范围值
+        /// </summary>
+        public string FollowUpRangeValue { get; set; }
 
         /// <summary>
         /// 偏低诊断
diff --git a/src/Shentun.Peis.Domain/ReferenceRanges/ReferenceRangeManager.cs b/src/Shentun.Peis.Domain/ReferenceRanges/ReferenceRangeManager.cs
index d4d624e..c05b0bb 100644
--- a/src/Shentun.Peis.Domain/ReferenceRanges/ReferenceRangeManager.cs
+++ b/src/Shentun.Peis.Domain/ReferenceRanges/ReferenceRangeManager.cs
@@ -52,7 +52,8 @@ namespace Shentun.Peis.ReferenceRanges
                 LowerDiagnosisId = entity.LowerDiagnosisId,
                 ReferenceRangeValue = entity.ReferenceRangeValue,
                 UpperDiagnosisId = entity.UpperDiagnosisId,
-                ReferenceRangeTypeFlag = entity.ReferenceRangeTypeFlag
+                ReferenceRangeTypeFlag = entity.ReferenceRangeTypeFlag,
+                FollowUpRangeValue = entity.FollowUpRangeValue
             };
         }
 
@@ -75,6 +76,7 @@ namespace Shentun.Peis.ReferenceRanges
             targetEntity.AgeLowerLimit = sourceEntity.AgeLowerLimit;
             targetEntity.AgeUpperLimit = sourceEntity.AgeUpperLimit;
             targetEntity.CriticalRangeValue = sourceEntity.CriticalRangeValue;
+            targetEntity.FollowUpRangeValue = sourceEntity.FollowUpRangeValue;
             targetEntity.ForSexId = sourceEntity.ForSexId;
             targetEntity.ItemId = sourceEntity.ItemId;
             targetEntity.LowerDiagnosisId = sourceEntity.LowerDiagnosisId;
@@ -258,7 +260,7 @@ namespace Shentun.Peis.ReferenceRanges
 
         public bool IsNumberReferenceRange(string referenceRangeValue)
         {
-            if(string.IsNullOrWhiteSpace(referenceRangeValue))
+            if (string.IsNullOrWhiteSpace(referenceRangeValue))
             {
                 new UserFriendlyException("调用IsNumberReferenceRange时参考范围不能为空");
             }