From 0accb453e5a184da84577de93a85db0744d89fc7 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 3 Jun 2024 15:13:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9B=91=E6=8E=A7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Common/ExcelExportService.cs | 6 +++--- .../Service/ImageAndDoc/StudyService.cs | 6 +++--- IRaCIS.Core.Application/Service/Visit/SubjectService.cs | 7 ++++--- IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs | 3 --- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index 2a2ae74eb..cfcfc40e7 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -532,7 +532,7 @@ namespace IRaCIS.Core.Application.Service.Common var svExpression = QCCommon.GetStudyMonitorSubjectVisitFilter(studyQuery.VisitPlanArray); var StudyMonitorQuery = _repository.Where(t => t.TrialId == studyQuery.TrialId) - .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.Id)) + .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.Subject.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.Id)) .WhereIf(studyQuery.VisitPlanArray != null && studyQuery.VisitPlanArray?.Length > 0, svExpression) .WhereIf(!string.IsNullOrWhiteSpace(studyQuery.SubjectInfo), t => t.Subject.Code.Contains(studyQuery.SubjectInfo)) .WhereIf(studyQuery.SubjectId != null, t => t.SubjectId == studyQuery.SubjectId) @@ -540,8 +540,8 @@ namespace IRaCIS.Core.Application.Service.Common .WhereIf(studyQuery.TrialSiteId != null, t => t.Subject.TrialSiteId == studyQuery.TrialSiteId) .Select(t => new UnionStudyMonitorExportDto() { - TrialSiteCode = t.TrialSite.TrialSiteCode, - TrialSiteAliasName = t.TrialSite.TrialSiteAliasName, + TrialSiteCode = t.Subject.TrialSite.TrialSiteCode, + TrialSiteAliasName = t.Subject.TrialSite.TrialSiteAliasName, SubjectCode = t.Subject.Code, diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs index 92082d8d1..50c2882a5 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs @@ -466,7 +466,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc { var svExpression = QCCommon.GetStudyMonitorSubjectVisitFilter(studyQuery.VisitPlanArray); var StudyMonitorQuery = _repository.Where(t => t.TrialId == studyQuery.TrialId, ignoreQueryFilters: true) - .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.Id)) + .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.Subject.TrialSite.CRCUserList.Any(t => t.UserId == _userInfo.Id)) //.WhereIf(!string.IsNullOrEmpty(studyQuery.VisitPlanInfo), studyQuery.VisitPlanInfo.Contains('.') ? t => t.SubjectVisit.VisitNum.ToString().Contains(".") : t => t.SubjectVisit.VisitNum == decimal.Parse(studyQuery.VisitPlanInfo)) .WhereIf(studyQuery.VisitPlanArray != null && studyQuery.VisitPlanArray?.Length > 0, svExpression) .WhereIf(!string.IsNullOrWhiteSpace(studyQuery.SubjectInfo), t => t.Subject.Code.Contains(studyQuery.SubjectInfo)) @@ -491,9 +491,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc SubjectCode = t.Subject.Code, - TrialSiteAliasName = t.TrialSite.TrialSiteAliasName, + TrialSiteAliasName = t.Subject.TrialSite.TrialSiteAliasName, - TrialSiteCode = t.TrialSite.TrialSiteCode, + TrialSiteCode = t.Subject.TrialSite.TrialSiteCode, Uploader = t.Uploader.UserName, diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs index b8e0da4b1..0f56423cb 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs @@ -5,6 +5,7 @@ using IRaCIS.Core.Domain.Share; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Authorization; using IRaCIS.Core.Application.Auth; +using IRaCIS.Core.Domain.Models; namespace IRaCIS.Application.Services { @@ -138,10 +139,10 @@ namespace IRaCIS.Application.Services /// /// 计划外访视 获取受试者选择下拉框列表 /// - [HttpGet("{siteId:guid}/{trialId:guid}")] - public List GetSubjectListBySiteId(Guid siteId, Guid trialId) + [HttpGet("{trialSiteId:guid}/{trialId:guid}")] + public List GetSubjectListBySiteId(Guid trialSiteId, Guid trialId) { - var query = _subjectRepository.Where(t => t.TrialSiteId == siteId && t.TrialId == trialId && t.Status == SubjectStatus.OnVisit).Select(u => new SubjectSelect() + var query = _subjectRepository.Where(t => t.TrialSiteId == trialSiteId && t.TrialId == trialId && t.Status == SubjectStatus.OnVisit).Select(u => new SubjectSelect() { Code = u.Code, FirstName = u.FirstName, diff --git a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs index c4f12bff0..dedcc3b01 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs @@ -77,9 +77,6 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("SubjectVisitId")] public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - public TrialSite TrialSite { get; set; } - [JsonIgnore] [ForeignKey("TrialId")] public Trial Trial { get; set; }