IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -15,16 +15,15 @@
     "ObjectStoreUse": "AliyunOSS",
 
     "AliyunOSS": {
-      "RegionId": "cn-shanghai",
+      "regionId": "cn-shanghai",
-      "InternalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
+      "internalEndpoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
-      "EndPoint": "https://oss-cn-shanghai.aliyuncs.com",
+      "endpoint": "https://oss-cn-shanghai.aliyuncs.com",
-      "AccessKeyId": "LTAI5tJV76pYX5yPg1N9QVE8",
+      "accessKeyId": "LTAI5tKvzs7ed3UfSpNk3xwQ",
-      "AccessKeySecret": "roRNLa9YG1of4pYruJGCNKBXEWTAWa",
+      "accessKeySecret": "zTIceGEShlZDGnLrCFfIGFE7TXVRio",
-      "BucketName": "zy-irc-test-store",
+      "bucketName": "zy-irc-uat-store",
-      "RoleArn": "acs:ram::1899121822495495:role/webdirect",
+      "roleArn": "acs:ram::1899121822495495:role/oss-upload",
-      "ViewEndpoint": "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com",
+      "viewEndpoint": "https://zy-irc-uat-store.oss-cn-shanghai.aliyuncs.com",
-      "Region": "oss-cn-shanghai",
+      "region": "oss-cn-shanghai"
-      "DurationSeconds": 7200
     },
 
     "MinIO": {

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -1002,12 +1002,11 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.VerifyIRStudyAllowUpload(IRaCIS.Core.Application.Contracts.TaskStudyAchivePreConfirmCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomStudy})">
+        <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.VerifyIRStudyAllowUpload(IRaCIS.Core.Application.Contracts.TaskStudyAchivePreConfirmCommand)">
             <summary>
             在调用预归档前验证 这些检查是否可以全新上传还是已存在补充 目前前端允许  IsAllowUpload==true 全新、IsAllowReUpload==true 补充的study   ，全部丢到后端，后端判断存在，就删除之前的检查，全新插入
             </summary>
             <param name="inCommand"></param>
-            <param name="_dicomStudyRepository"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.GetIRUploadTaskNoneDicomStudyList(IRaCIS.Core.Application.Contracts.IRUploadStudyQuery)">

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -256,28 +256,18 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         /// 在调用预归档前验证 这些检查是否可以全新上传还是已存在补充 目前前端允许  IsAllowUpload==true 全新、IsAllowReUpload==true 补充的study   ，全部丢到后端，后端判断存在，就删除之前的检查，全新插入
         /// </summary>
         /// <param name="inCommand"></param>
-        /// <param name="_dicomStudyRepository"></param>
         /// <returns></returns>
-        public async Task<List<TaskStudyArchiveConfirmResult>> VerifyIRStudyAllowUpload(TaskStudyAchivePreConfirmCommand inCommand, [FromServices] IRepository<DicomStudy> _dicomStudyRepository)
+        public async Task<List<TaskStudyArchiveConfirmResult>> VerifyIRStudyAllowUpload(TaskStudyAchivePreConfirmCommand inCommand)
         {
 
 
-            var notAllowedUidList1 = _taskStudyRepository.Where(t => t.TrialId == inCommand.TrialId && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new
+            var notAllowedUidList = _taskStudyRepository.Where(t => t.TrialId == inCommand.TrialId && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new
             {
                 t.StudyInstanceUid,
                 t.SubjectId,
                 SubejectCode = t.VisitTask.IsAnalysisCreate ? t.VisitTask.BlindSubjectCode : t.Subject.Code
             }).ToList();
 
-            var notAllowedUidList2 = _dicomStudyRepository.Where(t => t.TrialId == inCommand.TrialId && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new
-            {
-                t.StudyInstanceUid,
-                t.SubjectId,
-                SubejectCode = t.Subject.Code
-            }).ToList();
-
-            var notAllowedUidList = notAllowedUidList1.Union(notAllowedUidList2);
-
             var result = new List<TaskStudyArchiveConfirmResult>();
 
             foreach (var studyUid in inCommand.StudyInstanceUidList)
@@ -285,7 +275,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 var findStudy = notAllowedUidList.Where(t => t.StudyInstanceUid == studyUid).FirstOrDefault();
                 if (findStudy != null)
                 {
-
                     //同一个subject 同一份影响
                     if (findStudy.SubejectCode == inCommand.SubjectCode && findStudy.SubjectId == inCommand.SubjectId)
                     {

IRaCIS.Core.Test/CodeFirstTest/CodeFirst使用说明

@@ -1,10 +0,0 @@
-
-#参考学习文档
-https://www.cnblogs.com/cqpanda/p/16815263.html
-
-# 如果不想指定项目名称，需要进入项目目录  一般pwershell进入的是项目根目录，需要命令指定项目
- cd .\IRaCIS.Core.Test
-
- # 该目录下如果有多个上下文，需要手动指定
-
- dotnet ef migrations add Initial  -p IRaCIS.Core.Test -c IRCContext -o CodeFirstTest/MSSQL/Migrations

IRaCIS.Core.Test/CodeFirstTest/MSSQL/IRCContext.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using IRaCIS.Core.Test.CodeFirstTest.MSSQL;
-using Microsoft.EntityFrameworkCore;
-
-namespace IRaCIS.Core.Test.CodeFirstTest.MSSQL;
-
-public partial class IRCContext : DbContext
-{
-    public IRCContext()
-    {
-    }
-
-    public IRCContext(DbContextOptions<IRCContext> options)
-        : base(options)
-    {
-    }
-
-    public virtual DbSet<TrialImageDownload> TrialImageDownload { get; set; }
-
-    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        => optionsBuilder.UseSqlServer("Server=106.14.89.110,1433;Database=IRC_Code;User ID=sa;Password=mssql_KnTs2a;TrustServerCertificate=true");
-
-    protected override void OnModelCreating(ModelBuilder modelBuilder)
-    {
-
-       
-
-        OnModelCreatingPartial(modelBuilder);
-    }
-
-    partial void OnModelCreatingPartial(ModelBuilder modelBuilder);
-}

IRaCIS.Core.Test/CodeFirstTest/MSSQL/TrialImageDownload.cs

@@ -1,39 +0,0 @@
-using IRaCIS.Core.Domain.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IRaCIS.Core.Test.CodeFirstTest.MSSQL
-{
-
-    [Table("TrialImageDownload")]
-    public class TrialImageDownload : BaseFullAuditEntity
-    {
-        public Guid SubjectVisitId { get; set; }
-
-        public bool IsSuccess { get; set; }
-
-        public DateTime DownloadStartTime { get; set; }
-        public DateTime? DownloadEndTime { get; set; }
-
-        public ImageType ImageType { get; set; }
-
-        public int ImageCount { get; set; }
-
-        public long ImageSize { get; set; }
-    }
-
-    public enum ImageType
-    {
-        Dicom = 1,
-        NoneDIcom = 2
-    };
-
-    public class TestNew: BaseFullAuditEntity
-    {
-        public string TestName { get; set; }
-    }
-}

IRaCIS.Core.Test/Program.cs

@@ -9,7 +9,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using static System.Net.Mime.MediaTypeNames;
 
 partial class Program
 {
@@ -56,13 +55,7 @@ partial class Program
 
 
         // 要生成的表名数组
-        var tableNames = new List<string>(args);
+        var tableNames = new List<string>(args); 
-
-        if (args.Contains(".") || args.Contains("-")|| args.Contains("application")|| args.Contains("IR"))
-        {
-            tableNames = new List<string>();
-        }
-
 
         try
         {