diff --git a/IRaCIS.Core.API/wwwroot/swagger/ui/abp.swagger.js b/IRaCIS.Core.API/wwwroot/swagger/ui/abp.swagger.js
index eb708cbbd..30ec9c833 100644
--- a/IRaCIS.Core.API/wwwroot/swagger/ui/abp.swagger.js
+++ b/IRaCIS.Core.API/wwwroot/swagger/ui/abp.swagger.js
@@ -414,8 +414,8 @@ var abp = abp || {};
 
         //Inputs
         createInput(modalUxContent, 'tenancyName', 'Tenancy Name (Leave empty for Host)');
-        createInput(modalUxContent, 'userName', 'Username or email address','text','admin');
-        createInput(modalUxContent, 'password', 'Password','password');
+        createInput(modalUxContent, 'userName', 'Username or email address','text','cyldev');
+        createInput(modalUxContent, 'password', 'Password','password','123456');
 
         //Buttons
         var authBtnWrapper = document.createElement('div');
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 6a15dec63..68e3841c2 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -3166,6 +3166,11 @@
             最大长度
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionBase.MaxQuestionCount">
+            <summary>
+            最大行数
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalQuestionBase.ClinicalOptionTypeEnum">
             <summary>
             临床数据选项类型(无，自定义)
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
index 110f6c134..82ca5b6c0 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
@@ -144,6 +144,8 @@ namespace IRaCIS.Application.Services
               .WhereIf(indto.Id != null, x => x.Id != indto.Id)
               .Where(x => x.ClinicalDataSetName == indto.ClinicalDataSetName||x.ClinicalDataSetEnName==indto.ClinicalDataSetEnName);
 
+       
+
             if (await existsQuery.AnyAsync())
             {
                 //---存在同类型的临床数据,操作失败
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
index a7110f446..cfab3edde 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
@@ -303,6 +303,7 @@ namespace IRaCIS.Core.Application.Service
         {
 
             var systemClinicalQuestionQueryable = _systemClinicalQuestionRepository
+                .Where(x=>x.SystemClinicalId==inQuery.SystemClinicalId)
                 .WhereIf(!inQuery.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inQuery.QuestionName) || x.QuestionEnName.Contains(inQuery.QuestionName))
              .ProjectTo<SystemClinicalQuestionDto>(_mapper.ConfigurationProvider);
             var pageList = await systemClinicalQuestionQueryable