diff --git a/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFileStoreConfig.cs b/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFileStoreConfig.cs
index 2c2cd11c..269d8598 100644
--- a/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFileStoreConfig.cs
+++ b/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFileStoreConfig.cs
@@ -23,38 +23,8 @@ namespace IRaCIS.Core.API
             app.UseStaticFiles(new StaticFileOptions
             {
                 FileProvider = new PhysicalFileProvider(iRaCISDataFolder),
-                RequestPath = $"/{StaticData.IRaCISDataFolder}"
+                RequestPath = $"/{StaticData.Folder.IRaCISDataFolder}"
             });
-
-
-
-            #region 鍚庢湡搴熷純
-
-
-            var uploadPath = Path.Combine(Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\')).FullName, StaticData.UploadFileFolder);
-           
-
-            if (!Directory.Exists(uploadPath))
-            {
-                Directory.CreateDirectory(uploadPath);
-            }
-
-            app.UseStaticFiles(new StaticFileOptions
-            {
-                FileProvider = new PhysicalFileProvider(uploadPath),
-                RequestPath = $"/{StaticData.UploadFileFolder}"
-            });
-
-          
-
-
-            #endregion
-
-
-
-
-
-
         }
     }
 }
diff --git a/IRaCIS.Core.API/appsettings.json b/IRaCIS.Core.API/appsettings.json
index fc14c933..05fb3c08 100644
--- a/IRaCIS.Core.API/appsettings.json
+++ b/IRaCIS.Core.API/appsettings.json
@@ -75,8 +75,10 @@
 
     "NoneDicomStudyCodePrefix": "ST",
 
-    "DicomStudyCodePrefix": "NST"
-  },
+    "DicomStudyCodePrefix": "NST",
+
+    "DefaultPassword": "123456"
+  }
 
   //网站根地址，为了访问文件 dicom 和上传的文档... 实测发现不用将域名拼接返回，浏览器会自动加上当前ip，避免了多环境读取环境配置文件
 
diff --git a/IRaCIS.Core.Application/AOP/TrialStatusAutofacAOP.cs b/IRaCIS.Core.Application/AOP/TrialStatusAutofacAOP.cs
index 0e5ebf13..e1523b6d 100644
--- a/IRaCIS.Core.Application/AOP/TrialStatusAutofacAOP.cs
+++ b/IRaCIS.Core.Application/AOP/TrialStatusAutofacAOP.cs
@@ -62,7 +62,7 @@ namespace IRaCIS.Core.Application.AOP
                 var trialModel = (invocation.Arguments[0] as TrialCommand).IfNullThrowConvertException();
                 if (trialModel.Id == null || trialModel.Id == Guid.Empty)
                 {
-                    _provider.Set(result.Data.Id.ToString(), StaticData.TrialOngoing, TimeSpan.FromDays(1));
+                    _provider.Set(result.Data.Id.ToString(), StaticData.TrialState.TrialOngoing, TimeSpan.FromDays(1));
                 }
 
 
diff --git a/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs b/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
index c5b38a68..72926f15 100644
--- a/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
+++ b/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
@@ -94,7 +94,7 @@ namespace IRaCIS.Core.Application.Filter
 
 
                //  杩欓噷鏄粺涓�鎷︽埅 椤圭洰鏈夊叧鐨勬搷浣滃厑璁告儏鍐�(鐗规畩鐨勫湴鏂癸紝姣斿椤圭洰閰嶇疆锛堟湁鐨勫湪澶氱鐘舵�侊紙鍒濆鍖栵紝ongoing锛夐兘鍙互鎿嶄綔锛屾湁鐨勪粎浠呭湪Initializing锛夎繕鏈�  椤圭洰娣诲姞鍜屾洿鏂帮紝涓嶈蛋杩欓噷锛岀壒娈婂鐞�,涓嶇劧鍦ㄨ繖閲屾樉寰楀緢涔憋紝鍒ゆ柇鏄摢涓帴鍙�)
-                if (trialStatusStr.Value == StaticData.TrialOngoing)
+                if (trialStatusStr.Value == StaticData.TrialState.TrialOngoing)
                 {
 
                     await next.Invoke();
diff --git a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
index f6a275a3..e7b750ba 100644
--- a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
+++ b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
@@ -44,7 +44,7 @@ public static class FileStoreHelper
     {
         var rootPath = GetIRaCISRootPath(_hostEnvironment);
 
-        var rootFolder = Path.Combine(rootPath, StaticData.IRaCISDataFolder);
+        var rootFolder = Path.Combine(rootPath, StaticData.Folder.IRaCISDataFolder);
 
         return rootFolder;
     }
@@ -113,12 +113,12 @@ public static class FileStoreHelper
         var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
 
         //鏂囦欢绫诲瀷璺緞澶勭悊
-        var uploadFolderPath = Path.Combine(rootPath, StaticData.TrialDataFolder, trialId.ToString(), StaticData.SignDocumentFolder);
+        var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), StaticData.Folder.SignDocumentFolder);
         if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
 
         var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
 
