Browse Source

危警值数据表

master
wxd 1 year ago
parent
commit
475ba3ac84
  1. 12
      src/Shentun.Peis.Application/BeiJingMZAKExportDatas/BeiJingMZAKExportDataAppService.cs
  2. 18
      src/Shentun.Peis.Application/DataMigrations/BaseDataHandleAppService.cs
  3. 28
      src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs
  4. 6
      src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs
  5. 12
      src/Shentun.Peis.Domain/RegisterCheckAsbitems/RegisterCheckAsbitemManager.cs
  6. 90
      src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItem.cs
  7. 128
      src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs
  8. 26
      src/Shentun.Peis.Domain/RegisterChecks/RegisterCheckManager.cs
  9. 6
      src/Shentun.Peis.EntityFrameworkCore/DbMapping/RegisterChecks/RegisterCheckDbMapping.cs

12
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,

18
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,

28
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',

6
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),

12
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)
};

90
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; }
/// <summary>
/// 危急值标志
/// </summary>
[Column("is_critical_value")]
[MaxLength(1)]
public char? IsCriticalValue { get; set; }
/// <summary>
/// 危急值处理内容
/// </summary>
[Column("critical_value_content")]
[StringLength(300)]
public string? CriticalValueContent { get; set; }
/// <summary>
/// 危急值创建者ID
/// </summary>
[Column("critical_value_creator_id")]
public Guid? CriticalValueCreatorId { get; set; }
/// <summary>
/// 危急值创建日期
/// </summary>
[Column("critical_value_creation_time")]
public DateTime? CriticalValueCreationTime { get; set; }
/// <summary>
/// 危急值创建短信完成 Y-N,预留字段,暂时不用
/// </summary>
[Column("is_critical_value_sms_complete")]
[MaxLength(1)]
public char? IsCriticalValueSmsComplete { get; set; }
/// <summary>
/// 危急值短信发送者ID 预留字段,暂时不用
/// </summary>
[Column("critical_value_sms_creator_id")]
public Guid? CriticalValueSmsCreatorId { get; set; }
/// <summary>
/// 危急值创建电话随访完成
/// </summary>
[Column("is_critical_value_phone_complete")]
[MaxLength(1)]
public char? IsCriticalValuePhoneComplete { get; set; }
/// <summary>
/// 危急值电话随访人员ID
/// </summary>
[Column("critical_value_phone_creator_id")]
public Guid? CriticalValuePhoneCreatorId { get; set; }
/// <summary>
/// 危急值是否审核 Y-N
/// </summary>
[Column("is_critical_value_audit")]
[MaxLength(1)]
public char? IsCriticalValueAudit { get; set; }
/// <summary>
/// 该项目要否要复查 Y-N
/// </summary>
[Column("is_review")]
[MaxLength(1)]
public char? IsReview { get; set; }
/// <summary>
/// 随访标志 0-无,1-需要创建随访,2-已经创建随访
/// </summary>
[Column("follow_up_flag")]
[MaxLength(1)]
public char? FollowUpFlag { get; set; }
/// <summary>
/// 随访创建时间
/// </summary>
[Column("follow_up_creation_time")]
public DateTime? FollowUpCreationTime { get; set; }
/// <summary>
/// 随访创建者ID
/// </summary>
[Column("follow_up_creator_id")]
public Guid? FollowUpCreatorId { get; set; }
/// <summary>
/// 报告单提示
/// </summary>

