危急值

src/Shentun.Peis.Application.Contracts/RegisterCheckItems/RegisterCheckItemOrItemOrItemResultTemplateDto.cs

@@ -48,14 +48,83 @@ namespace Shentun.Peis.RegisterCheckItems
         /// 参考范围类别 0-无参考范围，1-数字型，2-字符型，3-性激素
         /// </summary>
         public char ReferenceRangeTypeFlag { get; set; }
+
+
+        /// <summary>
+        /// 危急值
+        /// </summary>
+        public string CriticalValue { get; set; }
+
         /// <summary>
         /// 危急值范围
         /// </summary>
-        public string? CriticalRangeValue { get; set; }
+        public string CriticalRangeValue { get; set; }
         /// <summary>
-        /// 危急值
+        /// 危急值标志
+        /// </summary>
+        public char? IsCriticalValue { get; set; }
+
+        /// <summary>
+        /// 危急值处理内容
+        /// </summary>
+        public string? CriticalValueContent { get; set; }
+
+        /// <summary>
+        /// 危急值创建者ID
+        /// </summary>
+        public Guid? CriticalValueCreatorId { get; set; }
+
+        /// <summary>
+        /// 危急值创建日期
+        /// </summary>
+        public string CriticalValueCreationTime { get; set; }
+
+        /// <summary>
+        /// 危急值创建短信完成   Y-N，预留字段，暂时不用
+        /// </summary>
+        public char? IsCriticalValueSmsComplete { get; set; }
+
+
+        /// <summary>
+        /// 危急值创建电话随访完成   
         /// </summary>
-        public string? CriticalValue { get; set; }
+        public char? IsCriticalValuePhoneComplete { get; set; }
+
+        /// <summary>
+        /// 危急值电话随访人员ID  
+        /// </summary>
+        public Guid? CriticalValuePhoneCreatorId { get; set; }
+
+
+        /// <summary>
+        /// 危急值是否审核   Y-N
+        /// </summary>
+        public char? IsCriticalValueAudit { get; set; }
+
+
+        /// <summary>
+        /// 该项目要否要复查   Y-N
+        /// </summary>
+        public char? IsReview { get; set; }
+
+
+        /// <summary>
+        /// 随访标志  0-无，1-需要创建随访，2-已经创建随访
+        /// </summary>
+        public char? FollowUpFlag { get; set; }
+
+
+        /// <summary>
+        /// 随访创建时间   
+        /// </summary>
+        public string FollowUpCreationTime { get; set; }
+
+        /// <summary>
+        /// 随访创建者ID  
+        /// </summary>
+        public Guid? FollowUpCreatorId { get; set; }
+
+
         /// <summary>
         /// 报告单提示
         /// </summary>

src/Shentun.Peis.Application.Contracts/RegisterChecks/RegisterCheckDto.cs

@@ -28,34 +28,109 @@ namespace Shentun.Peis.RegisterChecks
         /// 检查申请单打印次数
         /// </summary>
         public short CheckRequestPrintTimes { get; set; }
+        ///// <summary>
+        ///// 危急值
+        ///// </summary>
+        //public string? CriticalValue { get; set; }
+        ///// <summary>
+        ///// 危急值标志
+        ///// </summary>
+        //public char? CriticalValueFlag { get; set; }
+        ///// <summary>
+        ///// 危急值处理内容
+        ///// </summary>
+        //public string? CriticalValueProcessContent { get; set; }
+        ///// <summary>
+        ///// 危急值处理标志
+        ///// </summary>
+        //public char? CriticalValueProcessFlag { get; set; }
+        ///// <summary>
+        ///// 危急值处理医生
+        ///// </summary>
+        //public string? CriticalValueProcessDoctor { get; set; }
+        ///// <summary>
+        ///// 危急值处理日期
+        ///// </summary>
+        //public string? CriticalValueProcessDate { get; set; }
+        ///// <summary>
+        ///// 危急值创建日期
+        ///// </summary>
+        //public string? CriticalValueCreateDate { get; set; }
+
         /// <summary>
         /// 危急值
         /// </summary>
-        public string? CriticalValue { get; set; }
+        public string CriticalValue { get; set; }
+
+        /// <summary>
+        /// 危急值范围
+        /// </summary>
+        public string CriticalRangeValue { get; set; }
         /// <summary>
         /// 危急值标志
         /// </summary>
-        public char? CriticalValueFlag { get; set; }
+        public char? IsCriticalValue { get; set; }
+
         /// <summary>
         /// 危急值处理内容
         /// </summary>
-        public string? CriticalValueProcessContent { get; set; }
+        public string? CriticalValueContent { get; set; }
+
         /// <summary>
-        /// 危急值处理标志
+        /// 危急值创建者ID
         /// </summary>
-        public char? CriticalValueProcessFlag { get; set; }
+        public Guid? CriticalValueCreatorId { get; set; }
+
         /// <summary>
-        /// 危急值处理医生
+        /// 危急值创建日期
         /// </summary>
-        public string? CriticalValueProcessDoctor { get; set; }
+        public string CriticalValueCreationTime { get; set; }
+
         /// <summary>
-        /// 危急值处理日期
+        /// 危急值创建短信完成   Y-N，预留字段，暂时不用
         /// </summary>
-        public string? CriticalValueProcessDate { get; set; }
+        public char? IsCriticalValueSmsComplete { get; set; }
+
+
         /// <summary>
-        /// 危急值创建日期
+        /// 危急值创建电话随访完成   
+        /// </summary>
+        public char? IsCriticalValuePhoneComplete { get; set; }
+
+        /// <summary>
+        /// 危急值电话随访人员ID  
+        /// </summary>
+        public Guid? CriticalValuePhoneCreatorId { get; set; }
+
+
+        /// <summary>
+        /// 危急值是否审核   Y-N
+        /// </summary>
+        public char? IsCriticalValueAudit { get; set; }
+
+
+        /// <summary>
+        /// 该项目要否要复查   Y-N
         /// </summary>
