修复与优化

1.蒙自CA登录界面显示调整
2.统计功能时间节点表增加新列
3.应用模板功能SQL优化
4.取消登记检查项目时，校验是否已在PACS登记的SQL准确性优化
5.分检界面增加对空结果项目和LIS未出报告项目的校验提示

PEIS/App.config

@@ -25,7 +25,9 @@
     <!--宁蒗中医院 192.168.201.73-->
     <!--<add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C70DC3B8A49169216C1749C51F4EDF5B75A5049148D112117979F484C7F946E0D5E74F84A273B2485C1FB00BDFF13CE76F00379FFA912E2DF6A43D30E4CB54F8E7EBEA0C92081E71F8"/>-->
     <!--宁蒗人民医院 192.168.200.19-->
-    <add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C7CF640EDF7D1D64EE231892101DA02749D2906C6B1906BE5590C6569CE5EBD58E3CF971E9DBB5FBA5D123DCDB354151ACA9C0475E92B4CA139BF42E8D9D202DA05369AA00AA32358E"/>
+    <!--<add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C7CF640EDF7D1D64EE231892101DA02749D2906C6B1906BE5590C6569CE5EBD58E3CF971E9DBB5FBA5D123DCDB354151ACA9C0475E92B4CA139BF42E8D9D202DA05369AA00AA32358E"/>-->
+    <!--陇川仁和 200.200.200.8 -->
+    <add name="ConnString" connectionString="10C598E364BCAFCF71617738597417B368D095FA1A37D76C6C9B610BF291577390C83CED066A8A94F7FA86C5AE2A3676420A6592982126CF4ED0926BC03AFD66CA82525BF20AD713AD02F9F4D92DE131"/>
   </connectionStrings>
   <entityFramework>
     <providers>

PEIS/Entity/PeopleDateTime.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace PEIS.Entity
+{
+    public class PeopleDateTime : EnrollmentPatient
+    {
+        public decimal? DoFinishDateCount { get; set; }
+    }
+}

PEIS/LoginForm.Designer.cs

@@ -42,8 +42,8 @@ namespace PEIS
             this.label5 = new System.Windows.Forms.Label();
             this.pbQrCode = new System.Windows.Forms.PictureBox();
             this.labelQrCode = new System.Windows.Forms.Label();
-            this.btnRefreshQrCode = new System.Windows.Forms.Button();
             this.labelQrStatus = new System.Windows.Forms.Label();
+            this.btnRefreshQrCode = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbQrCode)).BeginInit();
             this.SuspendLayout();
@@ -150,7 +150,7 @@ namespace PEIS
             this.label4.ForeColor = System.Drawing.Color.White;
             this.label4.Location = new System.Drawing.Point(-2, 150);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(559, 62);
+            this.label4.Size = new System.Drawing.Size(543, 62);
             this.label4.TabIndex = 9;
             this.label4.Text = "新八达健康体检系统\r\nPhysical Examination Information System";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -171,9 +171,9 @@ namespace PEIS
             // 
             this.pbQrCode.BackColor = System.Drawing.Color.White;
             this.pbQrCode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pbQrCode.Location = new System.Drawing.Point(580, 180);
+            this.pbQrCode.Location = new System.Drawing.Point(547, 108);
             this.pbQrCode.Name = "pbQrCode";
-            this.pbQrCode.Size = new System.Drawing.Size(200, 200);
+            this.pbQrCode.Size = new System.Drawing.Size(300, 300);
             this.pbQrCode.TabIndex = 11;
             this.pbQrCode.TabStop = false;
             // 
@@ -183,40 +183,42 @@ namespace PEIS
             this.labelQrCode.BackColor = System.Drawing.Color.Transparent;
             this.labelQrCode.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labelQrCode.ForeColor = System.Drawing.Color.White;
-            this.labelQrCode.Location = new System.Drawing.Point(620, 140);
+            this.labelQrCode.Location = new System.Drawing.Point(649, 79);
             this.labelQrCode.Name = "labelQrCode";
