XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
he 2025-09-09 17:07:07 +08:00
parent 05be768188 c9387463ba
commit eff5920568
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

@ -552,12 +552,12 @@ namespace IRaCIS.Core.Application.Service
saveItem.UserCode = AppSettings.GetCodeStr(saveItem.Code, nameof(IdentityUser)); saveItem.UserCode = AppSettings.GetCodeStr(saveItem.Code, nameof(IdentityUser));
//if (saveItem.IsZhiZhun) if (saveItem.IsZhiZhun)
//{ {
//var organizationName = _userInfo.IsEn_Us ? _systemEmailConfig.OrganizationName : _systemEmailConfig.OrganizationNameCN; //var organizationName = _userInfo.IsEn_Us ? _systemEmailConfig.OrganizationName : _systemEmailConfig.OrganizationNameCN;
// saveItem.OrganizationName = organizationName; saveItem.OrganizationName = hospitalInfo.HospitalName;
//} }
//saveItem.Password = MD5Helper.Md5(IRCEmailPasswordHelper.GenerateRandomPassword(10)); //saveItem.Password = MD5Helper.Md5(IRCEmailPasswordHelper.GenerateRandomPassword(10));
@ -622,7 +622,7 @@ namespace IRaCIS.Core.Application.Service
public async Task<IResponseOutput> UpdateUser(UserCommand model) public async Task<IResponseOutput> UpdateUser(UserCommand model)
{ {
var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, _ => CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7));
await VerifyUserNameAsync(model.Id, model.UserName); await VerifyUserNameAsync(model.Id, model.UserName);
@ -647,10 +647,10 @@ namespace IRaCIS.Core.Application.Service
_mapper.Map(model, user); _mapper.Map(model, user);
//if (user.IsZhiZhun) if (user.IsZhiZhun)
//{ {
// user.OrganizationName = _userInfo.IsEn_Us ? _systemEmailConfig.OrganizationName : _systemEmailConfig.OrganizationNameCN; user.OrganizationName = hospitalInfo.HospitalName;
//} }
await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.UserRoleId, OptUserId = model.Id, OptType = UserOptType.UpdateUser }); await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, LoginUserId = _userInfo.UserRoleId, OptUserId = model.Id, OptType = UserOptType.UpdateUser });

4
IRaCIS.Core.Application/Service/Visit/PatientService.cs
View File

@ -1659,9 +1659,9 @@ namespace IRaCIS.Application.Services
//} //}
//await _subjectRepository.DeleteAsync(subject); //await _subjectRepository.DeleteAsync(subject);
await _subjectVisitRepository.DeleteFromQueryAsync(t => t.SubjectId == subjectId, true); await _subjectVisitRepository.SoftDeleteFromQueryAsync(t => t.SubjectId == subjectId, true);
await _subjectRepository.DeleteFromQueryAsync(t => t.Id == subjectId); await _subjectRepository.SoftDeleteFromQueryAsync(t => t.Id == subjectId);
} }