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) /// /// - 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("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 /// 获取登记的组合项目 按指引类别分组 排序 /// /// 登记ID - /// 体检中心 + /// 体检中心 /// 适用性别ID /// - private static List PatientRegisterGuideAsbitem(Guid PatientRegisterId, Guid OrOrganizationUnitId, char SexId) + private static List 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