From e1c083f46dd2dd7d110fb722734b3050cb70baa0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com>
Date: Thu, 9 May 2024 00:33:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E5=BC=95=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AsbitemGuides/AsbitemGuideManager.cs         |  4 ++--
 .../PatientRegisterGuideReportRepository.cs      | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuideManager.cs b/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuideManager.cs
index 38e3b10..2926041 100644
--- a/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuideManager.cs
+++ b/src/Shentun.Peis.Domain/AsbitemGuides/AsbitemGuideManager.cs
@@ -69,10 +69,10 @@ namespace Shentun.Peis.AsbitemGuides
         /// 获取指引单内容（根据体检中心、组合项目ID、性别ID）
         /// </summary>
         /// <returns></returns>
-        public string GetAsbitemGuideConvertSexId(Guid OrOrganizationUnitId, Guid AsbitemId, char SexId)
+        public string GetAsbitemGuideConvertSexId(Guid medicalCenterId, Guid AsbitemId, char SexId)
         {
             //以体检中心跟组合项目去查
-            var entlist = _asbitemGuideRepository.GetListAsync(m => m.MedicalCenterId == OrOrganizationUnitId && m.AsbitemId == AsbitemId).Result;
+            var entlist = _asbitemGuideRepository.GetListAsync(m => m.MedicalCenterId == medicalCenterId && m.AsbitemId == AsbitemId).Result;
             if (SexFlag.UnKnown == SexId)
             {
                 //判断是否为未知、未知去找适用性别为全部的
diff --git a/src/Shentun.Peis.EntityFrameworkCore/PrintReports/PatientRegisterGuideReportRepository.cs b/src/Shentun.Peis.EntityFrameworkCore/PrintReports/PatientRegisterGuideReportRepository.cs
index e94be0f..c12d840 100644
--- a/src/Shentun.Peis.EntityFrameworkCore/PrintReports/PatientRegisterGuideReportRepository.cs
+++ b/src/Shentun.Peis.EntityFrameworkCore/PrintReports/PatientRegisterGuideReportRepository.cs
@@ -56,13 +56,13 @@ namespace Shentun.Peis.PrintReports
 
             var ApiUrl = _configuration.GetValue<string>("HostUrl:ApiUrl") + "/";
 
-            Guid OrOrganizationUnitId = (await GetAsync(f => f.Id == PatientRegisterIds.First())).MedicalCenterId;
+            Guid medicalCenterId = (await GetAsync(f => f.Id == PatientRegisterIds.First())).MedicalCenterId;
 
 
             #region 系统参数配置
-            var MedicalCenterAddress = await _sysParmValueManager.GetSysParmValueAsync(OrOrganizationUnitId, "medical_center_address");
-            var MedicalCenterFax = await _sysParmValueManager.GetSysParmValueAsync(OrOrganizationUnitId, "medical_center_fax");
-            var MedicalCenterTelphone = await _sysParmValueManager.GetSysParmValueAsync(OrOrganizationUnitId, "medical_center_telphone");
+            var MedicalCenterAddress = await _sysParmValueManager.GetSysParmValueAsync(medicalCenterId, "medical_center_address");
+            var MedicalCenterFax = await _sysParmValueManager.GetSysParmValueAsync(medicalCenterId, "medical_center_fax");
+            var MedicalCenterTelphone = await _sysParmValueManager.GetSysParmValueAsync(medicalCenterId, "medical_center_telphone");
             #endregion
 
 
@@ -110,7 +110,7 @@ namespace Shentun.Peis.PrintReports
                             MedicalStartDate = Convert.ToDateTime(a.MedicalStartDate.ToString()).ToString("yyyy-MM-dd"),
                             OrganizationUnitId = a.MedicalCenterId,
                             OrganizationUnitName = ag.DisplayName,
-                            Detail = PatientRegisterGuideAsbitem(a.Id, OrOrganizationUnitId, a.SexId)
+                            Detail = PatientRegisterGuideAsbitem(a.Id, medicalCenterId, a.SexId)
                         };
 
             return query.ToList();
@@ -184,10 +184,10 @@ namespace Shentun.Peis.PrintReports
         /// 获取登记的组合项目  按指引类别分组  排序
         /// </summary>
         /// <param name="PatientRegisterId">登记ID</param>
-        /// <param name="OrOrganizationUnitId">体检中心</param>
+        /// <param name="medicalCenterId">体检中心</param>
         /// <param name="ForSexId">适用性别ID</param>
         /// <returns></returns>
-        private static List<PatientRegisterGuideReport_Detail> PatientRegisterGuideAsbitem(Guid PatientRegisterId, Guid OrOrganizationUnitId, char SexId)
+        private static List<PatientRegisterGuideReport_Detail> PatientRegisterGuideAsbitem(Guid PatientRegisterId, Guid medicalCenterId, char SexId)
         {
             var entlist = _registerAsbitemRepository.GetDbSetAsync().Result
             .Include(x => x.Asbitem)
@@ -198,7 +198,7 @@ namespace Shentun.Peis.PrintReports
             .Select(s => new PatientRegisterGuideReport_Asbitem_Temp
             {
                 AsbitemName = s.Asbitem.DisplayName,
-                AsbitemGuide = _asbitemGuideManager.GetAsbitemGuideConvertSexId(OrOrganizationUnitId, s.AsbitemId, SexId),
+                AsbitemGuide = _asbitemGuideManager.GetAsbitemGuideConvertSexId(medicalCenterId, s.AsbitemId, SexId),
                 AsbitemDisplayOrder = s.Asbitem.DisplayOrder,
                 GuideDisplayOrder = s.Asbitem.ItemType.GuidType.DisplayOrder,
                 GuideName = s.Asbitem.ItemType.GuidType.DisplayName