+进度条查看检验检查项目是否出结果；团体默认搜索世界范围加长。

PEIS/View/Enrollment/EnrollmentOrgForm.cs

@@ -202,7 +202,7 @@ namespace PEIS.View.Enrollment
 
         private void EnrollmentOrgForm_Shown(object sender, EventArgs e)
         {
-            DtpBegDate.Value = DateTime.Now.AddDays(-3);
+            DtpBegDate.Value = DateTime.Now.AddDays(-15);
             DtpEndDate.Value = DateTime.Now;
             RiCmbExamType.Items.Add("已婚/未婚");
             RiCmbExamType.Items.AddRange(Global._lstConfig.Where(a => a.Key.Equals("ExamType")).ToList().Select(a => a.Value).ToList());

PEIS/View/MainForm.cs

@@ -29,7 +29,7 @@ namespace PEIS.View
 
         private static bool _isCloseMainForm = false;
         // 是否显示进度条
-        private static bool _isShowStepViewer = false;
+        private static bool _isShowStepViewer = true;
 
         public MainForm()
         {

PEIS/View/UControl/StepViewer.cs

@@ -181,7 +181,7 @@ namespace PEIS.View.UControl
         }
 
         // 签到-科室分检-总检-打印
-        public List<StepModel> GetDataList(long? eid)
+        public List<StepModel> GetDataList2(long? eid)
         {
             var list = new List<StepModel>();
             if (eid == null)
@@ -243,7 +243,75 @@ WHERE A.EID = {Eid} AND c.VerifyTime IS NULL AND B.IsHide=0 AND A.GiveUpTime IS
             return list;
         }
 
-        public List<StepModel> GetDefaultDataList()
+
+        // 签到-科室分检-总检-打印
+        public List<StepModel> GetDataList(long? eid)
+        {
+            var list = new List<StepModel>();
+            if (eid == null)
+            {
+                return GetDefaultDataList();
+            }
+
+            var data = DAOHelp.GetDataBySQL<ExamPart>($@"
+                SELECT DISTINCT A.ID AS EID,A.Name as PatientName,A.SignTime ,A.FinishTime ,a.PrintTime
+                FROM Enrollment_Patient A
+                WHERE A.ID={eid}").FirstOrDefault();
+            if (data.SignTime == null)
+            {
+                list.Add(new StepModel("签到", $"进行中", $"体检者：{eid}，{data.PatientName}", true));
+                list.Add(new StepModel("检验项目"));
+                list.Add(new StepModel("检查项目"));
+                list.Add(new StepModel("打印"));
+                return list;
+            }
+            list.Add(new StepModel("签到", $"{data.SignTime:yyyy-MM-dd HH:mm}", $"体检者：{eid}，{data.PatientName}"));
+           
+            if (data.PrintTime != null || data.FinishTime != null)
+            {
+                list.Add(new StepModel("检验项目",  $"已完成"));
+                list.Add(new StepModel("检查项目", $"已完成"));
+                var addItem = data.PrintTime != null
+                    ? new StepModel("打印", $"{data.PrintTime:yyyy-MM-dd HH:mm}", "已打印", true)
+                    : new StepModel("打印", "未打印", "", true);
+                list.Add(addItem);
+                return list;
+            } 
+            var reports = DAOHelp.GetDataBySQL<Report>($@"
+                SELECT STUFF((
+                    SELECT DISTINCT '，' + req_reason
+                    FROM lis.rmcloudlis7.dbo.vw_checked_labresult A
+                    WHERE pat_no = '11201' AND pat_typecode = 4
+                    FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 1, '') AS Title,Class='检验'
+                   union  
+                    SELECT Title,Class='检查' FROM Report WHERE EID=11201
+                ");
+            var lisItem = reports.FirstOrDefault(p => p.Class == "检验")?.Title;
+
+            if (!string.IsNullOrEmpty(lisItem))
+            {
+                list.Add(new StepModel("检验项目", $"已完成", lisItem, true)); 
+            }
+            else
+            {
+                list.Add(new StepModel("检验项目", $"结果未出", "",true));
+
+            }
+            var pacsItem = reports.FirstOrDefault(p => p.Class == "检查")?.Title;
+            if (!string.IsNullOrEmpty(pacsItem))
+            {
+                list.Add(new StepModel("检查项目", $"已完成", pacsItem));
+            }
+            else
+            {
+                list.Add(new StepModel("检查项目", $"结果未出", ""));
+
+            }
+            list.Add(new StepModel("打印"));
+            return list;
+        }
+
+        public List<StepModel> GetDefaultDataList2()
         {
             return new List<StepModel>()
              {
@@ -253,6 +321,16 @@ WHERE A.EID = {Eid} AND c.VerifyTime IS NULL AND B.IsHide=0 AND A.GiveUpTime IS
                  new StepModel("打印"),
              };
         }
+        public List<StepModel> GetDefaultDataList()
+        {
+            return new List<StepModel>()
+            {
+                new StepModel("签到" ),
+                new StepModel("检验项目" ),
+                new StepModel("检查项目"),
+                new StepModel("打印"),
+            };
+        }
 
         private void TimelinePanel_Paint(object sender, PaintEventArgs e)
         {