-            this.labelQrCode.Size = new System.Drawing.Size(120, 31);
+            this.labelQrCode.Size = new System.Drawing.Size(88, 26);
             this.labelQrCode.TabIndex = 12;
             this.labelQrCode.Text = "扫码登录";
             // 
-            // btnRefreshQrCode
-            // 
-            this.btnRefreshQrCode.BackColor = System.Drawing.Color.Transparent;
-            this.btnRefreshQrCode.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnRefreshQrCode.ForeColor = System.Drawing.Color.White;
-            this.btnRefreshQrCode.Location = new System.Drawing.Point(630, 390);
-            this.btnRefreshQrCode.Name = "btnRefreshQrCode";
-            this.btnRefreshQrCode.Size = new System.Drawing.Size(100, 30);
-            this.btnRefreshQrCode.TabIndex = 13;
-            this.btnRefreshQrCode.Text = "刷新二维码";
-            this.btnRefreshQrCode.UseVisualStyleBackColor = false;
-            // 
             // labelQrStatus
             // 
             this.labelQrStatus.AutoSize = true;
             this.labelQrStatus.BackColor = System.Drawing.Color.Transparent;
             this.labelQrStatus.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labelQrStatus.ForeColor = System.Drawing.Color.White;
-            this.labelQrStatus.Location = new System.Drawing.Point(590, 430);
+            this.labelQrStatus.Location = new System.Drawing.Point(721, 432);
             this.labelQrStatus.Name = "labelQrStatus";
-            this.labelQrStatus.Size = new System.Drawing.Size(180, 23);
+            this.labelQrStatus.Size = new System.Drawing.Size(126, 20);
             this.labelQrStatus.TabIndex = 14;
             this.labelQrStatus.Text = "请使用CA证书扫码";
             // 
+            // btnRefreshQrCode
+            // 
+            this.btnRefreshQrCode.FlatStyle = System.Windows.Forms.FlatStyle.System;
+            this.btnRefreshQrCode.Image = ((System.Drawing.Image)(resources.GetObject("btnRefreshQrCode.Image")));
+            this.btnRefreshQrCode.Location = new System.Drawing.Point(547, 424);
+            this.btnRefreshQrCode.Name = "btnRefreshQrCode";
+            this.btnRefreshQrCode.Size = new System.Drawing.Size(152, 35);
+            this.btnRefreshQrCode.TabIndex = 212;
+            this.btnRefreshQrCode.Text = "刷新二维码";
+            this.btnRefreshQrCode.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+            this.btnRefreshQrCode.UseVisualStyleBackColor = true;
+            // 
             // LoginForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.ClientSize = new System.Drawing.Size(900, 530);
+            this.Controls.Add(this.pbQrCode);
+            this.Controls.Add(this.btnRefreshQrCode);
             this.Controls.Add(this.label5);
             this.Controls.Add(this.label4);
             this.Controls.Add(this.BtnCancel);
@@ -227,9 +229,7 @@ namespace PEIS
             this.Controls.Add(this.label1);
             this.Controls.Add(this.TxtPsw);
             this.Controls.Add(this.TxtCode);
-            this.Controls.Add(this.pbQrCode);
             this.Controls.Add(this.labelQrCode);
-            this.Controls.Add(this.btnRefreshQrCode);
             this.Controls.Add(this.labelQrStatus);
             this.Controls.Add(this.pictureBox1);
             this.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -261,7 +261,7 @@ namespace PEIS
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.PictureBox pbQrCode;
         private System.Windows.Forms.Label labelQrCode;
-        private System.Windows.Forms.Button btnRefreshQrCode;
         private System.Windows.Forms.Label labelQrStatus;
+        private System.Windows.Forms.Button btnRefreshQrCode;
     }
 }

PEIS/LoginForm.cs

@@ -222,6 +222,7 @@ namespace PEIS
             Global.UpdateAppConfig("UserName", Global.currentUser.Name);
 
             Global.CASignDataId = null;