-        public string? CriticalValueCreateDate { get; set; }
+        public char? IsReview { get; set; }
+
+
+        /// <summary>
+        /// 随访标志  0-无，1-需要创建随访，2-已经创建随访
+        /// </summary>
+        public char? FollowUpFlag { get; set; }
+
+
+        /// <summary>
+        /// 随访创建时间   
+        /// </summary>
+        public string FollowUpCreationTime { get; set; }
+
+        /// <summary>
+        /// 随访创建者ID  
+        /// </summary>
+        public Guid? FollowUpCreatorId { get; set; }
+
         /// <summary>
         /// 检查医生ID
         /// </summary>

src/Shentun.Peis.Application/RegisterCheckItems/RegisterCheckItemAppService.cs

@@ -175,7 +175,19 @@ namespace Shentun.Peis.RegisterCheckItems
                 LastModifierId = s.LastModifierId,
                 CreatorName = _cacheService.GetSurnameAsync(s.CreatorId).Result,
                 LastModifierName = _cacheService.GetSurnameAsync(s.LastModifierId).Result,
-                InputCheck = s.Item.InputCheck
+                InputCheck = s.Item.InputCheck,
+                CriticalValueContent = s.CriticalValueContent,
+                CriticalValueCreationTime = DataHelper.ConversionDateToString(s.CriticalValueCreationTime),
+                CriticalValueCreatorId = s.CriticalValueCreatorId,
+                CriticalValuePhoneCreatorId = s.CriticalValuePhoneCreatorId,
+                FollowUpCreationTime = DataHelper.ConversionDateToString(s.FollowUpCreationTime),
+                FollowUpCreatorId = s.FollowUpCreatorId,
+                FollowUpFlag = s.FollowUpFlag,
+                IsCriticalValue = s.IsCriticalValue,
+                IsCriticalValueAudit = s.IsCriticalValueAudit,
+                IsCriticalValuePhoneComplete = s.IsCriticalValuePhoneComplete,
+                IsCriticalValueSmsComplete = s.IsCriticalValueSmsComplete,
+                IsReview = s.IsReview
             }).ToList();
 
             return entdto;
@@ -208,6 +220,7 @@ namespace Shentun.Peis.RegisterCheckItems
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("api/app/registercheckitem/updateregistercheckitemmany")]
+        [RemoteService(false)]
         public async Task<List<RegisterCheckItemDto>> UpdateRegisterCheckItemManyAsync(List<UpdateRegisterCheckItemManyDto> input)
         {
             throw new Exception("禁止");

src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs

@@ -125,8 +125,8 @@ namespace Shentun.Peis.RegisterChecks
                 CreatorId = registerCheckEntity.CreatorId,
                 CriticalValue = registerCheckEntity.CriticalRangeValue,
                 //CriticalValueCreateDate = DataHelper.ConversionDateToString(registerCheckEntity.CriticalValueCreateDate),
-                CriticalValueFlag = registerCheckEntity.IsCriticalValue,
-                CriticalValueProcessContent = registerCheckEntity.CriticalValueContent,
+                //CriticalValueFlag = registerCheckEntity.IsCriticalValue,
+                //CriticalValueProcessContent = registerCheckEntity.CriticalValueContent,
                 //CriticalValueProcessDate = DataHelper.ConversionDateToString(registerCheckEntity.CriticalValueProcessDate),
                 //CriticalValueProcessDoctor = registerCheckEntity.CriticalValueProcessDoctor,
                 //CriticalValueProcessFlag = registerCheckEntity.CriticalValueProcessFlag,
@@ -142,7 +142,20 @@ namespace Shentun.Peis.RegisterChecks
                 AsbitemName = string.Join(",", registerCheckEntity.RegisterCheckAsbitems.Select(rs => rs.Asbitem.DisplayName).ToList()),
                 IsPacsCheck = registerCheckEntity.IsPacsCheck,
                 PacsUploadDate = DataHelper.ConversionDateToString(registerCheckEntity.PacsUploadDate),
-                PacsCheckDate = DataHelper.ConversionDateToString(registerCheckEntity.PacsCheckDate)
+                PacsCheckDate = DataHelper.ConversionDateToString(registerCheckEntity.PacsCheckDate),
+                CriticalValueContent = registerCheckEntity.CriticalValueContent,
+                CriticalValueCreationTime = DataHelper.ConversionDateToString(registerCheckEntity.CriticalValueCreationTime),
+                CriticalValueCreatorId = registerCheckEntity.CriticalValueCreatorId,
+                CriticalValuePhoneCreatorId = registerCheckEntity.CriticalValuePhoneCreatorId,
+                FollowUpCreationTime = DataHelper.ConversionDateToString(registerCheckEntity.FollowUpCreationTime),
+                FollowUpCreatorId = registerCheckEntity.FollowUpCreatorId,
+                FollowUpFlag = registerCheckEntity.FollowUpFlag,
+                IsCriticalValue = registerCheckEntity.IsCriticalValue,
+                IsCriticalValueAudit = registerCheckEntity.IsCriticalValueAudit,
+                IsCriticalValuePhoneComplete = registerCheckEntity.IsCriticalValuePhoneComplete,
+                IsCriticalValueSmsComplete = registerCheckEntity.IsCriticalValueSmsComplete,
+                IsReview = registerCheckEntity.IsReview, 
+                CriticalRangeValue = registerCheckEntity.CriticalRangeValue
             };
 
             return registerCheckDto;