IRaCIS.Core.Application/Service/Visit/PatientService.cs

@@ -53,7 +53,6 @@ using System.Dynamic;
 using System.Threading.Channels;
 using NPOI.HSSF.Record.Chart;
 using IRaCIS.Core.Application.Helper.OtherTool;
-using IRaCIS.Core.Infrastructure.Extention;
 
 
 namespace IRaCIS.Application.Services
@@ -196,8 +195,6 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<NewTrialView>>> GetTrialList(NewTrialQuery inQuery)
         {
-            var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, _ => CacheHelper.GetHospitalCode(_hIRHospitalRepository), TimeSpan.FromDays(7));
-
             var trialQuery = _trialRepository
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.ResearchProgramNo), t => t.ResearchProgramNo.Contains(inQuery.ResearchProgramNo))
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.ExperimentName), t => t.ExperimentName.Contains(inQuery.ExperimentName))
@@ -205,8 +202,6 @@ namespace IRaCIS.Application.Services
                 .WhereIf(inQuery.TrialType != null, t => t.TrialType == inQuery.TrialType)
                 .WhereIf(!string.IsNullOrWhiteSpace(inQuery.TrialCode), t => t.TrialCode.Contains(inQuery.TrialCode))
 
-                 //过滤医院，切换会有问题
-                 .Where(t => t.HospitalId == hospitalInfo.Id)
                  //GA 要过滤课题组
                  .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.GA, t => _userInfo.HospitalGroupIdList.Contains(t.HospitalGroupId))
                 .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OA && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.GA

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -312,8 +312,6 @@ public partial class Trial : BaseFullDeleteAuditEntity
 
     public Guid HospitalGroupId { get; set; }
 
-    public Guid HospitalId { get; set; }
-
     #endregion
 
 }

IRaCIS.Core.Infra.EFCore/Migrations/20250820052429_addHospitalId.cs

@@ -1,30 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace IRaCIS.Core.Infra.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addHospitalId : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<Guid>(
-                name: "HospitalId",
-                table: "Trial",
-                type: "uniqueidentifier",
-                nullable: false,
-                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "HospitalId",
-                table: "Trial");
-        }
-    }
-}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -10751,9 +10751,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid>("HospitalGroupId")
                         .HasColumnType("uniqueidentifier");
 
-                    b.Property<Guid>("HospitalId")
-                        .HasColumnType("uniqueidentifier");
-
                     b.Property<string>("Indication")
                         .IsRequired()
                         .HasMaxLength(400)