-        var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.TrialDataFolder}/{trialId}/{StaticData.SignDocumentFolder}/{trustedFileNameForFileStorage}";
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{StaticData.Folder.SignDocumentFolder}/{trustedFileNameForFileStorage}";
 
         var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
 
@@ -132,13 +132,13 @@ public static class FileStoreHelper
 
 
         //鏂囦欢绫诲瀷璺緞澶勭悊
-        var uploadFolderPath = Path.Combine(rootPath, StaticData.SystemDataFolder, StaticData.SignDocumentFolder);
+        var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.SystemDataFolder, StaticData.Folder.SignDocumentFolder);
         if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
 
 
         var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
 
-        var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.SystemDataFolder}/{ StaticData.SignDocumentFolder}/{trustedFileNameForFileStorage}";
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.SystemDataFolder}/{ StaticData.Folder.SignDocumentFolder}/{trustedFileNameForFileStorage}";
 
         var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
 
@@ -152,14 +152,14 @@ public static class FileStoreHelper
         var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
 
         //鏂囦欢绫诲瀷璺緞澶勭悊
-        var uploadFolderPath = Path.Combine(rootPath, StaticData.SystemDataFolder, StaticData.DataTemplate);
+        var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.SystemDataFolder, StaticData.Folder.DataTemplate);
         if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
 
 
         var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
 
 
-        var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.SystemDataFolder}/{StaticData.DataTemplate}/{trustedFileNameForFileStorage}";
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.SystemDataFolder}/{StaticData.Folder.DataTemplate}/{trustedFileNameForFileStorage}";
 
         var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
 
@@ -173,7 +173,7 @@ public static class FileStoreHelper
         var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
 
         //鏂囦欢绫诲瀷璺緞澶勭悊
-        var uploadFolderPath = Path.Combine(rootPath, StaticData.SystemDataFolder, StaticData.NoticeAttachment);
+        var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.SystemDataFolder, StaticData.Folder.NoticeAttachment);
         if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
 
 
@@ -181,7 +181,7 @@ public static class FileStoreHelper
 
 
 
-        var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.SystemDataFolder}/{StaticData.NoticeAttachment}/{trustedFileNameForFileStorage}";
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.SystemDataFolder}/{StaticData.Folder.NoticeAttachment}/{trustedFileNameForFileStorage}";
 
         var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
 
@@ -194,7 +194,7 @@ public static class FileStoreHelper
         var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
 
         //涓婁紶鏍硅矾寰�
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.TrialDataFolder, trialId.ToString(), "CheckExcel");
+        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), "CheckExcel");
 
         if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
 
@@ -203,7 +203,7 @@ public static class FileStoreHelper
         var (trustedFileNameForFileStorage, realFileName) = FileStoreHelper.GetStoreFileName(fileName);
 
 
-        var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.TrialDataFolder}/{trialId}/CheckExcel/{trustedFileNameForFileStorage}";
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/CheckExcel/{trustedFileNameForFileStorage}";
 
         var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
 
@@ -215,14 +215,14 @@ public static class FileStoreHelper
     {
         var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
 
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.TrialDataFolder, trialId.ToString(),siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.TreatmenthistoryFolder);
+        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(),siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.Folder.TreatmenthistoryFolder);
 
         if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
 
         var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
 
 
-        var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.TreatmenthistoryFolder}/{trustedFileNameForFileStorage}";
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.TreatmenthistoryFolder}/{trustedFileNameForFileStorage}";
 
         var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
 
@@ -235,14 +235,14 @@ public static class FileStoreHelper
     {
         var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
 
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.TrialDataFolder, trialId.ToString(), siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.NoneDicomFolder);
+        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.Folder.NoneDicomFolder);
 
         if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
 
         var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
 
 
-        var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.NoneDicomFolder}/{trustedFileNameForFileStorage}";
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.NoneDicomFolder}/{trustedFileNameForFileStorage}";
 
         var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
 
@@ -268,7 +268,7 @@ public static class FileStoreHelper
 
 
 
-        var relativePath = $"/{StaticData.IRaCISDataFolder}/UploadFile/{doctorId}/{attachmentType}/{trustedFileNameForFileStorage}";
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/UploadFile/{doctorId}/{attachmentType}/{trustedFileNameForFileStorage}";
 
         var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
 