+            stopFlag = true;
 
             DialogResult = DialogResult.OK;
             Dispose();

PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs

@@ -69,7 +69,7 @@ namespace PEIS.Model.Enrollment
             if (groupFeeItem.Count != 0)
             {
                 // 个人收费项目信息
-                DAOHelp.ExecuteSql($"INSERT INTO Enrollment_FeeItem(OEID, GroupID, EID, PackID, PackName, FID, FeeItemCode, FeeItemName, Quantity, Unit, Price, SettlePrice, ItemClass, CreateTime, CreatorCode, Creator, DeptCode, DeptName, Seq, KeyNo, Part) SELECT a.OEID, a.GroupID, a.ID, b.PackID, b.PackName, b.FID, b.FeeItemCode, b.FeeItemName, b.Quantity, b.Unit, b.Price, b.SettlePrice, b.ItemClass, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}', b.DeptCode, b.DeptName, b.Seq, b.KeyNo, B.Part FROM Enrollment_patient a LEFT JOIN dbo.Enrollment_OrgFeeItem b ON a.GroupID = b.GroupID LEFT JOIN dbo.Enrollment_FeeItem c ON a.ID = c.EID WHERE a.GroupID = { groupID} AND a.OEID = {oeID} AND c.ID IS NULL");
+                DAOHelp.ExecuteSql($"INSERT INTO Enrollment_FeeItem(OEID, GroupID, EID, PackID, PackName, FID, FeeItemCode, FeeItemName, Quantity, Unit, Price, SettlePrice, ItemClass, CreateTime, CreatorCode, Creator, DeptCode, DeptName, Seq, KeyNo, Part) SELECT a.OEID, a.GroupID, a.ID, b.PackID, b.PackName, b.FID, b.FeeItemCode, b.FeeItemName, b.Quantity, b.Unit, b.Price, b.SettlePrice, b.ItemClass, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}', b.DeptCode, b.DeptName, b.Seq, b.KeyNo, B.Part FROM Enrollment_patient a JOIN dbo.Enrollment_OrgFeeItem b ON a.GroupID = b.GroupID WHERE a.GroupID = { groupID} AND a.OEID = {oeID} AND NOT EXISTS (SELECT 1 FROM dbo.Enrollment_FeeItem c WHERE c.EID = a.ID) ");
             }
 
             // 更新应用时间

PEIS/Model/StatisticalReportModel.cs

@@ -638,9 +638,11 @@ namespace PEIS.Model
         }
 
         // 获取体检时间节点
-        public List<EnrollmentPatient> GetPeopleDateTimeData(DateTime begDate, DateTime endDate, int status, long oEid)
+        public List<PeopleDateTime> GetPeopleDateTimeData(DateTime begDate, DateTime endDate, int status, long oEid)
         {
-            string sql = $@"select ID, Name, CreateTime, SignTime ,B.MINC, B.MAXC, B.MINV, B.MAXV, FinishTime, PrintTime, LastPrintTime
+            string sql = $@"select ID, Name, CreateTime, SignTime ,B.MINC, B.MAXC, B.MINV, B.MAXV, FinishTime, PrintTime, LastPrintTime, 
+CASE WHEN MAXC IS NULL OR FinishTime IS NULL THEN NULL
+ELSE CEILING(DATEDIFF(SECOND, MAXC, FinishTime)*1.0/60/60/24) END AS [DoFinishDateCount]
                             from Enrollment_Patient A with(nolock) 
                             LEFT JOIN (select EID, MIN(CheckTime) MINC, MAX(CheckTime) MAXC, MIN(VerifyTime) MINV, MAX(VerifyTime) MAXV from Exam_Part with(nolock) group by EID) B on A.id=B.EID 
                             where CreateTime between '{begDate:yyyy-MM-dd}' and '{endDate:yyyy-MM-dd}' ";
@@ -656,7 +658,7 @@ namespace PEIS.Model
                 sql += $@" AND A.OEID is null ";
             }
             sql += $@" order by ID; ";
