From 3202a116a44978b380155d1eef5bb37a6b6f980a Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Sat, 20 Apr 2024 17:18:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LisRequests/SetLisRequestDto.cs | 2 +- .../LisRequests/LisRequestAppService.cs | 14 +++++++------- .../LisRequests/LisRequestManager.cs | 10 +++++----- .../SampleContainers/SampleContainer.cs | 8 ++++++-- .../SampleGroups/SampleGroup.cs | 3 --- src/Shentun.Peis.Domain/SampleTypes/SampleType.cs | 9 +++++++-- .../DbMapping/SampleGroups/SampleGroupDbMapping.cs | 2 +- .../PrintReports/LisRequestReportRepository.cs | 5 ++++- 8 files changed, 31 insertions(+), 22 deletions(-) diff --git a/src/Shentun.Peis.Application.Contracts/LisRequests/SetLisRequestDto.cs b/src/Shentun.Peis.Application.Contracts/LisRequests/SetLisRequestDto.cs index f14a158..14409a4 100644 --- a/src/Shentun.Peis.Application.Contracts/LisRequests/SetLisRequestDto.cs +++ b/src/Shentun.Peis.Application.Contracts/LisRequests/SetLisRequestDto.cs @@ -23,7 +23,7 @@ namespace Shentun.Peis.LisRequests /// /// 采样人姓名 /// - public string? Sampler { get; set; } + public string? SamplerName { get; set; } /// /// 采样时间 /// diff --git a/src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs b/src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs index 8a672ae..a4b131c 100644 --- a/src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs +++ b/src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs @@ -27,13 +27,14 @@ namespace Shentun.Peis.LisRequests private readonly IRepository _registerAsbitemRepository; private readonly ILisRequestReportRepository _lisRequestReportRepository; private readonly LisRequestManager _lisRequestManager; - + private readonly CacheService _cacheService; public LisRequestAppService( IRepository userRepository, IRepository patientRegisterRepository, IRepository registerAsbitemRepository, ILisRequestReportRepository lisRequestReportRepository, - LisRequestManager lisRequestManager + LisRequestManager lisRequestManager, + CacheService cacheService ) { this._userRepository = userRepository; @@ -41,6 +42,7 @@ namespace Shentun.Peis.LisRequests this._registerAsbitemRepository = registerAsbitemRepository; this._lisRequestReportRepository = lisRequestReportRepository; this._lisRequestManager = lisRequestManager; + _cacheService = cacheService; } /// @@ -53,22 +55,20 @@ namespace Shentun.Peis.LisRequests { var entlist = await _lisRequestManager.SetLisRequestAsync(PatientRegisterId); - var userList = await _userRepository.GetListAsync(); var entlistdto = entlist.Select(s => new SetLisRequestDto { CreationTime = s.CreationTime, CreatorId = s.CreatorId, - CreatorName = EntityHelper.GetUserNameNoSql(userList, s.CreatorId), + CreatorName = _cacheService.GetUserNameAsync(s.CreatorId).Result, Id = s.Id, IsPrint = s.IsPrint, IsSignIn = s.IsSignIn, LastModificationTime = s.LastModificationTime, LastModifierId = s.LastModifierId, - LastModifierName = EntityHelper.GetUserNameNoSql(userList, s.LastModifierId), + LastModifierName = _cacheService.GetUserNameAsync(s.LastModifierId).Result, LisRequestNo = s.LisRequestNo, - SampleGroupId = s.SampleGroupId, - Sampler = s.SamplerId, + SamplerName = _cacheService.GetUserNameAsync( s.SamplerId).Result, SamplingTime = s.SamplingTime, SignInOrder = s.SignInOrder, SignInPerson = s.SignInPerson, diff --git a/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs b/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs index 6f37f9e..ed76fb3 100644 --- a/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs +++ b/src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs @@ -51,7 +51,7 @@ namespace Shentun.Peis.LisRequests public async Task> SetLisRequestAsync(Guid PatientRegisterId) { - List msg = new List(); + List lisRequests = new List(); //根据人员登记ID 查找登记的组合项目 @@ -66,7 +66,7 @@ namespace Shentun.Peis.LisRequests var sampleGroupDetailList = await _sampleGroupDetailRepository.GetListAsync(m => registerAsbitemeList.Select(s => s.AsbitemId).Contains(m.AsbitemId)); if (!sampleGroupDetailList.Any()) { - return msg; + return lisRequests; } //查找条码分组信息 根据条码分组ID @@ -92,7 +92,7 @@ namespace Shentun.Peis.LisRequests //生成检验申请单的新实体 var lisRequestEnt_New = await _lisRequestRepository.InsertAsync(lisRequestEnt, true); - msg.Add(lisRequestEnt_New); + lisRequests.Add(lisRequestEnt_New); #region 修改RegisterAsbitem表 LisRequestId @@ -114,7 +114,7 @@ namespace Shentun.Peis.LisRequests #endregion } - return msg; + return lisRequests; } @@ -199,7 +199,7 @@ namespace Shentun.Peis.LisRequests IsPrint = 'N', IsSignIn = 'N', LisRequestNo = await CreateLisRequestNo(registerAsbitemeList.FirstOrDefault().PatientRegister.MedicalCenterId), - SampleGroupId = sampleGroup.Id + //SampleGroupId = sampleGroup.Id }; //生成检验申请单的新实体 diff --git a/src/Shentun.Peis.Domain/SampleContainers/SampleContainer.cs b/src/Shentun.Peis.Domain/SampleContainers/SampleContainer.cs index 3928b9b..4e04e2d 100644 --- a/src/Shentun.Peis.Domain/SampleContainers/SampleContainer.cs +++ b/src/Shentun.Peis.Domain/SampleContainers/SampleContainer.cs @@ -17,10 +17,14 @@ namespace Shentun.Peis.Models { public SampleContainer() { - // LisRequests = new HashSet(); + LisRequests = new HashSet(); + SampleGroups = new HashSet(); + } + public SampleContainer(Guid id):base(id) + { + LisRequests = new HashSet(); SampleGroups = new HashSet(); } - [Column("display_name")] [StringLength(20)] diff --git a/src/Shentun.Peis.Domain/SampleGroups/SampleGroup.cs b/src/Shentun.Peis.Domain/SampleGroups/SampleGroup.cs index 715080b..797dc96 100644 --- a/src/Shentun.Peis.Domain/SampleGroups/SampleGroup.cs +++ b/src/Shentun.Peis.Domain/SampleGroups/SampleGroup.cs @@ -17,7 +17,6 @@ namespace Shentun.Peis.Models { public SampleGroup() { - LisRequests = new HashSet(); SampleGroupDetails = new HashSet(); } @@ -68,8 +67,6 @@ namespace Shentun.Peis.Models public virtual ICollection SampleGroupDetails { get; set; } - [InverseProperty(nameof(LisRequest.SampleGroup))] - public virtual ICollection LisRequests { get; set; } //public override object[] GetKeys() //{ diff --git a/src/Shentun.Peis.Domain/SampleTypes/SampleType.cs b/src/Shentun.Peis.Domain/SampleTypes/SampleType.cs index 496dfcc..cbeba93 100644 --- a/src/Shentun.Peis.Domain/SampleTypes/SampleType.cs +++ b/src/Shentun.Peis.Domain/SampleTypes/SampleType.cs @@ -17,10 +17,15 @@ namespace Shentun.Peis.Models { public SampleType() { - //LisRequests = new HashSet(); + LisRequests = new HashSet(); SampleGroups = new HashSet(); - } + } + public SampleType(Guid id):base(id) + { + LisRequests = new HashSet(); + SampleGroups = new HashSet(); + } [Column("display_name")] [StringLength(20)] diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/SampleGroups/SampleGroupDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/SampleGroups/SampleGroupDbMapping.cs index 1cfa38f..2ca4855 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/SampleGroups/SampleGroupDbMapping.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/SampleGroups/SampleGroupDbMapping.cs @@ -29,7 +29,7 @@ namespace Shentun.Peis.DbMapping .WithMany(p => p.SampleGroups) .HasForeignKey(d => d.SampleContainerId) .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_sample_"); + .HasConstraintName("fk_sample_group_sample_container"); entity.HasOne(d => d.SampleType) .WithMany(p => p.SampleGroups) diff --git a/src/Shentun.Peis.EntityFrameworkCore/PrintReports/LisRequestReportRepository.cs b/src/Shentun.Peis.EntityFrameworkCore/PrintReports/LisRequestReportRepository.cs index 42783b5..433041a 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/PrintReports/LisRequestReportRepository.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/PrintReports/LisRequestReportRepository.cs @@ -32,7 +32,9 @@ namespace Shentun.Peis.PrintReports /// /// public async Task> GetLisRequestReportAsync(Guid PatientRegisterId) - { + { + throw new Exception("禁止使用"); + /* var dbContext = await GetDbContextAsync(); var customerOrgList = await _customerOrgRepository.GetListAsync(); @@ -99,6 +101,7 @@ namespace Shentun.Peis.PrintReports return entlist; + */ } ///