@@ -289,7 +289,7 @@ public static class FileStoreHelper
 
 
 
-        var relativePath = $"/{StaticData.IRaCISDataFolder}/UploadFile/{attachmentType}/{trustedFileNameForFileStorage}";
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/UploadFile/{attachmentType}/{trustedFileNameForFileStorage}";
 
         var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
 
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index a53aecc8..10cef6aa 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1911,21 +1911,6 @@
             鏋勯�犲嚱鏁版敞鍏�
             </summary>
         </member>
-        <member name="T:IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption">
-            <summary>
-            澶氱幆澧� 閰嶇疆鐜瀹炰綋
-            </summary>
-        </member>
-        <member name="T:IRaCIS.Core.Domain.Share.AppSettings">
-            <summary>
-            椤圭洰鍩虹閰嶇疆瑙勫垯
-            </summary>
-        </member>
-        <member name="F:IRaCIS.Core.Domain.Share.StaticData.DefaultPassword">
-            <summary>
-            鐢ㄦ埛榛樿瀵嗙爜
-            </summary>
-        </member>
         <member name="T:IRaCIS.Application.Services.BusinessFilter.UnifiedApiResultFilter">
             <summary>
              缁熶竴杩斿洖鍓嶇鏁版嵁鍖呰锛屼箣鍓嶅湪鎺у埗鍣ㄥ寘瑁咃紝鐜板湪淇敼涓哄姩鎬丄pi  鍦≧esultFilter杩欓噷鍖呰锛屽噺灏戦噸澶嶅啑浣欎唬鐮�
@@ -2447,13 +2432,6 @@
         <member name="M:IRaCIS.Application.Services.UserService.SendVerificationCode(System.String)">
             <summary>鍙戦�侀獙璇佺爜  淇敼閭锛堝凡缁忕櫥闄嗕慨鏀癸級 New </summary>
         </member>
-        <member name="M:IRaCIS.Application.Services.UserService.VerifyCanInitSetUserNameAndPwd(System.Guid)">
-            <summary>
-             Result  涓簍rue 鐨勬椂鍊� 璁や负閾炬帴娌℃湁澶辨晥
-            </summary>
-            <param name="userId"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Application.Services.UserService.ResetPassword(System.Guid)">
             <summary>
             閲嶇疆瀵嗙爜涓� 榛樿瀵嗙爜
diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs
index 1eb3f443..dd86a886 100644
--- a/IRaCIS.Core.Application/Service/Common/MailService.cs
+++ b/IRaCIS.Core.Application/Service/Common/MailService.cs
@@ -341,7 +341,7 @@ namespace IRaCIS.Application.Services
                    sysUserInfo.FullName,
                    sysUserInfo.UserName,
                    sysUserInfo.UserTypeRole.UserTypeShortName,
-                    StaticData.DefaultPassword
+                    AppSettings.DefaultPassword
                     );
             }
 
diff --git a/IRaCIS.Core.Application/Service/Doctor/EducationService.cs b/IRaCIS.Core.Application/Service/Doctor/EducationService.cs
index 9e7af546..05273e9d 100644
--- a/IRaCIS.Core.Application/Service/Doctor/EducationService.cs
+++ b/IRaCIS.Core.Application/Service/Doctor/EducationService.cs
@@ -55,13 +55,13 @@ namespace IRaCIS.Application.Services
                 var doctorEducationInfo = _mapper.Map<Education>(educationInfoViewModel);
                 switch (educationInfoViewModel.Degree)
                 {
-                    case StaticData.Bachelor:
+                    case StaticData.ReviewerDegree.Bachelor:
                         doctorEducationInfo.ShowOrder = 1;
                         break;
-                    case StaticData.Master:
+                    case StaticData.ReviewerDegree.Master:
                         doctorEducationInfo.ShowOrder = 2;
                         break;
-                    case StaticData.Doctorate:
+                    case StaticData.ReviewerDegree.Doctorate:
                         doctorEducationInfo.ShowOrder = 3;
                         break;
                 }
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs
index fbbf3a4f..02ff5f2e 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs
@@ -67,10 +67,10 @@ namespace IRaCIS.Core.Application.Services
             }
 
 
-            var anonymize_AddFixedFiledList = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize_AddFixedFiled).Value;
-            var anonymize_AddIRCInfoFiled = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize_AddIRCInfoFiled).Value;
-            var anonymize_FixedField = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize_FixedField).Value;
-            var anonymize_IRCInfoField = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize_IRCInfoField).Value;
+            var anonymize_AddFixedFiledList = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_AddFixedFiled).Value;
+            var anonymize_AddIRCInfoFiled = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_AddIRCInfoFiled).Value;
+            var anonymize_FixedField = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_FixedField).Value;
+            var anonymize_IRCInfoField = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_IRCInfoField).Value;
 
 
 
