From 093c93a32f26a36f94e9cc60638c51dc5802736f Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Tue, 8 Oct 2024 14:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E6=80=A5=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rCheckItemOrItemOrItemResultTemplateDto.cs | 75 +++++++++++++- .../RegisterChecks/RegisterCheckDto.cs | 97 ++++++++++++++++--- .../RegisterCheckItemAppService.cs | 15 ++- .../RegisterChecks/RegisterCheckAppService.cs | 19 +++- 4 files changed, 188 insertions(+), 18 deletions(-) diff --git a/src/Shentun.Peis.Application.Contracts/RegisterCheckItems/RegisterCheckItemOrItemOrItemResultTemplateDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckItems/RegisterCheckItemOrItemOrItemResultTemplateDto.cs index 6239278..e519d0f 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterCheckItems/RegisterCheckItemOrItemOrItemResultTemplateDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckItems/RegisterCheckItemOrItemOrItemResultTemplateDto.cs @@ -48,14 +48,83 @@ namespace Shentun.Peis.RegisterCheckItems /// 参考范围类别 0-无参考范围，1-数字型，2-字符型，3-性激素 /// public char ReferenceRangeTypeFlag { get; set; } + + + /// + /// 危急值 + /// + public string CriticalValue { get; set; } + /// /// 危急值范围 /// - public string? CriticalRangeValue { get; set; } + public string CriticalRangeValue { get; set; } /// - /// 危急值 + /// 危急值标志 + /// + public char? IsCriticalValue { get; set; } + + /// + /// 危急值处理内容 + /// + public string? CriticalValueContent { get; set; } + + /// + /// 危急值创建者ID + /// + public Guid? CriticalValueCreatorId { get; set; } + + /// + /// 危急值创建日期 + /// + public string CriticalValueCreationTime { get; set; } + + /// + /// 危急值创建短信完成 Y-N，预留字段，暂时不用 + /// + public char? IsCriticalValueSmsComplete { get; set; } + + + /// + /// 危急值创建电话随访完成 /// - public string? CriticalValue { get; set; } + public char? IsCriticalValuePhoneComplete { get; set; } + + /// + /// 危急值电话随访人员ID + /// + public Guid? CriticalValuePhoneCreatorId { get; set; } + + + /// + /// 危急值是否审核 Y-N + /// + public char? IsCriticalValueAudit { get; set; } + + + /// + /// 该项目要否要复查 Y-N + /// + public char? IsReview { get; set; } + + + /// + /// 随访标志 0-无，1-需要创建随访，2-已经创建随访 + /// + public char? FollowUpFlag { get; set; } + + + /// + /// 随访创建时间 + /// + public string FollowUpCreationTime { get; set; } + + /// + /// 随访创建者ID + /// + public Guid? FollowUpCreatorId { get; set; } + + /// /// 报告单提示 /// diff --git a/src/Shentun.Peis.Application.Contracts/RegisterChecks/RegisterCheckDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterChecks/RegisterCheckDto.cs index fbb94a0..b8d1f10 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterChecks/RegisterCheckDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterChecks/RegisterCheckDto.cs @@ -28,34 +28,109 @@ namespace Shentun.Peis.RegisterChecks /// 检查申请单打印次数 /// public short CheckRequestPrintTimes { get; set; } + ///// + ///// 危急值 + ///// + //public string? CriticalValue { get; set; } + ///// + ///// 危急值标志 + ///// + //public char? CriticalValueFlag { get; set; } + ///// + ///// 危急值处理内容 + ///// + //public string? CriticalValueProcessContent { get; set; } + ///// + ///// 危急值处理标志 + ///// + //public char? CriticalValueProcessFlag { get; set; } + ///// + ///// 危急值处理医生 + ///// + //public string? CriticalValueProcessDoctor { get; set; } + ///// + ///// 危急值处理日期 + ///// + //public string? CriticalValueProcessDate { get; set; } + ///// + ///// 危急值创建日期 + ///// + //public string? CriticalValueCreateDate { get; set; } + /// /// 危急值 /// - public string? CriticalValue { get; set; } + public string CriticalValue { get; set; } + + /// + /// 危急值范围 + /// + public string CriticalRangeValue { get; set; } /// /// 危急值标志 /// - public char? CriticalValueFlag { get; set; } + public char? IsCriticalValue { get; set; } + /// /// 危急值处理内容 /// - public string? CriticalValueProcessContent { get; set; } + public string? CriticalValueContent { get; set; } + /// - /// 危急值处理标志 + /// 危急值创建者ID /// - public char? CriticalValueProcessFlag { get; set; } + public Guid? CriticalValueCreatorId { get; set; } + /// - /// 危急值处理医生 + /// 危急值创建日期 /// - public string? CriticalValueProcessDoctor { get; set; } + public string CriticalValueCreationTime { get; set; } + /// - /// 危急值处理日期 + /// 危急值创建短信完成 Y-N，预留字段，暂时不用 /// - public string? CriticalValueProcessDate { get; set; } + public char? IsCriticalValueSmsComplete { get; set; } + + /// - /// 危急值创建日期 + /// 危急值创建电话随访完成 + /// + public char? IsCriticalValuePhoneComplete { get; set; } + + /// + /// 危急值电话随访人员ID + /// + public Guid? CriticalValuePhoneCreatorId { get; set; } + + + /// + /// 危急值是否审核 Y-N + /// + public char? IsCriticalValueAudit { get; set; } + + + /// + /// 该项目要否要复查 Y-N /// - public string? CriticalValueCreateDate { get; set; } + public char? IsReview { get; set; } + + + /// + /// 随访标志 0-无，1-需要创建随访，2-已经创建随访 + /// + public char? FollowUpFlag { get; set; } + + + /// + /// 随访创建时间 + /// + public string FollowUpCreationTime { get; set; } + + /// + /// 随访创建者ID + /// + public Guid? FollowUpCreatorId { get; set; } + /// /// 检查医生ID /// diff --git a/src/Shentun.Peis.Application/RegisterCheckItems/RegisterCheckItemAppService.cs b/src/Shentun.Peis.Application/RegisterCheckItems/RegisterCheckItemAppService.cs index d32e745..9e0c306 100644 --- a/src/Shentun.Peis.Application/RegisterCheckItems/RegisterCheckItemAppService.cs +++ b/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 /// /// [HttpPost("api/app/registercheckitem/updateregistercheckitemmany")] + [RemoteService(false)] public async Task> UpdateRegisterCheckItemManyAsync(List input) { throw new Exception("禁止"); diff --git a/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs b/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs index 377ddf6..beb28d3 100644 --- a/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs +++ b/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;