diff --git a/src/Shentun.WebPeis.Application.Contracts/MedicalPackages/MedicalPackageCheckTypeWithAsbitemsDto.cs b/src/Shentun.WebPeis.Application.Contracts/MedicalPackages/MedicalPackageCheckTypeWithAsbitemsDto.cs index 05088d5..ddba5ff 100644 --- a/src/Shentun.WebPeis.Application.Contracts/MedicalPackages/MedicalPackageCheckTypeWithAsbitemsDto.cs +++ b/src/Shentun.WebPeis.Application.Contracts/MedicalPackages/MedicalPackageCheckTypeWithAsbitemsDto.cs @@ -7,24 +7,38 @@ namespace Shentun.WebPeis.MedicalPackages { public class MedicalPackageCheckTypeWithAsbitemsDto { + /// + /// 检查类别 + /// public char CheckTypeFlag { get; set; } + /// + /// 检查类别名称 + /// public string CheckTypeFlagName { get; set; } + /// + /// 显示顺序 + /// public int DisplayOrder { get; set; } - public List Asbitems = new List(); + public List Asbitems { get; set; } = new List(); } - + /// + /// 套餐包含的组合项目 + /// public class MedicalPackageAsbitem { + /// + /// 检查类别 + /// public char CheckTypeFlag { get; set; } /// - /// 编号 + /// 组合项目编号 /// public Guid AsbitemId { get; set; } /// - /// 名称 + /// 组合项目名称 /// public string AsbitemName { get; set; } = null!; @@ -66,12 +80,24 @@ namespace Shentun.WebPeis.MedicalPackages /// 是检查项目 /// public char IsCheck { get; set; } + /// + /// 警告提示 + /// public string? Warn { get; set; } + /// + /// 疾病筛查类别 + /// public Guid? DiseaseScreeningTypeId { get; set; } + /// + /// 简码 + /// public string? SimpleCode { get; set; } + /// + /// 显示顺序 + /// public int DisplayOrder { get; set; } diff --git a/src/Shentun.WebPeis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs b/src/Shentun.WebPeis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs index 589490a..c48aa78 100644 --- a/src/Shentun.WebPeis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs +++ b/src/Shentun.WebPeis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs @@ -20,19 +20,22 @@ namespace Shentun.WebPeis.AppointPatientRegisters public class AppointPatientRegisterAppService : ApplicationService { private readonly IRepository _repository; + private readonly IRepository _appointRegisterAsbitemRepository; private readonly IRepository _itemTypeRepository; private readonly CacheService _cacheService; private readonly AppointPatientRegisterManager _appointPatientRegisterManager; public AppointPatientRegisterAppService(IRepository repository, CacheService cacheService, IRepository itemTypeRepository, - AppointPatientRegisterManager appointPatientRegisterManager + AppointPatientRegisterManager appointPatientRegisterManager, + IRepository appointRegisterAsbitemRepository ) { _repository = repository; _cacheService = cacheService; _itemTypeRepository = itemTypeRepository; _appointPatientRegisterManager = appointPatientRegisterManager; + _appointRegisterAsbitemRepository = appointRegisterAsbitemRepository; } @@ -43,7 +46,9 @@ namespace Shentun.WebPeis.AppointPatientRegisters var asbitems = ObjectMapper.Map, List>(input.Asbitems); entity.AppointRegisterAsbitems = asbitems; entity = await _appointPatientRegisterManager.CreateAsync(entity); + entity.AppointRegisterAsbitems = null; await _repository.InsertAsync(entity); + await _appointRegisterAsbitemRepository.InsertManyAsync(asbitems); var result = ObjectMapper.Map(entity); return result; } diff --git a/src/Shentun.WebPeis.Domain/Models/AppointRegisterAsbitem.cs b/src/Shentun.WebPeis.Domain/Models/AppointRegisterAsbitem.cs index 6c8960b..edbb321 100644 --- a/src/Shentun.WebPeis.Domain/Models/AppointRegisterAsbitem.cs +++ b/src/Shentun.WebPeis.Domain/Models/AppointRegisterAsbitem.cs @@ -1,9 +1,11 @@ using System; using System.Collections.Generic; +using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.Domain.Entities; namespace Shentun.WebPeis.Models; -public partial class AppointRegisterAsbitem +public partial class AppointRegisterAsbitem : AuditedEntity, IHasConcurrencyStamp { public Guid AppointRegisterAsbitemId { get; set; } @@ -23,13 +25,12 @@ public partial class AppointRegisterAsbitem public string? ConcurrencyStamp { get; set; } - public DateTime CreationTime { get; set; } - - public Guid CreatorId { get; set; } - - public DateTime LastModificationTime { get; set; } - - public Guid LastModifierId { get; set; } + public virtual AppointPatientRegister AppointPatientRegister { get; set; } = null!; + + public override object?[] GetKeys() + { + return [AppointRegisterAsbitemId]; + } }