@@ -242,7 +242,7 @@ namespace IRaCIS.Core.Application.Services
                 var dbStudyCodeIntMax = _studyRepository.Where(s => s.TrialId == addtionalInfo.TrialId).Select(t => t.Code).DefaultIfEmpty().Max();
 
                 //鑾峰彇缂撳瓨涓殑鍊� 骞跺彂鐨勬椂鍊欙紝闇�瑕佽褰曪紝宸茶鍗犵敤鐨勫�� 杩欐牱鍏朵粬绾跨▼鍦ㄦ鍗犵敤鐨勬渶澶х殑鍊间笂閫掑
-                var cacheMaxCodeInt = _provider.Get<int>($"{addtionalInfo.TrialId }_{ StaticData.StudyMaxCode}").Value;
+                var cacheMaxCodeInt = _provider.Get<int>($"{addtionalInfo.TrialId }_{ StaticData.CacheKey.StudyMaxCode}").Value;
 
                 int currentNextCodeInt = cacheMaxCodeInt > dbStudyCodeIntMax ? cacheMaxCodeInt + 1 : dbStudyCodeIntMax + 1;
 
@@ -250,7 +250,7 @@ namespace IRaCIS.Core.Application.Services
 
                 dicomStudy.StudyCode = AppSettings.GetCodeStr(currentNextCodeInt, nameof(DicomStudy)); 
 
-                _provider.Set<int>($"{addtionalInfo.TrialId }_{ StaticData.StudyMaxCode}", dicomStudy.Code, TimeSpan.FromMinutes(30));
+                _provider.Set<int>($"{addtionalInfo.TrialId }_{ StaticData.CacheKey.StudyMaxCode}", dicomStudy.Code, TimeSpan.FromMinutes(30));
 
             }
 
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/Helper/DicomFileStoreHelper.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/Helper/DicomFileStoreHelper.cs
index 70e8f2c6..7c90547d 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/Helper/DicomFileStoreHelper.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/Helper/DicomFileStoreHelper.cs
@@ -24,14 +24,14 @@ namespace IRaCIS.Core.Application
             var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
 
             //涓婁紶鏍硅矾寰�
-            _fileStorePath = Path.Combine(rootPath, StaticData.TrialDataFolder);
+            _fileStorePath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder);
 
         }
 
         public  string GetInstanceFilePath(DicomStudy dicomStudy, Guid seriesId, string instanceId)
         {
             return Path.Combine(_fileStorePath,  dicomStudy.TrialId.ToString(),
-                dicomStudy.SiteId.ToString(), dicomStudy.SubjectId.ToString(), dicomStudy.SubjectVisitId.ToString(), StaticData.DicomFolder, dicomStudy.Id.ToString(),  instanceId.ToString() + ".dcm");
+                dicomStudy.SiteId.ToString(), dicomStudy.SubjectId.ToString(), dicomStudy.SubjectVisitId.ToString(), StaticData.Folder.DicomFolder, dicomStudy.Id.ToString(),  instanceId.ToString() + ".dcm");
         }
 
 
