diff --git a/src/Shentun.Peis.Application.Contracts/SysParmValues/SysParmValueInputDto.cs b/src/Shentun.Peis.Application.Contracts/SysParmValues/SysParmValueInputDto.cs index b22860f..106cb3e 100644 --- a/src/Shentun.Peis.Application.Contracts/SysParmValues/SysParmValueInputDto.cs +++ b/src/Shentun.Peis.Application.Contracts/SysParmValues/SysParmValueInputDto.cs @@ -11,9 +11,5 @@ namespace Shentun.Peis.SysParmValues /// public string SysParmId { get; set; } - /// - /// 体检中心ID - /// - public Guid MedicalCenterId { get; set; } } } diff --git a/src/Shentun.Peis.Application/MyUser/MyUserAppService.cs b/src/Shentun.Peis.Application/MyUser/MyUserAppService.cs index 6c3a2d9..ff9da5b 100644 --- a/src/Shentun.Peis.Application/MyUser/MyUserAppService.cs +++ b/src/Shentun.Peis.Application/MyUser/MyUserAppService.cs @@ -589,8 +589,8 @@ namespace Shentun.Peis.MyUser var verifyResult = await _userManager.CheckPasswordAsync(user, input.PassWord); if (verifyResult) { - var organizationUnitList = await _organizationUnitRepository.GetListAsync(); - var PeisId = await _peisOrganizationUnitManager.GetPeisIdAsync(organizationUnitList, user.Id); + + var PeisId = await _peisOrganizationUnitManager.GetPeisIdAsync(user.Id); if (user.IsActive == false) { diff --git a/src/Shentun.Peis.Application/SysParmValues/SysParmValueAppService.cs b/src/Shentun.Peis.Application/SysParmValues/SysParmValueAppService.cs index ea3f930..878ab7a 100644 --- a/src/Shentun.Peis.Application/SysParmValues/SysParmValueAppService.cs +++ b/src/Shentun.Peis.Application/SysParmValues/SysParmValueAppService.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Shentun.Peis.Items; using Shentun.Peis.Models; +using Shentun.Peis.OrganizationUnits; using Shentun.Peis.SysParmTypes; using Shentun.Peis.Units; using System; @@ -30,17 +31,23 @@ namespace Shentun.Peis.SysParmValues private readonly IRepository _sysParmRepository; private readonly IRepository _userRepository; private readonly SysParmValueManager _manager; + private readonly ICurrentUser _currentUser; + private readonly PeisOrganizationUnitManager _peisOrganizationUnitManager; public SysParmValueAppService( IRepository repository, IRepository sysParmRepository, IRepository userRepository, - SysParmValueManager manager) + SysParmValueManager manager, + ICurrentUser currentUser, + PeisOrganizationUnitManager peisOrganizationUnitManager) { this._repository = repository; this._sysParmRepository = sysParmRepository; this._userRepository = userRepository; this._manager = manager; + _currentUser = currentUser; + _peisOrganizationUnitManager = peisOrganizationUnitManager; } /// @@ -51,7 +58,10 @@ namespace Shentun.Peis.SysParmValues [HttpPost("api/app/SysParmValue/GetSysParmValueBySysParmId")] public async Task GetSysParmValueBySysParmIdAsync(SysParmValueInputDto input) { - string sysParmValue = await _manager.GetSysParmValueAsync(input.MedicalCenterId, input.SysParmId); + var userId = _currentUser.Id.Value; + var medicalCenterId = await _peisOrganizationUnitManager.GetPeisIdAsync(userId); + + string sysParmValue = await _manager.GetSysParmValueAsync(medicalCenterId != null ? medicalCenterId.Value : Guid.Empty, input.SysParmId); return sysParmValue; } diff --git a/src/Shentun.Peis.Domain/OrganizationUnits/PeisOrganizationUnitManager.cs b/src/Shentun.Peis.Domain/OrganizationUnits/PeisOrganizationUnitManager.cs index df0bc44..efdc851 100644 --- a/src/Shentun.Peis.Domain/OrganizationUnits/PeisOrganizationUnitManager.cs +++ b/src/Shentun.Peis.Domain/OrganizationUnits/PeisOrganizationUnitManager.cs @@ -44,10 +44,9 @@ namespace Shentun.Peis.OrganizationUnits /// /// 获取当前用户的体检中心ID /// - /// /// /// - public async Task GetPeisIdAsync(List organizationUnitList, Guid UserId) + public async Task GetPeisIdAsync(Guid UserId) { //当前用户的部门ID var userOrganizationUnit = (await _identityUserOrganizationUnitRepository.GetListAsync(m => m.UserId == UserId)).FirstOrDefault();