-            return DAOHelp.GetDataBySQL<EnrollmentPatient>(sql);
+            return DAOHelp.GetDataBySQL<PeopleDateTime>(sql);
         }
     }
 }

PEIS/PEIS.csproj

@@ -228,6 +228,7 @@
     <Compile Include="Entity\ExamResultIsm.cs" />
     <Compile Include="Entity\DictHTypeFItem.cs" />
     <Compile Include="Entity\Log.cs" />
+    <Compile Include="Entity\PeopleDateTime.cs" />
     <Compile Include="Entity\TwoCancer.cs" />
     <Compile Include="Model\Exam\CareerHisInqModel.cs" />
     <Compile Include="Model\Exam\HistoryModel.cs" />

PEIS/Utils/CAHelper.cs

@@ -155,7 +155,7 @@ namespace PEIS.Utils
                     using (var tempBmp = new Bitmap(ms))
                     {
                         // 强制生成 200x200 正方形（这是核心）
-                        return new Bitmap(tempBmp, 200, 200);
+                        return new Bitmap(tempBmp, 300, 300);
                     }
                 }
             }

PEIS/View/Enrollment/EnrollmentOrgForm.cs

@@ -687,6 +687,8 @@ namespace PEIS.View.Enrollment
             if (Global.Msg("warn", "是否将收费模板应用到当前分组成员?") == System.Windows.Forms.DialogResult.No) return;
 
             OnApplyGroupFeeItem(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()), Convert.ToInt64(DgvGroup2.GetRowCellValue(DgvGroup2.GetSelectedRows()[0], "ID").ToString()));
+            //应用之后清空选择的人员, 这样切换页面后会显示在人员列表顶部
+            _chooseRegItem = null;
             topRowIndex = -1;
         }
 
@@ -843,7 +845,7 @@ namespace PEIS.View.Enrollment
                     bool _isPacsRegist = false;
                     foreach (EnrollmentFeeItem _feeItem in _packCheckFeeItem)
                     {
-                        System.Data.DataTable dataTable = DAOHelp.GetDataBySQL($@"select * from pacs.DICOMSERVER.dbo.PatientSchedule where XMNo = {_feeItem.ID} and DelDate is NULL");
+                        System.Data.DataTable dataTable = DAOHelp.GetDataBySQL($@"select * from pacs.DICOMSERVER.dbo.PatientSchedule where PatientID = 'T_{_feeItem.EID}' and XMNo = {_feeItem.ID} and DelDate is NULL");
                         if (dataTable.Rows.Count > 0)
                         {
                             _isPacsRegist = true;
@@ -864,7 +866,7 @@ namespace PEIS.View.Enrollment
                 // 检查项目是否已经登记，登记后无法删除
                 if (item.ItemClass == "检查")
                 {
-                    List<EnrollmentFeeItem> _isPacsRegistes = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"select * from Enrollment_FeeItem where ID = {item.ID} and EXISTS(select * from pacs.DICOMSERVER.dbo.PatientSchedule where XMNo = ID and DelDate is NULL)");
+                    List<EnrollmentFeeItem> _isPacsRegistes = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"select * from pacs.DICOMSERVER.dbo.PatientSchedule where PatientID = 'T_{item.EID}' and XMNo = {item.ID} and DelDate is NULL");
                     if (_isPacsRegistes.Count > 0)
                     {
                         Global.Msg("info", "检查项目已在PACS系统登记完成，不能删除！");
@@ -2460,6 +2462,13 @@ namespace PEIS.View.Enrollment
             {
                 OnGetCheckCost(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()), _chooseRegItem.ID);
                 OnGetEnrollmentPatient(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()));
+
+                //发送之后清空选择的人员, 这样会显示在人员列表顶部
+                string IsRefreshSelectedPatientWhenSendToDept = Global._lstConfig.FirstOrDefault(p => p.Key == "IsRefreshSelectedPatientWhenSendToDept")?.Value;
+                if (IsRefreshSelectedPatientWhenSendToDept == "1")
+                {
+                    DgvEnrollment.TopRowIndex = 0;
+                }
             }
         }
 

