修改访视查询

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -1,5 +1,4 @@
 using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Infrastructure.Extention;
 using System.ComponentModel.DataAnnotations;
 
 namespace IRaCIS.Core.Application.Contracts
@@ -136,7 +135,6 @@ namespace IRaCIS.Core.Application.Contracts
         public DateTime? SubmitTime { get; set; }
         public AuditStateEnum AuditState { get; set; }
 
-        public ChallengeStateEnum ChallengeState { get; set; }
 
         public int? DicomStudyCount { get; set; }
         public int? NoneDicomStudyCount { get; set; }

IRaCIS.Core.Application/Service/QC/QCListService.cs

@@ -31,16 +31,20 @@ namespace IRaCIS.Core.Application.Image.QA
                 var inPlanArray = VisitPlanArray.Where(t => !t.Contains('.')).Select(t => decimal.Parse(t)).ToArray();
                 var isSelectOutPlan = VisitPlanArray.Any(t => t.Contains('.'));
 
-                if (isSelectOutPlan)
-                {
-                    svExpression = svExpression.And(t => t.InPlan == false);
-
-                }
 
                 if (inPlanArray.Length > 0)
                 {
-                    svExpression.Or(t => inPlanArray.Contains(t.VisitNum));
+                    svExpression = svExpression.And(t => inPlanArray.Contains(t.VisitNum));
                 }
+
+
+                if (isSelectOutPlan)
+                {
+                    svExpression = svExpression.Or(t => t.InPlan == false);
+              
+                }
+
+               
             }
 
             return svExpression;
@@ -58,16 +62,19 @@ namespace IRaCIS.Core.Application.Image.QA
                 var inPlanArray = VisitPlanArray.Where(t => !t.Contains('.')).Select(t => decimal.Parse(t)).ToArray();
                 var isSelectOutPlan = VisitPlanArray.Any(t => t.Contains('.'));
 
-                if (isSelectOutPlan)
-                {
-                    svExpression = svExpression.And(t => t.SubjectVisit.InPlan == false);
-
-                }
 
                 if (inPlanArray.Length > 0)
                 {
-                    svExpression.Or(t => inPlanArray.Contains(t.SubjectVisit.VisitNum));
+                    svExpression = svExpression.And(t => inPlanArray.Contains(t.SubjectVisit.VisitNum));
                 }
+
+                if (isSelectOutPlan)
+                {
+                    svExpression = svExpression.Or(t => t.SubjectVisit.InPlan == false);
+
+                }
+
+               
             }
 
             return svExpression;