@@ -40,7 +40,7 @@ namespace IRaCIS.Core.Application
 
             //鍔犲叆璁胯灞傜骇  鍜孌ata
             var path = Path.Combine(_fileStorePath,  dicomStudy.TrialId.ToString(),
-                dicomStudy.SiteId.ToString(), dicomStudy.SubjectId.ToString(), dicomStudy.SubjectVisitId.ToString(), StaticData.DicomFolder, dicomStudy.Id.ToString());
+                dicomStudy.SiteId.ToString(), dicomStudy.SubjectId.ToString(), dicomStudy.SubjectVisitId.ToString(), StaticData.Folder.DicomFolder, dicomStudy.Id.ToString());
 
             if (!Directory.Exists(path))
             {
@@ -53,7 +53,7 @@ namespace IRaCIS.Core.Application
         public string GetSubjectVisitPath(Guid trialId,Guid siteId,Guid subjectId, Guid subjectVisitId)
         {
             return Path.Combine(_fileStorePath, trialId.ToString(),
-                siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.DicomFolder);
+                siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.Folder.DicomFolder);
         }
 
         //public static string CreateInstanceFilePath(DicomStudy dicomStudy, Guid seriesId, Guid instanceId)
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index ce13901f..14259ac4 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -252,7 +252,7 @@ namespace IRaCIS.Application.Services
 
             await _userRepository.UpdatePartialNowNoQueryAsync(userId, u => new User()
             {
-                Password = MD5Helper.Md5(StaticData.DefaultPassword),
+                Password = MD5Helper.Md5(AppSettings.DefaultPassword),
                 IsFirstAdd = true
             });
 
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs
index 8d121c76..a1bf8aea 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs
@@ -11,7 +11,6 @@ namespace IRaCIS.Core.Application.Contracts
     public class NoneDicomStudyView:NoneDicomStudyAddOrEdit
     {
         public string CodeView { get; set; }
-        public int Code {get;set;}
    
         public int FileCount { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index 9dd1204b..83e77a1b 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -192,7 +192,6 @@ namespace IRaCIS.Core.Application.Contracts
 
         public bool IsTrialProcessConfirmed { get; set; }
 
-        public bool IsTrialBasicLogicConfirmed { get; set; }
 
         public bool IsTrialUrgentConfirmed { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index f0c596aa..8d38f69b 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -56,7 +56,7 @@ namespace IRaCIS.Core.Application
         //楠岃瘉  浠呬粎鍦� Initializing/Ongoing  鎵嶅彲浠ユ搷浣�
         private async Task VerifyOnlyInOngoingOrInitialIzingOptAsync(Guid trialId)
         {
-            if (!await _trialRepository.AnyAsync(t => t.Id == trialId && (t.TrialStatusStr == StaticData.TrialInitializing || t.TrialStatusStr == StaticData.TrialOngoing)))
+            if (!await _trialRepository.AnyAsync(t => t.Id == trialId && (t.TrialStatusStr == StaticData.TrialState.TrialInitializing || t.TrialStatusStr == StaticData.TrialState.TrialOngoing)))
             {
                 throw new BusinessValidationFailedException("璇ラ」鐩凡缁撴潫鎴栧仠姝紝涓嶅厑璁镐慨鏀归厤缃��");
             }
@@ -185,7 +185,7 @@ namespace IRaCIS.Core.Application
 
             var trial = (await _trialRepository.Where(t => t.Id == trialId, true).IgnoreQueryFilters().FirstOrDefaultAsync()).IfNullThrowException();
 
-            if (trialStatusStr == StaticData.TrialOngoing)
+            if (trialStatusStr == StaticData.TrialState.TrialOngoing)
             {
                 if (trial.IsTrialBasicLogicConfirmed && trial.IsTrialProcessConfirmed && trial.IsTrialUrgentConfirmed && trial.VisitPlanConfirmed)
                 {
@@ -197,12 +197,12 @@ namespace IRaCIS.Core.Application
                 }
             }
 
-            if((trialStatusStr == StaticData.TrialStopped|| trialStatusStr == StaticData.TrialCompleted)&& trial.TrialStatusStr!= StaticData.TrialOngoing)
+            if((trialStatusStr == StaticData.TrialState.TrialStopped|| trialStatusStr == StaticData.TrialState.TrialCompleted)&& trial.TrialStatusStr!= StaticData.TrialState.TrialOngoing)
             {
                 return ResponseOutput.NotOk("椤圭洰娌℃湁杩涘叆鍚姩鐘舵�侊紝涓嶈兘璁剧疆涓哄仠姝㈡垨瀹屾垚鐘舵��");
             }
 
-            if (trialStatusStr != StaticData.TrialOngoing)
+            if (trialStatusStr != StaticData.TrialState.TrialOngoing)
             {
                 trial.TrialFinishTime = DateTime.Now;
             }
@@ -213,7 +213,7 @@ namespace IRaCIS.Core.Application
 
 
             //Paused銆� 娣诲姞宸ユ�婚噺  绠楀尰鐢熻鐗囦腑
-            if (trialStatusStr.Contains(StaticData.TrialCompleted))
+            if (trialStatusStr.Contains(StaticData.TrialState.TrialCompleted))
             {
                 await _repository.BatchUpdateAsync<Enroll>(u => u.TrialId == trialId, e => new Enroll
                 {
@@ -296,7 +296,7 @@ namespace IRaCIS.Core.Application
         [Authorize(Policy = IRaCISPolicy.PM_APM)]
         public async Task<IResponseOutput> ConfigTrialProcessInfo(TrialProcessConfig trialConfig)
         {
-            if (!await _trialRepository.Where(t => t.Id == trialConfig.TrialId).IgnoreQueryFilters().AnyAsync(t => t.TrialStatusStr == StaticData.TrialInitializing))
+            if (!await _trialRepository.Where(t => t.Id == trialConfig.TrialId).IgnoreQueryFilters().AnyAsync(t => t.TrialStatusStr == StaticData.TrialState.TrialInitializing))
             {
                 return ResponseOutput.NotOk("璇ラ」鐩綋鍓嶇姸鎬佷笉鏄垵濮嬪寲锛屼笉鍏佽杩涜璇ユ搷浣溿��");
             }
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
index 39de74b8..05229375 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
@@ -51,7 +51,7 @@ namespace IRaCIS.Application.Services
             var no = 1;
             exportInfo.TrialUserList.ForEach(t => t.No = no++);
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.TrialUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment);
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment);
 
         }
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
index 064f171c..b5c14e72 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
@@ -187,7 +187,7 @@ namespace IRaCIS.Application.Services
 
                 var success = await _repository.SaveChangesAsync();
 
-                _provider.Set(trial.Id.ToString(), StaticData.TrialInitializing, TimeSpan.FromDays(7));
+                _provider.Set(trial.Id.ToString(), StaticData.TrialState.TrialInitializing, TimeSpan.FromDays(7));
 
                 return ResponseOutput.Ok(trial);
             }
@@ -195,7 +195,7 @@ namespace IRaCIS.Application.Services
             {
                 var updateModel = trialAddModel;
 
-                if (!await _repository.AnyAsync<Trial>(u => u.Id == trialAddModel.Id && (u.TrialStatusStr == StaticData.TrialInitializing || u.TrialStatusStr == StaticData.TrialOngoing)))
+                if (!await _repository.AnyAsync<Trial>(u => u.Id == trialAddModel.Id && (u.TrialStatusStr == StaticData.TrialState.TrialInitializing || u.TrialStatusStr == StaticData.TrialState.TrialOngoing)))
                 {
                     throw new BusinessValidationFailedException("椤圭洰鐘舵�佸彧鏈夊浜庯細鍒濆鍖栨垨鑰呰繘琛屼腑鏃讹紝鎵嶅厑璁告搷浣溿��");
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
index 232125fd..e57c2d2d 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
@@ -62,7 +62,7 @@ namespace IRaCIS.Core.Application.Services
             var no = 1;
             exportInfo.TrialSiteUserList.ForEach(t => t.No = no++);
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.TrialSiteUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment);
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSiteUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment);
 
         }
 
@@ -115,7 +115,7 @@ namespace IRaCIS.Core.Application.Services
             var no = 1;
             exportInfo.TrialSiteUserList.ForEach(t => t.No = no++);
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.TrialSiteUserSummary_Export, exportInfo, exportInfo.TrialCode,   _commonDocumentRepository, _hostEnvironment);
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSiteUserSummary_Export, exportInfo, exportInfo.TrialCode,   _commonDocumentRepository, _hostEnvironment);
 
         }
 