PEIS/View/Enrollment/EnrollmentPersonForm.cs

@@ -577,7 +577,7 @@ namespace PEIS.View.Enrollment
             // 检查项目是否已经登记，登记后无法删除
             if (item.ItemClass == "检查")
             {
-                List<EnrollmentFeeItem> _isPacsRegistes = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"select * from Enrollment_FeeItem where ID = {item.ID} and EXISTS(select * from pacs.DICOMSERVER.dbo.PatientSchedule where XMNo = ID and DelDate is NULL)");
+                List<EnrollmentFeeItem> _isPacsRegistes = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"select * from pacs.DICOMSERVER.dbo.PatientSchedule where PatientID = 'T_{item.EID}' and XMNo = {item.ID} and DelDate is NULL");
                 if (_isPacsRegistes.Count > 0)
                 {
                     Global.Msg("info", "检查项目已在PACS系统登记完成，不能删除！");

PEIS/View/Exam/PartForm.cs

@@ -1281,6 +1281,24 @@ namespace PEIS.View.Exam
                 return;
             }
 
+            bool emptyFlag = false;
+            foreach (ExamResult examResult in _examResultList)
+            {
+                if (string.IsNullOrWhiteSpace(examResult.TextResult))
+                {
+                    emptyFlag = true;
+                    break;
+                }
+            }
+            if (emptyFlag)
+            {
+                DialogResult dr = Global.Msg("warn", "当前科室有空结果，请核查后保存！\r\n如果核查无误仍要保存，请点击确定按钮。否则点击取消!");
+                if (dr != DialogResult.Yes)
+                {
+                    return;
+                }
+            }
+
             if (_patient.ID <= 0 || _patient.FinishTime != null || _examPart.VerifyTime != null ||
                 _examPart.GiveUpTime != null) return;
             var result = MessageBox.Show(@"是否保存当前检查结果？", @"保存", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
@@ -1343,64 +1361,9 @@ namespace PEIS.View.Exam
                 return;
             }
 