128
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';
}
/// <summary>
@ -72,46 +72,132 @@ namespace Shentun.Peis.Models
/// </summary>
[Column("check_request_print_times")]
public short CheckRequestPrintTimes { get; set; }
/// <summary>
/// 危急值
/// </summary>
[Column("critical_value")]
[StringLength(100)]
[StringLength(300)]
public string? CriticalValue { get; set; }
/// <summary>
/// 危急值范围
/// </summary>
[Column("critical_range_value")]
[StringLength(300)]
public string? CriticalRangeValue { get; set; }
/// <summary>
/// 危急值标志
/// </summary>
[Column("critical_value_flag")]
[Column("is_critical_value")]
[MaxLength(1)]
public char? CriticalValueFlag { get; set; }
public char? IsCriticalValue { get; set; }
/// <summary>
/// 危急值处理内容
/// </summary>
[Column("critical_value_process_content")]
[StringLength(100)]
public string? CriticalValueProcessContent { get; set; }
[Column("critical_value_content")]
[StringLength(300)]
public string? CriticalValueContent { get; set; }
/// <summary>
/// 危急值创建者ID
/// </summary>
[Column("critical_value_creator_id")]
public Guid? CriticalValueCreatorId { get; set; }
/// <summary>
/// 危急值创建日期
/// </summary>
[Column("critical_value_creation_time")]
public DateTime? CriticalValueCreationTime { get; set; }
/// <summary>
/// 危急值处理标志
/// 危急值创建短信完成 Y-N,预留字段,暂时不用
/// </summary>
[Column("critical_value_process_flag")]
[Column("is_critical_value_sms_complete")]
[MaxLength(1)]
public char? CriticalValueProcessFlag { get; set; }
public char? IsCriticalValueSmsComplete { get; set; }
/// <summary>
/// 危急值处理医生
/// 危急值短信发送者ID 预留字段,暂时不用
/// </summary>
[Column("critical_value_process_doctor")]
[StringLength(16)]
public string? CriticalValueProcessDoctor { get; set; }
[Column("critical_value_sms_creator_id")]
public Guid? CriticalValueSmsCreatorId { get; set; }
/// <summary>
/// 危急值处理日期
/// 危急值创建电话随访完成
/// </summary>
[Column("critical_value_process_date")]
public DateTime? CriticalValueProcessDate { get; set; }
[Column("is_critical_value_phone_complete")]
[MaxLength(1)]
public char? IsCriticalValuePhoneComplete { get; set; }
/// <summary>
/// 危急值创建日期
/// 危急值电话随访人员ID
/// </summary>
[Column("critical_value_phone_creator_id")]
public Guid? CriticalValuePhoneCreatorId { get; set; }
/// <summary>
/// 危急值是否审核 Y-N
/// </summary>
[Column("is_critical_value_audit")]
[MaxLength(1)]
public char? IsCriticalValueAudit { get; set; }
/// <summary>
/// 该项目要否要复查 Y-N
/// </summary>
[Column("is_review")]
[MaxLength(1)]
public char? IsReview { get; set; }
/// <summary>
/// 随访标志 0-无,1-需要创建随访,2-已经创建随访
/// </summary>
[Column("follow_up_flag")]
[MaxLength(1)]
public char? FollowUpFlag { get; set; }
/// <summary>
/// 随访创建时间
/// </summary>
[Column("critical_value_create_date")]
public DateTime? CriticalValueCreateDate { get; set; }
[Column("follow_up_creation_time")]
public DateTime? FollowUpCreationTime { get; set; }
/// <summary>
/// 随访创建者ID
/// </summary>
[Column("follow_up_creator_id")]
public Guid? FollowUpCreatorId { get; set; }
///// <summary>
///// 危急值处理标志
///// </summary>
//[Column("critical_value_process_flag")]
//[MaxLength(1)]
//public char? CriticalValueProcessFlag { get; set; }
///// <summary>
///// 危急值处理医生
///// </summary>
//[Column("critical_value_process_doctor")]
//[StringLength(16)]
//public string? CriticalValueProcessDoctor { get; set; }
///// <summary>
///// 危急值处理日期
///// </summary>
//[Column("critical_value_process_date")]
//public DateTime? CriticalValueProcessDate { get; set; }
///// <summary>
///// 危急值创建日期
///// </summary>
//[Column("critical_value_create_date")]
//public DateTime? CriticalValueCreateDate { get; set; }
/// <summary>
/// 检查医生(内部传ID,外部医生存名字)
/// </summary>

26
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);
}

6
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("危急值处理日期");

Loading…
Cancel
Save