diff --git a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
index 56f64704..8602d395 100644
--- a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
@@ -87,7 +87,7 @@ namespace IRaCIS.Application.Services
         public async Task<IResponseOutput> AddOrUpdateVisitStage(VisitPlanCommand visitPlan)
         {
 
-            if (!await _trialRepository.Where(t => t.Id == visitPlan.TrialId).IgnoreQueryFilters().AnyAsync(t => t.TrialStatusStr == StaticData.TrialOngoing || t.TrialStatusStr == StaticData.TrialInitializing))
+            if (!await _trialRepository.Where(t => t.Id == visitPlan.TrialId).IgnoreQueryFilters().AnyAsync(t => t.TrialStatusStr == StaticData.TrialState.TrialOngoing || t.TrialStatusStr == StaticData.TrialState.TrialInitializing))
             {
                 throw new BusinessValidationFailedException("鍙湁褰撻」鐩姸鎬佷负锛氬垵濮嬪寲鎴栬繘琛屼腑鏃讹紝鍙互鎿嶄綔銆� ");
             }
@@ -217,7 +217,7 @@ namespace IRaCIS.Application.Services
         [Authorize(Policy = IRaCISPolicy.PM_APM)]
         public async Task<IResponseOutput> ConfirmTrialVisitPlan(Guid trialId)
         {
-            if (!await _trialRepository.AnyAsync(t => t.Id == trialId && (t.TrialStatusStr == StaticData.TrialInitializing || t.TrialStatusStr == StaticData.TrialOngoing)))
+            if (!await _trialRepository.AnyAsync(t => t.Id == trialId && (t.TrialStatusStr == StaticData.TrialState.TrialInitializing || t.TrialStatusStr == StaticData.TrialState.TrialOngoing)))
             {
                 return ResponseOutput.NotOk("浠呬粎鍦ㄩ」鐩垵濮嬪寲鎴栬�呰繘琛屼腑鏃讹紝鎵嶅厑璁镐慨鏀圭‘璁�");
             }
diff --git a/IRaCIS.Core.Application/_MediatR/Handlers/AnonymizeCacheHandler.cs b/IRaCIS.Core.Application/_MediatR/Handlers/AnonymizeCacheHandler.cs
index 476daeb9..6fb08a74 100644
--- a/IRaCIS.Core.Application/_MediatR/Handlers/AnonymizeCacheHandler.cs
+++ b/IRaCIS.Core.Application/_MediatR/Handlers/AnonymizeCacheHandler.cs
@@ -31,10 +31,10 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
         {
             var systemAnonymizationList = _repository.Where<SystemAnonymization>(t => t.IsEnable).ToList();
 
-            _provider.Set(StaticData.Anonymize_AddFixedFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed).ToList(), TimeSpan.FromDays(7));
-            _provider.Set(StaticData.Anonymize_AddIRCInfoFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed == false).ToList(), TimeSpan.FromDays(7));
-            _provider.Set(StaticData.Anonymize_FixedField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed).ToList(), TimeSpan.FromDays(7));
-            _provider.Set(StaticData.Anonymize_IRCInfoField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed == false).ToList(), TimeSpan.FromDays(7));
+            _provider.Set(StaticData.Anonymize.Anonymize_AddFixedFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed).ToList(), TimeSpan.FromDays(7));
+            _provider.Set(StaticData.Anonymize.Anonymize_AddIRCInfoFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed == false).ToList(), TimeSpan.FromDays(7));
+            _provider.Set(StaticData.Anonymize.Anonymize_FixedField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed).ToList(), TimeSpan.FromDays(7));
+            _provider.Set(StaticData.Anonymize.Anonymize_IRCInfoField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed == false).ToList(), TimeSpan.FromDays(7));
 
             return Task.FromResult(true);
         }
diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs
index 6ff5f1fd..376c5134 100644
--- a/IRaCIS.Core.Domain/Trial/Trial.cs
+++ b/IRaCIS.Core.Domain/Trial/Trial.cs
@@ -77,7 +77,7 @@ namespace IRaCIS.Core.Domain.Models
 
         //启动状态
         [StringLength(500)]
-        public string TrialStatusStr { get; set; } = StaticData.TrialInitializing;
+        public string TrialStatusStr { get; set; } = StaticData.TrialState.TrialInitializing;
 
 
         public List<TrialStateChange> TrialStateChangeList { get; set; } = new List<TrialStateChange>();
diff --git a/IRaCIS.Core.Application/Config/_AppSettings.cs b/IRaCIS.Core.Domain/_Config/_AppSettings.cs
similarity index 88%
rename from IRaCIS.Core.Application/Config/_AppSettings.cs
rename to IRaCIS.Core.Domain/_Config/_AppSettings.cs
index f562e5c4..02397c70 100644
--- a/IRaCIS.Core.Application/Config/_AppSettings.cs
+++ b/IRaCIS.Core.Domain/_Config/_AppSettings.cs
@@ -1,4 +1,5 @@
-锘縰sing Microsoft.Extensions.Configuration;
+锘縰sing IRaCIS.Core.Domain.Models;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration.Json;
 
 namespace IRaCIS.Core.Domain.Share
@@ -34,6 +35,12 @@ namespace IRaCIS.Core.Domain.Share
         public static string NoneDicomStudyCodePrefix { get; set; }
 
 
+        /// <summary>
+        /// 鐢ㄦ埛榛樿瀵嗙爜
+        /// </summary>
+        public static readonly string DefaultPassword = "123456";
+
+
         static AppSettings()
         {
             var configuration = new ConfigurationBuilder()
@@ -49,7 +56,7 @@ namespace IRaCIS.Core.Domain.Share
             QCChallengeCodePrefix = configuration.GetSection("IRaCISBasicConfig").GetValue<string>("QCChallengeCodePrefix");
             NoneDicomStudyCodePrefix = configuration.GetSection("IRaCISBasicConfig").GetValue<string>("NoneDicomStudyCodePrefix");
             DicomStudyCodePrefix = configuration.GetSection("IRaCISBasicConfig").GetValue<string>("DicomStudyCodePrefix");
-
+            DefaultPassword= configuration.GetSection("IRaCISBasicConfig").GetValue<string>("DefaultPassword");
         }
 
 
