From 475ba3ac841d61f8dd2840b970c48d26f15f340b Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Fri, 26 Jul 2024 17:22:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E8=AD=A6=E5=80=BC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BeiJingMZAKExportDataAppService.cs | 12 +- .../BaseDataHandleAppService.cs | 18 +-- .../RegisterChecks/RegisterCheckAppService.cs | 28 ++-- .../TransToWebPeisAppService.cs | 6 +- .../RegisterCheckAsbitemManager.cs | 12 +- .../RegisterCheckItems/RegisterCheckItem.cs | 90 ++++++++++++ .../RegisterChecks/RegisterCheck.cs | 128 +++++++++++++++--- .../RegisterChecks/RegisterCheckManager.cs | 26 ++-- .../RegisterChecks/RegisterCheckDbMapping.cs | 6 +- 9 files changed, 251 insertions(+), 75 deletions(-) diff --git a/src/Shentun.Peis.Application/BeiJingMZAKExportDatas/BeiJingMZAKExportDataAppService.cs b/src/Shentun.Peis.Application/BeiJingMZAKExportDatas/BeiJingMZAKExportDataAppService.cs index b56b3ac..5b9a71e 100644 --- a/src/Shentun.Peis.Application/BeiJingMZAKExportDatas/BeiJingMZAKExportDataAppService.cs +++ b/src/Shentun.Peis.Application/BeiJingMZAKExportDatas/BeiJingMZAKExportDataAppService.cs @@ -2692,10 +2692,10 @@ namespace Shentun.Peis.BeiJingMZAKExportDatas CheckRequestNo = "", CheckRequestPrintTimes = (short)1, CompleteFlag = Convert.ToChar(rowAsbitem["complete_flag"].ToString()), - CriticalValue = null, + CriticalRangeValue = null, CriticalValueCreateDate = null, - CriticalValueFlag = null, - CriticalValueProcessContent = null, + IsCriticalValue = null, + CriticalValueContent = null, CriticalValueProcessDate = null, CriticalValueProcessDoctor = null, CriticalValueProcessFlag = null, @@ -3267,10 +3267,10 @@ namespace Shentun.Peis.BeiJingMZAKExportDatas CheckRequestNo = "", CheckRequestPrintTimes = (short)1, CompleteFlag = Convert.ToChar(rowAsbitem["complete_flag"].ToString()), - CriticalValue = null, + CriticalRangeValue = null, CriticalValueCreateDate = null, - CriticalValueFlag = null, - CriticalValueProcessContent = null, + IsCriticalValue = null, + CriticalValueContent = null, CriticalValueProcessDate = null, CriticalValueProcessDoctor = null, CriticalValueProcessFlag = null, diff --git a/src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs b/src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs index 4fa5dd5..a0f61a4 100644 --- a/src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs +++ b/src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs @@ -2612,10 +2612,10 @@ namespace Shentun.Peis.DataMigrations CheckRequestNo = "", CheckRequestPrintTimes = (short)1, CompleteFlag = Convert.ToChar(rowAsbitem["complete_flag"].ToString()), - CriticalValue = null, + CriticalRangeValue = null, CriticalValueCreateDate = null, - CriticalValueFlag = null, - CriticalValueProcessContent = null, + IsCriticalValue = null, + CriticalValueContent = null, CriticalValueProcessDate = null, CriticalValueProcessDoctor = null, CriticalValueProcessFlag = null, @@ -3514,10 +3514,10 @@ namespace Shentun.Peis.DataMigrations CheckRequestNo = "", CheckRequestPrintTimes = (short)1, CompleteFlag = Convert.ToChar(rowAsbitem["complete_flag"].ToString()), - CriticalValue = null, + CriticalRangeValue = null, CriticalValueCreateDate = null, - CriticalValueFlag = null, - CriticalValueProcessContent = null, + IsCriticalValue = null, + CriticalValueContent = null, CriticalValueProcessDate = null, CriticalValueProcessDoctor = null, CriticalValueProcessFlag = null, @@ -4043,10 +4043,10 @@ namespace Shentun.Peis.DataMigrations CheckRequestNo = "", CheckRequestPrintTimes = (short)1, CompleteFlag = Convert.ToChar(row["complete_flag"].ToString()), - CriticalValue = null, + CriticalRangeValue = null, CriticalValueCreateDate = null, - CriticalValueFlag = null, - CriticalValueProcessContent = null, + IsCriticalValue = null, + CriticalValueContent = null, CriticalValueProcessDate = null, CriticalValueProcessDoctor = null, CriticalValueProcessFlag = null, diff --git a/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs b/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs index df25e78..9025c85 100644 --- a/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs +++ b/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs @@ -118,13 +118,13 @@ namespace Shentun.Peis.RegisterChecks CompleteFlag = registerCheckEntity.CompleteFlag, CreationTime = registerCheckEntity.CreationTime, CreatorId = registerCheckEntity.CreatorId, - CriticalValue = registerCheckEntity.CriticalValue, - CriticalValueCreateDate = DataHelper.ConversionDateToString(registerCheckEntity.CriticalValueCreateDate), - CriticalValueFlag = registerCheckEntity.CriticalValueFlag, - CriticalValueProcessContent = registerCheckEntity.CriticalValueProcessContent, - CriticalValueProcessDate = DataHelper.ConversionDateToString(registerCheckEntity.CriticalValueProcessDate), - CriticalValueProcessDoctor = registerCheckEntity.CriticalValueProcessDoctor, - CriticalValueProcessFlag = registerCheckEntity.CriticalValueProcessFlag, + CriticalValue = registerCheckEntity.CriticalRangeValue, + //CriticalValueCreateDate = DataHelper.ConversionDateToString(registerCheckEntity.CriticalValueCreateDate), + CriticalValueFlag = registerCheckEntity.IsCriticalValue, + CriticalValueProcessContent = registerCheckEntity.CriticalValueContent, + //CriticalValueProcessDate = DataHelper.ConversionDateToString(registerCheckEntity.CriticalValueProcessDate), + //CriticalValueProcessDoctor = registerCheckEntity.CriticalValueProcessDoctor, + //CriticalValueProcessFlag = registerCheckEntity.CriticalValueProcessFlag, Id = registerCheckEntity.Id, IsAudit = registerCheckEntity.IsAudit, IsLock = registerCheckEntity.IsLock, @@ -187,13 +187,13 @@ namespace Shentun.Peis.RegisterChecks CompleteFlag = s.CompleteFlag, CreationTime = s.CreationTime, CreatorId = s.CreatorId, - CriticalValue = s.CriticalValue, - CriticalValueCreateDate = DataHelper.ConversionDateToString(s.CriticalValueCreateDate), - CriticalValueFlag = s.CriticalValueFlag, - CriticalValueProcessContent = s.CriticalValueProcessContent, - CriticalValueProcessDate = DataHelper.ConversionDateToString(s.CriticalValueProcessDate), - CriticalValueProcessDoctor = s.CriticalValueProcessDoctor, - CriticalValueProcessFlag = s.CriticalValueProcessFlag, + CriticalValue = s.CriticalRangeValue, + //CriticalValueCreateDate = DataHelper.ConversionDateToString(s.CriticalValueCreateDate), + CriticalValueFlag = s.IsCriticalValue, + CriticalValueProcessContent = s.CriticalValueContent, + // CriticalValueProcessDate = DataHelper.ConversionDateToString(s.CriticalValueProcessDate), + // CriticalValueProcessDoctor = s.CriticalValueProcessDoctor, + // CriticalValueProcessFlag = s.CriticalValueProcessFlag, Id = s.Id, IsAudit = s.IsAudit, IsCharge = s.RegisterCheckAsbitems.Where(m => m.IsCharge == 'Y').Count() > 0 ? 'Y' : 'N', diff --git a/src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs b/src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs index 2560470..ec1cc08 100644 --- a/src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs +++ b/src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs @@ -1052,9 +1052,9 @@ namespace Shentun.Peis.TransToWebPeis new SugarParameter("check_request_no",registerCheckWithDetail.CheckRequestNo), new SugarParameter("third_info",registerCheckWithDetail.ThirdInfo), new SugarParameter("complete_flag",registerCheckWithDetail.CompleteFlag), - new SugarParameter("critical_value",registerCheckWithDetail.CriticalValue), - new SugarParameter("critical_value_flag",registerCheckWithDetail.CriticalValueFlag), - new SugarParameter("critical_value_process_content",registerCheckWithDetail.CriticalValueProcessContent), + new SugarParameter("critical_value",registerCheckWithDetail.CriticalRangeValue), + new SugarParameter("critical_value_flag",registerCheckWithDetail.IsCriticalValue), + new SugarParameter("critical_value_process_content",registerCheckWithDetail.CriticalValueContent), new SugarParameter("critical_value_process_flag",registerCheckWithDetail.CriticalValueProcessFlag), new SugarParameter("critical_value_process_doctor",registerCheckWithDetail.CriticalValueProcessDoctor), new SugarParameter("critical_value_process_date",registerCheckWithDetail.CriticalValueProcessDate), diff --git a/src/Shentun.Peis.Domain/RegisterCheckAsbitems/RegisterCheckAsbitemManager.cs b/src/Shentun.Peis.Domain/RegisterCheckAsbitems/RegisterCheckAsbitemManager.cs index 258ee78..00bb7df 100644 --- a/src/Shentun.Peis.Domain/RegisterCheckAsbitems/RegisterCheckAsbitemManager.cs +++ b/src/Shentun.Peis.Domain/RegisterCheckAsbitems/RegisterCheckAsbitemManager.cs @@ -307,8 +307,8 @@ namespace Shentun.Peis.RegisterAsbitems PatientRegisterId = patientRegister.Id, IsLock = 'N', CompleteFlag = RegisterCheckCompleteFlag.UnChecked, - CriticalValueFlag = '0', - CriticalValueProcessFlag = '0', + IsCriticalValue = '0', + //CriticalValueProcessFlag = '0', IsAudit = 'N', CheckRequestNo = await _registerCheckManager.CreateCheckRequestNo(patientRegister.MedicalCenterId) }; @@ -589,8 +589,8 @@ namespace Shentun.Peis.RegisterAsbitems PatientRegisterId = patientRegister.Id, IsLock = 'N', CompleteFlag = RegisterCheckCompleteFlag.UnChecked, - CriticalValueFlag = '0', - CriticalValueProcessFlag = '0', + IsCriticalValue = '0', + //CriticalValueProcessFlag = '0', IsAudit = 'N', CheckRequestNo = await _registerCheckManager.CreateCheckRequestNo(patientRegister.MedicalCenterId) }; @@ -1071,8 +1071,8 @@ namespace Shentun.Peis.RegisterAsbitems PatientRegisterId = patientRegister.Id, IsLock = 'N', CompleteFlag = RegisterCheckCompleteFlag.UnChecked, - CriticalValueFlag = '0', - CriticalValueProcessFlag = '0', + IsCriticalValue = '0', + //CriticalValueProcessFlag = '0', IsAudit = 'N', CheckRequestNo = await _registerCheckManager.CreateCheckRequestNo(patientRegister.MedicalCenterId) }; diff --git a/src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItem.cs b/src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItem.cs index 6677c64..a2f5661 100644 --- a/src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItem.cs +++ b/src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItem.cs @@ -54,6 +54,96 @@ namespace Shentun.Peis.Models [Column("critical_value")] [StringLength(100)] public string? CriticalValue { get; set; } + + /// + /// 危急值标志 + /// + [Column("is_critical_value")] + [MaxLength(1)] + public char? IsCriticalValue { get; set; } + /// + /// 危急值处理内容 + /// + [Column("critical_value_content")] + [StringLength(300)] + public string? CriticalValueContent { get; set; } + + /// + /// 危急值创建者ID + /// + [Column("critical_value_creator_id")] + public Guid? CriticalValueCreatorId { get; set; } + + /// + /// 危急值创建日期 + /// + [Column("critical_value_creation_time")] + public DateTime? CriticalValueCreationTime { get; set; } + + /// + /// 危急值创建短信完成 Y-N，预留字段，暂时不用 + /// + [Column("is_critical_value_sms_complete")] + [MaxLength(1)] + public char? IsCriticalValueSmsComplete { get; set; } + + /// + /// 危急值短信发送者ID 预留字段，暂时不用 + /// + [Column("critical_value_sms_creator_id")] + public Guid? CriticalValueSmsCreatorId { get; set; } + + + /// + /// 危急值创建电话随访完成 + /// + [Column("is_critical_value_phone_complete")] + [MaxLength(1)] + public char? IsCriticalValuePhoneComplete { get; set; } + + /// + /// 危急值电话随访人员ID + /// + [Column("critical_value_phone_creator_id")] + public Guid? CriticalValuePhoneCreatorId { get; set; } + + + /// + /// 危急值是否审核 Y-N + /// + [Column("is_critical_value_audit")] + [MaxLength(1)] + public char? IsCriticalValueAudit { get; set; } + + + /// + /// 该项目要否要复查 Y-N + /// + [Column("is_review")] + [MaxLength(1)] + public char? IsReview { get; set; } + + + /// + /// 随访标志 0-无，1-需要创建随访，2-已经创建随访 + /// + [Column("follow_up_flag")] + [MaxLength(1)] + public char? FollowUpFlag { get; set; } + + + /// + /// 随访创建时间 + /// + [Column("follow_up_creation_time")] + public DateTime? FollowUpCreationTime { get; set; } + + /// + /// 随访创建者ID + /// + [Column("follow_up_creator_id")] + public Guid? FollowUpCreatorId { get; set; } + /// /// 报告单提示 /// diff --git a/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs b/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs index a6c868d..a715df7 100644 --- a/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs +++ b/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs @@ -34,8 +34,8 @@ namespace Shentun.Peis.Models IsLock = 'N'; CompleteFlag = RegisterCheckCompleteFlag.UnChecked; - CriticalValueFlag = '0'; - CriticalValueProcessFlag = '0'; + IsCriticalValue = '0'; + //CriticalValueProcessFlag = '0'; IsAudit = 'N'; } /// @@ -72,46 +72,132 @@ namespace Shentun.Peis.Models /// [Column("check_request_print_times")] public short CheckRequestPrintTimes { get; set; } + + /// /// 危急值 /// [Column("critical_value")] - [StringLength(100)] + [StringLength(300)] public string? CriticalValue { get; set; } + + /// + /// 危急值范围 + /// + [Column("critical_range_value")] + [StringLength(300)] + public string? CriticalRangeValue { get; set; } /// /// 危急值标志 /// - [Column("critical_value_flag")] + [Column("is_critical_value")] [MaxLength(1)] - public char? CriticalValueFlag { get; set; } + public char? IsCriticalValue { get; set; } /// /// 危急值处理内容 /// - [Column("critical_value_process_content")] - [StringLength(100)] - public string? CriticalValueProcessContent { get; set; } + [Column("critical_value_content")] + [StringLength(300)] + public string? CriticalValueContent { get; set; } + + /// + /// 危急值创建者ID + /// + [Column("critical_value_creator_id")] + public Guid? CriticalValueCreatorId { get; set; } + + /// + /// 危急值创建日期 + /// + [Column("critical_value_creation_time")] + public DateTime? CriticalValueCreationTime { get; set; } + /// - /// 危急值处理标志 + /// 危急值创建短信完成 Y-N，预留字段，暂时不用 /// - [Column("critical_value_process_flag")] + [Column("is_critical_value_sms_complete")] [MaxLength(1)] - public char? CriticalValueProcessFlag { get; set; } + public char? IsCriticalValueSmsComplete { get; set; } + /// - /// 危急值处理医生 + /// 危急值短信发送者ID 预留字段，暂时不用 /// - [Column("critical_value_process_doctor")] - [StringLength(16)] - public string? CriticalValueProcessDoctor { get; set; } + [Column("critical_value_sms_creator_id")] + public Guid? CriticalValueSmsCreatorId { get; set; } + + /// - /// 危急值处理日期 + /// 危急值创建电话随访完成 /// - [Column("critical_value_process_date")] - public DateTime? CriticalValueProcessDate { get; set; } + [Column("is_critical_value_phone_complete")] + [MaxLength(1)] + public char? IsCriticalValuePhoneComplete { get; set; } + /// - /// 危急值创建日期 + /// 危急值电话随访人员ID + /// + [Column("critical_value_phone_creator_id")] + public Guid? CriticalValuePhoneCreatorId { get; set; } + + + /// + /// 危急值是否审核 Y-N + /// + [Column("is_critical_value_audit")] + [MaxLength(1)] + public char? IsCriticalValueAudit { get; set; } + + + /// + /// 该项目要否要复查 Y-N + /// + [Column("is_review")] + [MaxLength(1)] + public char? IsReview { get; set; } + + + /// + /// 随访标志 0-无，1-需要创建随访，2-已经创建随访 + /// + [Column("follow_up_flag")] + [MaxLength(1)] + public char? FollowUpFlag { get; set; } + + + /// + /// 随访创建时间 /// - [Column("critical_value_create_date")] - public DateTime? CriticalValueCreateDate { get; set; } + [Column("follow_up_creation_time")] + public DateTime? FollowUpCreationTime { get; set; } + + /// + /// 随访创建者ID + /// + [Column("follow_up_creator_id")] + public Guid? FollowUpCreatorId { get; set; } + + ///// + ///// 危急值处理标志 + ///// + //[Column("critical_value_process_flag")] + //[MaxLength(1)] + //public char? CriticalValueProcessFlag { get; set; } + ///// + ///// 危急值处理医生 + ///// + //[Column("critical_value_process_doctor")] + //[StringLength(16)] + //public string? CriticalValueProcessDoctor { get; set; } + ///// + ///// 危急值处理日期 + ///// + //[Column("critical_value_process_date")] + //public DateTime? CriticalValueProcessDate { get; set; } + ///// + ///// 危急值创建日期 + ///// + //[Column("critical_value_create_date")] + //public DateTime? CriticalValueCreateDate { get; set; } /// /// 检查医生(内部传ID,外部医生存名字) /// diff --git a/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheckManager.cs b/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheckManager.cs index b9ed84c..c43767b 100644 --- a/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheckManager.cs +++ b/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheckManager.cs @@ -239,19 +239,19 @@ namespace Shentun.Peis.RegisterChecks throw new UserFriendlyException("请求参数有误"); } - entity.CriticalValue = entitydto.CriticalValue; - if (entitydto.CriticalValueCreateDate == null) - entity.CriticalValueCreateDate = DateTime.Now; - else - entity.CriticalValueCreateDate = entitydto.CriticalValueCreateDate; - entity.CriticalValueProcessContent = entitydto.CriticalValueProcessContent; - if (entitydto.CriticalValueProcessDate == null) - entity.CriticalValueProcessDate = DateTime.Now; - else - entity.CriticalValueProcessDate = entitydto.CriticalValueProcessDate; - entity.CriticalValueFlag = entitydto.CriticalValueFlag; - entity.CriticalValueProcessDoctor = entitydto.CriticalValueProcessDoctor; - entity.CriticalValueProcessFlag = entitydto.CriticalValueProcessFlag; + entity.CriticalRangeValue = entitydto.CriticalRangeValue; + //if (entitydto.CriticalValueCreateDate == null) + // entity.CriticalValueCreateDate = DateTime.Now; + //else + // entity.CriticalValueCreateDate = entitydto.CriticalValueCreateDate; + //entity.CriticalValueContent = entitydto.CriticalValueContent; + //if (entitydto.CriticalValueProcessDate == null) + // entity.CriticalValueProcessDate = DateTime.Now; + //else + // entity.CriticalValueProcessDate = entitydto.CriticalValueProcessDate; + entity.IsCriticalValue = entitydto.IsCriticalValue; + //entity.CriticalValueProcessDoctor = entitydto.CriticalValueProcessDoctor; + //entity.CriticalValueProcessFlag = entitydto.CriticalValueProcessFlag; return await _registerCheckRepository.UpdateAsync(entity); } diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/RegisterChecks/RegisterCheckDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/RegisterChecks/RegisterCheckDbMapping.cs index 7460e16..f484703 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/RegisterChecks/RegisterCheckDbMapping.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/RegisterChecks/RegisterCheckDbMapping.cs @@ -20,9 +20,9 @@ namespace Shentun.Peis.DbMapping entity.Property(t => t.IsLock).HasComment("是否锁住").IsRequired().HasDefaultValueSql("'N'"); entity.Property(t => t.CompleteFlag).HasComment("完成标志").IsRequired().HasDefaultValueSql("0"); entity.Property(t => t.CheckRequestPrintTimes).HasComment("检查申请单打印次数").IsRequired().HasDefaultValueSql("0"); - entity.Property(t => t.CriticalValue).HasComment("危急值"); - entity.Property(t => t.CriticalValueFlag).HasComment("危急值标志").HasDefaultValueSql("0"); - entity.Property(t => t.CriticalValueProcessContent).HasComment("危急值处理内容"); + entity.Property(t => t.CriticalRangeValue).HasComment("危急值"); + entity.Property(t => t.IsCriticalValue).HasComment("危急值标志").HasDefaultValueSql("0"); + entity.Property(t => t.CriticalValueContent).HasComment("危急值处理内容"); entity.Property(t => t.CriticalValueProcessFlag).HasComment("危急值处理标志"); entity.Property(t => t.CriticalValueProcessDoctor).HasComment("危急值处理医生"); entity.Property(t => t.CriticalValueProcessDate).HasComment("危急值处理日期");