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

修改课题组 和导表去掉中心查询

Test_HIR_Net8
hang 2025-09-09 10:49:41 +08:00
parent 690c759fa1
commit cee9d92a72
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
View File

@ -1601,6 +1601,7 @@ namespace IRaCIS.Core.Application.Service.Common
.WhereIf(inQuery.EndAllocateDate != null, t => t.AllocateTime < inQuery.EndAllocateDate); .WhereIf(inQuery.EndAllocateDate != null, t => t.AllocateTime < inQuery.EndAllocateDate);
var list = new List<CommonEvaluationExport>(); var list = new List<CommonEvaluationExport>();
var taskList = new List<CommonLessionExport>(); var taskList = new List<CommonLessionExport>();

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

@ -597,7 +597,7 @@ namespace IRaCIS.Core.Application.Service
}; };
await _trialIdentityUserRepository.AddAsync(currentUser,true); await _trialIdentityUserRepository.AddAsync(currentUser, true);
} }
} }
@ -1338,7 +1338,7 @@ namespace IRaCIS.Core.Application.Service
UserName = t.IdentityUser.UserName, UserName = t.IdentityUser.UserName,
UserTypeShortName = t.UserTypeRole.UserTypeShortName, UserTypeShortName = t.UserTypeRole.UserTypeShortName,
HospitalGroupList = t.IdentityUser.IdentityUserHospitalGroupList.Where(t => t.IsDisabled == false).Select(t => new HospitalGroupInfo() HospitalGroupList = t.IdentityUser.IdentityUserHospitalGroupList.Where(t => t.IsDisabled == false /*&& t.HospitalGroup.IsEnable == true*/).Select(t => new HospitalGroupInfo()
{ {
Id = t.HospitalGroupId, Id = t.HospitalGroupId,
IsManager = t.IsManager, IsManager = t.IsManager,

2
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
View File

@ -1176,7 +1176,7 @@ namespace IRaCIS.Core.Application.Contracts
public List<decimal> SubjectCriterionReadingPeriodVisitNumList { get; set; } public List<decimal> SubjectCriterionReadingPeriodVisitNumList { get; set; }
public String TrialSiteCode { get; set; } = String.Empty; //public String TrialSiteCode { get; set; } = String.Empty;
public string SubjectCode { get; set; } = String.Empty; public string SubjectCode { get; set; } = String.Empty;
public Guid Id { get; set; } public Guid Id { get; set; }

2
IRaCIS.Core.Application/Service/QC/_MapConfig.cs
View File

@ -267,7 +267,7 @@ namespace IRaCIS.Core.Application.Service
//.ForMember(o => o.ResearchProgramNo, t => t.MapFrom(u => u.Trial.ResearchProgramNo)) //.ForMember(o => o.ResearchProgramNo, t => t.MapFrom(u => u.Trial.ResearchProgramNo))
//.ForMember(o => o.VisitName, t => t.MapFrom(u => u.SourceSubjectVisit.VisitName)) //.ForMember(o => o.VisitName, t => t.MapFrom(u => u.SourceSubjectVisit.VisitName))
.ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode)) //.ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
//.ForMember(o => o.LatestScanDate, t => t.MapFrom(u => u.SourceSubjectVisit.LatestScanDate)) //.ForMember(o => o.LatestScanDate, t => t.MapFrom(u => u.SourceSubjectVisit.LatestScanDate))
.ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code)) .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
.ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName)) .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))

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

@ -43,7 +43,7 @@ public class HospitalGroupService(IRepository<HospitalGroup> _hospitalGroupRepos
public async Task<List<HospitalGroupView>> GetHospitalGroupList(HospitalGroupQuery inQuery) public async Task<List<HospitalGroupView>> GetHospitalGroupList(HospitalGroupQuery inQuery)
{ {
var hospitalGroupQueryable = _hospitalGroupRepository var hospitalGroupQueryable = _hospitalGroupRepository.Where(t => t.IsEnable == true)//都是查询启用的
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.Code), t => t.Code.Contains(inQuery.Code)) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.Code), t => t.Code.Contains(inQuery.Code))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.Name), t => t.Name.Contains(inQuery.Name)) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.Name), t => t.Name.Contains(inQuery.Name))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.Affiliation), t => t.Affiliation.Contains(inQuery.Affiliation)) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.Affiliation), t => t.Affiliation.Contains(inQuery.Affiliation))
@ -51,7 +51,7 @@ public class HospitalGroupService(IRepository<HospitalGroup> _hospitalGroupRepos
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.ContactName), t => t.ContactName.Contains(inQuery.ContactName)) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.ContactName), t => t.ContactName.Contains(inQuery.ContactName))
.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.GA, t => _userInfo.HospitalGroupAdminIdList.Contains(t.Id)) .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.GA, t => _userInfo.HospitalGroupAdminIdList.Contains(t.Id))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.CallingAE), t => t.CallingAE.Contains(inQuery.CallingAE)) .WhereIf(!string.IsNullOrWhiteSpace(inQuery.CallingAE), t => t.CallingAE.Contains(inQuery.CallingAE))
.WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable) //.WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable)
.ProjectTo<HospitalGroupView>(_mapper.ConfigurationProvider); .ProjectTo<HospitalGroupView>(_mapper.ConfigurationProvider);
var pageList = await hospitalGroupQueryable.SortToListAsync(inQuery); var pageList = await hospitalGroupQueryable.SortToListAsync(inQuery);