-            var result = MessageBox.Show(@"是否确认审核？", @"审核", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-            if (result != DialogResult.Yes) return;
-
-            string _lisViewName = Global._lstConfig.FirstOrDefault(p => p.Key == "IsHaveLisResultView")?.Value;
-
-            // 检验科判断项目是否完全出结果
-            /* if (_examPart.DeptCode == "3001" && Global._hospital.Name == "德宏州中医医院")
-             {
-                 *//*var feeItem = new List<EnrollmentFeeItem>();
-
-                 var examFeeItem = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"SELECT FeeItemName FROM Enrollment_FeeItem WHERE EID = {_patient.ID} and DeptCode = '3001' ");  // FID = 100、101为包含乙肝项目不做校验。 
-
-                 var resultFeeItem = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"SELECT c.FeeItemName
-                                                                             FROM lis.rmlis6.dbo.vw_checked_labresult A
-                                                                             LEFT JOIN Dict_ReportItem B ON ( A.rpt_itemcode = B.RptItemCode OR A.rptcode = B.RptItemCode )
-                                                                             LEFT JOIN Enrollment_FeeItem C ON B.FID = C.FID AND CONVERT ( INT, pat_no ) = c.EID
-                                                                             WHERE pat_no = '{_patient.ID}' AND pat_typecode = 4 AND C.FID IS NOT NULL GROUP BY c.FeeItemName");
-
-                 if (resultFeeItem.Count != examFeeItem.Count)
-                 {
-                     List<EnrollmentFeeItem> diff = new List<EnrollmentFeeItem>();
-                     foreach (var item1 in examFeeItem)
-                     {
-                         bool found = false;
-                         foreach (var item2 in resultFeeItem)
-                         {
-                             if (item1.FeeItemName == item2.FeeItemName)
-                             {
-                                 found = true;
-                                 break;
-                             }
-                         }
-                         if (!found)
-                         {
-                             diff.Add(item1);
-                         }
-                     }
-                     Msg("info", string.Join("、", diff.Select(s => s.FeeItemName).First()) + "未出结果！");
-                     return;
-                 }*//*
-
-                 List<EnrollmentFeeItem> _noResultItem = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"select * from Enrollment_FeeItem where ItemClass = '检验' and DeptCode = '3001' and GiveUpTime is null and EID = {_patient.ID} and NOT exists (select * from lis.rmlis6.dbo.vw_checked_labresult_sq where req_id = id)");
-                 string message = "";
-                 foreach (EnrollmentFeeItem item in _noResultItem)
-                 {
-                     if (!string.IsNullOrEmpty(item.FeeItemName))
-                     {
-                         message += item.FeeItemName + "、";
-                     }
-                 }
-                 if (!string.IsNullOrEmpty(message))
-                 {
-                     Global.Msg("info", message.Substring(0, message.Length - 1) + " 等检验项目结果未出，请核查后审核！");
-                     return;
-                 }
-             }*/
             // 检验科判断项目是否完全出结果
-            if (_examPart.DeptCode == "3001" && Global._hospital.Name == "德宏州中医医院" && !string.IsNullOrEmpty(_lisViewName))
+            string _lisViewName = Global._lstConfig.FirstOrDefault(p => p.Key == "IsHaveLisResultView")?.Value;
+            if (_examPart.DeptCode == "3001" && !string.IsNullOrEmpty(_lisViewName))
             {
                 List<EnrollmentFeeItem> _noResultItem = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"select * from Enrollment_FeeItem where ItemClass = '检验' and GiveUpTime is null and EID = {_patient.ID} and NOT exists (select * from {_lisViewName} where req_id = id)");
                 string message = "";
@@ -1421,6 +1384,9 @@ namespace PEIS.View.Exam
                 }
             }
 
+            var result = MessageBox.Show(@"是否确认审核？", @"审核", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+            if (result != DialogResult.Yes) return;
+
             Review?.Invoke(this, new Args<DateTime?>
             {
                 ID = _examPart.ID,

PEIS/View/statistics/IStatisticalReportView.cs

@@ -55,6 +55,6 @@ namespace PEIS.View.Statistics
 
         // 体检时间节点
         event EventHandler<Args<dynamic>> GetPeopleDateTimeData;
-        void ShowPeopleDateTimeData(List<EnrollmentPatient> items);
+        void ShowPeopleDateTimeData(List<PeopleDateTime> items);
     }
 }

PEIS/View/statistics/StatisticalReportForm.cs

@@ -28,7 +28,7 @@ namespace PEIS.View.Statistics
         public List<EnrollmentFeeItem> _orgCostFeeData = new List<EnrollmentFeeItem>();
         public List<EnrollmentCheckCost> _checkCost = new List<EnrollmentCheckCost>();
         public List<TwoCancer> _twoCancerData = new List<TwoCancer>();
-        private List<EnrollmentPatient> _peopleDateTimeData = new List<EnrollmentPatient>();
+        private List<PeopleDateTime> _peopleDateTimeData = new List<PeopleDateTime>();
         public EnrollmentOrg _org = new EnrollmentOrg();
 
         public StatisticalReportForm()
@@ -484,7 +484,7 @@ namespace PEIS.View.Statistics
 
             GetPeopleDateTimeData?.Invoke(this, new Args<dynamic> { Item = paramsData });
         }
-        public void ShowPeopleDateTimeData(List<EnrollmentPatient> items)
+        public void ShowPeopleDateTimeData(List<PeopleDateTime> items)
         {
             Invoke(new Action(() => _peopleDateTimeData = items));
             HandleReport();