增加搜索条件

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

@@ -3680,6 +3680,11 @@
             单位
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.DataSource">
+            <summary>
+            数据来源
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.DictionaryCode">
             <summary>
             字典code
@@ -3713,6 +3718,11 @@
             数值类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.DataSource">
+            <summary>
+            数据来源
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.Unit">
             <summary>
             单位
@@ -4001,11 +4011,21 @@
             自定义计算标记
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.DataSource">
+            <summary>
+            数据来源
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ValueType">
             <summary>
             数值类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.DataSource">
+            <summary>
+            数据来源
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.Unit">
             <summary>
             单位
@@ -4266,6 +4286,11 @@
             数值类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.DataSource">
+            <summary>
+            数据来源
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.Unit">
             <summary>
             单位
@@ -4536,6 +4561,11 @@
             数值类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.DataSource">
+            <summary>
+            数据来源
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.Unit">
             <summary>
             单位

IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs

@@ -97,6 +97,12 @@ namespace IRaCIS.Core.Application.ViewModel
         public bool? IsUrgent { get; set; }
         public Guid? DoctorUserId { get; set; }
 
+
+        public TaskState? TaskState { get; set; }
+
+        public MedicalReviewAuditState? AuditState { get; set; }
+
+
         public ReadingCategory? ReadingCategory { get; set; }
 
         public ReadingTaskState? ReadingTaskState { get; set; }

IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs

@@ -61,7 +61,8 @@ namespace IRaCIS.Core.Application.Service
                              .WhereIf(inQuery.DoctorUserId != null, t => t.VisitTask.DoctorUserId == inQuery.DoctorUserId)
                              .WhereIf(!string.IsNullOrEmpty(inQuery.TrialSiteCode), t => (t.VisitTask.BlindTrialSiteCode.Contains(inQuery.TrialSiteCode) && t.VisitTask.IsAnalysisCreate) || (t.VisitTask.Subject.TrialSite.TrialSiteCode.Contains(inQuery.TrialSiteCode) && t.VisitTask.IsAnalysisCreate == false))
                              .WhereIf(inQuery.ReadingCategory != null, t => t.VisitTask.ReadingCategory == inQuery.ReadingCategory)
-                             .WhereIf(inQuery.ReadingTaskState != null, t => t.VisitTask.ReadingTaskState == inQuery.ReadingTaskState)
+                             .WhereIf(inQuery.TaskState != null, t => t.VisitTask.TaskState == inQuery.TaskState)
+                             .WhereIf(inQuery.AuditState != null, t => t.AuditState == inQuery.AuditState)
 
                                .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
                              .ProjectTo<TaskMedicalReviewView>(_mapper.ConfigurationProvider);