指引单

src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs

@@ -173,7 +173,7 @@ namespace Shentun.Peis.PrintReports
             var MedicalCenterTelphone = await _sysParmValueManager.GetSysParmValueAsync(medicalCenterId, "medical_center_telphone");
             #endregion
 
-            var customerOrgList = await _customerOrgRepository.GetListAsync();
+            //var customerOrgList = await _customerOrgRepository.GetListAsync();
 
             var query = from a in await _patientRegisterRepository.GetQueryableAsync()
                         join b in await _sexRegisterRepository.GetQueryableAsync()
@@ -252,10 +252,13 @@ namespace Shentun.Peis.PrintReports
             //生成LIS条码
             var lisRequests = await _lisRequestManager.SetLisRequestAsync(input.PatientRegisterId);
             await _unitOfWorkManager.Current.SaveChangesAsync();
-            //await _unitOfWorkManager.Current.CompleteAsync();
+            await _unitOfWorkManager.Current.CompleteAsync();
 
             //检索条码数据
-
+            using (var uow = _unitOfWorkManager.Begin(
+                requiresNew: false, isTransactional: false
+            ))
+            {
                 var query = (from patient in await _patientRepository.GetQueryableAsync()
                              join patientRegister in await _patientRegisterRepository.GetQueryableAsync()
                              on patient.Id equals patientRegister.PatientId
@@ -360,7 +363,12 @@ namespace Shentun.Peis.PrintReports
                         SignInTime = s.Key.SignInTime,
                     }).ToList();
 
+                await uow.CompleteAsync();
                 return entlist;
+
+                
+            }
+            
         }
 
         [HttpPost("api/app/PrintReport/GetLisRequestReportByLisRequestId")]
@@ -793,6 +801,7 @@ namespace Shentun.Peis.PrintReports
                 AsbitemName = s.Asbitem.DisplayName,
                 AsbitemGuide = _asbitemGuideManager.GetAsbitemGuideConvertSexId(medicalCenterId, s.AsbitemId, SexId),
                 AsbitemDisplayOrder = s.Asbitem.DisplayOrder,
+                ItemTypeDisplayOrder = s.Asbitem.ItemType.DisplayOrder,
                 GuideDisplayOrder = s.Asbitem.ItemType.GuidType.DisplayOrder,
                 GuideName = s.Asbitem.ItemType.GuidType.DisplayName
             })
@@ -807,7 +816,7 @@ namespace Shentun.Peis.PrintReports
                 {
                     AsbitemName = ss.AsbitemName,
                     AsbitemGuide = ss.AsbitemGuide,
-                    DisplayOrder = ss.AsbitemDisplayOrder
+                    DisplayOrder = (ss.ItemTypeDisplayOrder * 3000) + ss.AsbitemDisplayOrder
                 }).OrderBy(o => o.DisplayOrder).ToList()
             }).OrderBy(o => o.DisplayOrder).ToList();
 

src/Shentun.Peis.Domain/PrintReports/PatientRegisterGuideReportDto.cs

@@ -191,6 +191,8 @@ namespace Shentun.Peis.PrintReports
         public string AsbitemGuide { get; set; }
 
         public int AsbitemDisplayOrder { get; set; }
+
+        public int ItemTypeDisplayOrder { get; set; }
         /// <summary>
         /// 指引名称
         /// </summary>

test/Shentun.Peis.Application.Tests/PrintReportAppServiceTest.cs

@@ -34,7 +34,7 @@ namespace Shentun.Peis
             using (var unitOfWork = _unitOfWorkManager.Begin(isTransactional: true))
             {
                 var items = await _appService.GetLisRequestReportByPatientRegisterIdAsync(new PatientRegisterIdInputDto()
-                { PatientRegisterId = new Guid("3a12707e-bc54-129e-64d0-8cf5556a023c") });
+                { PatientRegisterId = new Guid("3a127094-8fcf-78cc-3397-dedd7decb7b4") });
                 _output.WriteLine(items.Count().ToString());
                 foreach (var item in items)
                 {