总检

src/Shentun.Peis.Application.Contracts/LisRequests/SetLisRequestDto.cs

@@ -23,7 +23,7 @@ namespace Shentun.Peis.LisRequests
         /// <summary>
         /// 采样人姓名
         /// </summary>
-        public string? Sampler { get; set; }
+        public string? SamplerName { get; set; }
         /// <summary>
         /// 采样时间
         /// </summary>

src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs

@@ -27,13 +27,14 @@ namespace Shentun.Peis.LisRequests
         private readonly IRepository<RegisterCheckAsbitem, Guid> _registerAsbitemRepository;
         private readonly ILisRequestReportRepository _lisRequestReportRepository;
         private readonly LisRequestManager _lisRequestManager;
-
+        private readonly CacheService _cacheService;
         public LisRequestAppService(
              IRepository<IdentityUser, Guid> userRepository,
              IRepository<PatientRegister, Guid> patientRegisterRepository,
              IRepository<RegisterCheckAsbitem, Guid> 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;
         }
 
         /// <summary>
@@ -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,

src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs

@@ -51,7 +51,7 @@ namespace Shentun.Peis.LisRequests
         public async Task<List<LisRequest>> SetLisRequestAsync(Guid PatientRegisterId)
         {
 
-            List<LisRequest> msg = new List<LisRequest>();
+            List<LisRequest> lisRequests = new List<LisRequest>();
 
 
             //根据人员登记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
                         };
 
                         //生成检验申请单的新实体

src/Shentun.Peis.Domain/SampleContainers/SampleContainer.cs

@@ -17,10 +17,14 @@ namespace Shentun.Peis.Models
     {
         public SampleContainer()
         {
-           // LisRequests = new HashSet<LisRequest>();
+            LisRequests = new HashSet<LisRequest>();
+            SampleGroups = new HashSet<SampleGroup>();
+        }
+        public SampleContainer(Guid id):base(id)
+        {
+            LisRequests = new HashSet<LisRequest>();
             SampleGroups = new HashSet<SampleGroup>();
         }
-
 
         [Column("display_name")]
         [StringLength(20)]

src/Shentun.Peis.Domain/SampleGroups/SampleGroup.cs

@@ -17,7 +17,6 @@ namespace Shentun.Peis.Models
     {
         public SampleGroup()
         {
-            LisRequests = new HashSet<LisRequest>();
             SampleGroupDetails = new HashSet<SampleGroupDetail>();
         }
 
@@ -68,8 +67,6 @@ namespace Shentun.Peis.Models
         public virtual ICollection<SampleGroupDetail> SampleGroupDetails { get; set; }
 
 
-        [InverseProperty(nameof(LisRequest.SampleGroup))]
-        public virtual ICollection<LisRequest> LisRequests { get; set; }
 
         //public override object[] GetKeys()
         //{

src/Shentun.Peis.Domain/SampleTypes/SampleType.cs

@@ -17,10 +17,15 @@ namespace Shentun.Peis.Models
     {
         public SampleType()
         {
-            //LisRequests = new HashSet<LisRequest>();
+            LisRequests = new HashSet<LisRequest>();
             SampleGroups = new HashSet<SampleGroup>();
-        }
 
+        }
+        public SampleType(Guid id):base(id) 
+        {
+            LisRequests = new HashSet<LisRequest>();
+            SampleGroups = new HashSet<SampleGroup>();
+        }
 
         [Column("display_name")]
         [StringLength(20)]

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)

src/Shentun.Peis.EntityFrameworkCore/PrintReports/LisRequestReportRepository.cs

@@ -33,6 +33,8 @@ namespace Shentun.Peis.PrintReports
         /// <exception cref="NotImplementedException"></exception>
         public async Task<List<LisRequestReportDto>> 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;
+            */
         }
 
         /// <summary>