diff --git a/IRaCIS.Core.Application/Config/_StaticData.cs b/IRaCIS.Core.Domain/_Config/_StaticData.cs
similarity index 64%
rename from IRaCIS.Core.Application/Config/_StaticData.cs
rename to IRaCIS.Core.Domain/_Config/_StaticData.cs
index bb37225b..bb8b43ec 100644
--- a/IRaCIS.Core.Application/Config/_StaticData.cs
+++ b/IRaCIS.Core.Domain/_Config/_StaticData.cs
@@ -1,28 +1,35 @@
-锘縩amespace IRaCIS.Core.Domain.Share
+锘縩amespace IRaCIS.Core.Domain.Share;
+
+public static class StaticData
 {
-    public static class StaticData
+
+
+
+    #region 瀛楀吀琛ㄩ」鍥哄畾鍊�
+
+
+    public static readonly string Title = "Title";
+    public static readonly string ReadingType = "ReadingType";
+    public static readonly string Subspeciality = "Subspeciality";
+
+    public static readonly string Modality = "Modality";
+    public static readonly string Criterion = "Criterion";
+    public static readonly string ReviewType = "ReviewType";
+    public static readonly string ReadingStandard = "ReadingStandard";
+
+
+
+
+
+
+
+    #endregion
+
+
+    public static class Folder
     {
-        /// <summary>
-        /// 鐢ㄦ埛榛樿瀵嗙爜
-        /// </summary>
-        public static readonly string DefaultPassword = "123456";
-
-        public static string StudyMaxCode = "StudyMaxCode";
-
-        public static string Question = "Question";
-
-        #region 瀛楀吀琛ㄩ」鍥哄畾鍊�
-        public static readonly string Title = "Title";
-        public static readonly string ReadingType = "ReadingType";
-        public static readonly string Subspeciality = "Subspeciality";
-        public static readonly string Modality = "Modality";
-        public static readonly string Criterion = "Criterion";
-        public static readonly string ReviewType = "ReviewType";
-        public static readonly string ReadingStandard = "ReadingStandard";
-
-
-
         public static readonly string TrialDataFolder = "TrialData";
+
         public static readonly string SystemDataFolder = "SystemData";
 
 
@@ -42,28 +49,42 @@
 
         public static readonly string DicomFolder = "Dicom";
         public static readonly string NoneDicomFolder = "NoneDicom";
-        public static readonly string UploadFileFolder = "UploadFile"; 
+        public static readonly string UploadFileFolder = "UploadFile";
         public static readonly string TreatmenthistoryFolder = "Treatmenthistory";
 
 
         public static readonly string CommonFileFolder = "CommonFileFolder";
         public static readonly string SystemNoticeFolder = "SystemNoticeFolder";
+    }
+
+
+   
+
+
+    public static class CacheKey
+    {
+        public static string StudyMaxCode = "StudyMaxCode";
+    }
 
 
 
-
-        #endregion
-
-        #region Reviewer Degree
+    /// <summary>
+    /// 鍖荤敓瀛︿綅绛夌骇
+    /// </summary>
+    public static class ReviewerDegree
+    {
         public const string Bachelor = "Bachelor";
         public const string Master = "Master";
         public const string Doctorate = "Doctorate";
-        #endregion
+    }
 
 
 
-        #region TrialStatusStr
-
+    /// <summary>
+    /// 椤圭洰鐘舵��
+    /// </summary>
+    public static class TrialState
+    {
         public const string TrialInitializing = "Initializing";
 
         public const string TrialOngoing = "Ongoing";
@@ -71,13 +92,18 @@
         public const string TrialCompleted = "Completed";
 
         public const string TrialStopped = "Stopped";
-
-        #endregion
+    }
 
 
 
-        #region 鍖垮悕鍖�
 
+
+
+    /// <summary>
+    /// 鍖垮悕鍖栭厤缃� key
+    /// </summary>
+    public static class Anonymize
+    {
         public const string Anonymize_FixedField = "Anonymize_FixedField";
 
         public const string Anonymize_IRCInfoField = "Anonymize_IRCInfoField";
@@ -85,23 +111,29 @@
         public const string Anonymize_AddFixedFiled = "Anonymize_AddFixedFiled";
 
         public const string Anonymize_AddIRCInfoFiled = "Anonymize_AddIRCInfoFiled";
-
-
-        #endregion
+    }
 
 
 
-        #region 椤圭洰浜哄憳瀵煎嚭  
 
+
+
+    /// <summary>
+    /// 瀵煎嚭妯℃澘code
+    /// </summary>
+    public static class Export
+    {
         public const string TrialSiteUserList_Export = "TrialSiteUserList_Export";
 
         public const string TrialSiteUserSummary_Export = "TrialSiteUserSummary_Export";
 
         public const string TrialUserList_Export = "TrialUserList_Export";
-        
-
-        #endregion
     }
 
 
-}
\ No newline at end of file
+
+
+}
+
+
+