1、同步main分支更新

DicomTool/DicomTool.csproj

@@ -72,6 +72,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="FtpHelper.cs" />
     <Compile Include="Model\ReportEcg.cs" />
     <Compile Include="Model\ReportPacs.cs" />
     <Compile Include="Utils\Global.cs" />
@@ -81,6 +82,7 @@
     <Compile Include="Utils\MySecurity.cs" />
     <Compile Include="Utils\ObjectData.cs" />
     <Compile Include="Utils\PacsSqlHelper.cs" />
+    <Compile Include="Utils\Test.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config">

DicomTool/FtpHelper.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System;
+using System.IO;
+using System.Net;
+using DicomTool.Model;
+
+namespace DicomTool
+{
+   public static class FtpHelper
+    {
+
+        public static void DownloadFtpFile(List<ReportEcg> ftpUriList, string username, string password, string localFilePath)
+        {
+            // 确保本地文件路径是目录
+            if (!Directory.Exists(localFilePath))
+            {
+                Directory.CreateDirectory(localFilePath);
+            }
+
+            foreach (var reportEcg in ftpUriList)
+            {
+                // 创建 FtpWebRequest 对象
+                var request = (FtpWebRequest)WebRequest.Create(reportEcg.ReportUrl);
+                request.Method = WebRequestMethods.Ftp.DownloadFile;
+                request.Credentials = new NetworkCredential(username, password);
+
+                try
+                {
+                    // 获取响应并读取数据
+                    var response = (FtpWebResponse)request.GetResponse();
+                    var responseStream = response.GetResponseStream();
+
+                    // 获取文件名
+                    // string fileName = Path.GetFileName(new Uri(reportEcg.ReportUrl).LocalPath);
+                    var fileName = reportEcg.ID + ".jpg";
+                    Console.WriteLine("【下载】"+ reportEcg.ID + ".jpg");
+                    var localFileFullPath = Path.Combine(localFilePath, fileName);
+
+                    // 将 FTP 文件内容写入本地文件
+                    using (FileStream fileStream = new FileStream(localFileFullPath, FileMode.Create, FileAccess.Write))
+                    {
+                        byte[] buffer = new byte[4096];
+                        int bytesRead;
+                        while ((bytesRead = responseStream.Read(buffer, 0, buffer.Length)) != 0)
+                        {
+                            fileStream.Write(buffer, 0, bytesRead);
+                        }
+                    }
+
+                    responseStream.Close();
+                    response.Close();
+                }
+                catch (WebException ex)
+                {
+                    // 处理异常，例如打印错误信息
+                    Console.WriteLine("Download failed for " + reportEcg + ": " + ex.Message);
+                }
+            }
+        }
+    }
+}

DicomTool/Program.cs

@@ -22,18 +22,34 @@ namespace DicomTool
         private const string Password = "BlueFlag.Lis!@#";
         // DCM文件下载存放路径
         private static readonly string DcmPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "DicomFiles/");
-        private static readonly string EcgPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "EcgFiles/"); 
+        private static readonly string EcgPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "EcgFiles/");
 
+        // 188
+        //private const string connectionString = "Data Source=192.168.12.188;Initial Catalog=peisdb;User ID=sa;Password=000626;";
+        // 盈江妇幼
+        // private const string ConnectionString = @"Data Source=172.172.100.12;Initial Catalog=peisdb;User ID=sa;Password=xbdLis!@#77911;";
+        // 芒市妇幼
+        // private const string ConnectionString = @"Data Source=192.168.11.5;Initial Catalog=peisdb;User ID=XBDLISUser;Password=BlueFlag.Lis!@#;";
+        // 德宏中医
         private const string ConnectionString = @"Data Source=200.200.200.71;Initial Catalog=peisdb;User ID=sa;Password=wVJeC28@eY*&F#5NGL^eYC3m;";
-         
+
+        /// <summary>
+        /// PACS报告中已选的图片
+        /// </summary>
+        private const string InsertExamPacsImage =
+            @"INSERT INTO Exam_PacsImage (Image,EID,ReportNo,InTime) VALUES (@ImageData,@EID,@ReportNo,@InTime);
+              INSERT INTO Report_Pacs(Image, EID, ReportNo, InTime) VALUES(@ImageData, @EID, @ReportNo, @InTime);";
+        
         private static void Main(string[] args)
         {
             Console.WriteLine($"【启动】{DateTime.Now:yyyy-MM-dd HH:mm}");
             // 创建一个 Timer 实例
             var timer = new Timer();
-            DownEcgFtpImage();
             try
             {
+                //DownEcgFtpImage();
+                Execute();
+
                 Console.ReadKey();
                 timer.Interval = intervalInMinutes * 60 * 1000;
                 // 设置为 true，使得 Timer 每隔设定的间隔时间自动触发一次 Elapsed 事件
@@ -64,10 +80,207 @@ namespace DicomTool
         /// <param name="e"></param>
         private static void Timer_Elapsed(object sender, ElapsedEventArgs e)
         {
-            Console.WriteLine($@"执行-{DateTime.Now:yyyy-MM-dd HH:mm}"); 
+            Console.WriteLine($@"执行-{DateTime.Now:yyyy-MM-dd HH:mm}");
             DownEcgFtpImage();
+            Execute();
+            SyncPacsReport();
+            //DelDownFiles();
         }
-        
+
+        /// <summary>
+        /// 下载选择的
+        /// </summary>
+        private static void Execute()
+        { 
+            Console.WriteLine($"【开始同步PACS报告图片】{DateTime.Now:yyyy-MM-dd HH:mm}------------");
+            //--将PACS检查报告同步到体检系统中
+            if (!Directory.Exists(DcmPath))
+            {
+                Directory.CreateDirectory(DcmPath);
+            } 
+            var reportList = PacsSqlHelper.GetPacsReportList();
+            var fileNameList = new List<string>();
+            int i = 1;
+            foreach (var report in reportList)
+            {
+                try
+                {
+                    // 已选图片UID
+                    var selectedList = PacsSqlHelper.GetReportUidList(report.AccessionNumber);
+                    if (selectedList.Count <= 0) continue; 
+                    // DCM图片路径
+                    var imageFiles = PacsSqlHelper.GetPacsImageFile(report.PatientCode,report.ExamFeeitem_Code); 
+                    if (string.IsNullOrEmpty(imageFiles)) continue; 
+                    // 得到DCM共享文件地址
+                    var dcmPaths = imageFiles.Split(';');
+                    // 路径为空
+                    if (!(dcmPaths?.Length > 0)) continue;
+
+                    //获取远程共享文件
+                    using (var client = new WebClient())
+                    {
+                        // 配置授权账户密码
+                        var credentials = new NetworkCredential(UserName, Password);
+                        client.Credentials = credentials;
+                        selectedList.ForEach(selected =>
+                        {
+                            var file = selected + ".DCM";
+                            var dcmPacsDict = dcmPaths[0].Substring(dcmPaths[0].Length , file.Length);
+                            string downPath = dcmPaths[0].Replace(dcmPacsDict, file);
+                            if (Path.HasExtension(downPath))
+                            {
+                                //下载远程文件
+                                var buffer = client.DownloadData(downPath);
+                                // 保存本地
+                                var name = $"{report.PatientCode?.Trim()}-{report.ExamFeeitem_Code?.Trim()}-" + i;
+                                Bytes2File(buffer, DcmPath, $"{name}.DCM");
+                                fileNameList.Add($"{name}.DCM");
+                                Console.WriteLine($"下载：{name}.DCM");
+                                i++;
+                            };
+                        });
+                        // 循环路径
+                        for (var index = 0; index < dcmPaths.Count(); index++)
+                        {
+                            try
+                            {
+                                // 当前路径
+                                var dcmPath = dcmPaths[index];
+                                if (string.IsNullOrEmpty(dcmPath)) continue;
+                                if (!Path.HasExtension(dcmPath) ) continue;
+                                selectedList.ForEach(selected =>
+                                {
+                                    if (dcmPath.Contains(selected))
+                                    {
+                                        //下载远程文件
+                                        var buffer = client.DownloadData(dcmPath);
+                                        // 保存本地
+                                        var name = $"{report.PatientCode?.Trim()}-{report.ExamFeeitem_Code?.Trim()}-" + i;
+                                        Bytes2File(buffer, DcmPath, $"{name}.DCM");
+                                        fileNameList.Add($"{name}.DCM");
+                                        Console.WriteLine($"下载：{name}.DCM");
+                                        i++;
+                                    }
+                                });  
+                            }
+                            catch (Exception e)
+                            {
+                                Console.WriteLine($"01." + e.Message);
+                            }
+                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine($"02." + e.Message);
+                }
+            }
+
+            Console.WriteLine($@"【下载】{fileNameList.Count}");
+            if (fileNameList.Count > 0)
+                // 保存到本地后上传到服务器
+                UploadDcmImg(DcmPath, fileNameList, InsertExamPacsImage);
+
+            Console.WriteLine($@"【等待】{intervalInMinutes}min");
+            Console.WriteLine($"------------------------------------------");
+        }
+
+        /// <summary>
+        /// 1、将本地文件PACS影像图片发送到服务器
+        /// </summary>
+        public static void UploadDcmImg(string folderPath, List<string> fileNameList, string insertSql)
+        {
+            var time = DateTime.Now;
+            // 获取文件夹下所有文件的路径
+            var files = Directory.GetFiles(folderPath);
+            var i = 0;
+            // 建立数据库连接
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                // 遍历文件路径并输出
+                foreach (var filePath in files)
+                {
+                    try
+                    {
+                        var fileName = System.IO.Path.GetFileName(filePath);
+                        if (!fileNameList.Contains(fileName)) continue;
+                        var eid = Convert.ToInt64(fileName.Split('-')[0]);
+                        var reportNo = fileName.Split('-')[1];
+                        var image = new DicomImage(filePath);
+                        //image.NumberOfFrames 如果有多帧图片需要将每帧都转成jpeg
+                        //DCM转Bitmap
+                        var bitmap = image.RenderImage().AsBitmap();
+                        using (var streamImg = new MemoryStream())
+                        {
+                            //Bitmap To byte[]
+                            bitmap.Save(streamImg, System.Drawing.Imaging.ImageFormat.Jpeg);
+                            var imgBytes = streamImg.ToArray();
+                            // File.WriteAllBytes(Path.Combine(DcmPath, i+".jpeg"), imgBytes);
+                            //上传
+                            {
+                                connection.Open();
+                                // 创建插入记录的 SQL 查询
+                                // 创建命令对象
+                                using (var command = new SqlCommand(insertSql, connection))
+                                {
+                                    // 设置参数值
+                                    command.Parameters.AddWithValue("@ImageData", imgBytes);
+                                    command.Parameters.AddWithValue("@EID", eid);
+                                    command.Parameters.AddWithValue("@ReportNo", reportNo);
+                                    command.Parameters.AddWithValue("@InTime", time);
+
+                                    Console.WriteLine($@"【上传】{fileName}");
+                                    // 执行插入操作
+                                    command.ExecuteNonQuery();
+                                    i++;
+                                }
+
+                                connection.Close();
+                            }
+                        } 
+                        // 删除上传成功的文件
+                        File.Delete(filePath);
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine(System.IO.Path.GetFileName(filePath));
+                        Console.WriteLine(e.Message);
+                    }
+                }
+            }
+
+            Console.WriteLine($@"【上传成功】{i}");
+        }
+
+        /// <summary>
+        /// 将byte数组转换为文件并保存到指定地址
+        /// </summary>
+        /// <param name="buff">byte数组</param>
+        /// <param name="path">保存地址</param>
+        /// <param name="fileName"></param>
+        public static void Bytes2File(byte[] buff, string path, string fileName)
+        {
+            try
+            {
+                //如果不存在就创建Enclosure文件夹 
+                if (Directory.Exists(path) == false)
+                    Directory.CreateDirectory(path);
+
+                if (File.Exists(path + fileName))
+                    File.Delete(path + fileName);
+
+                var fs = new FileStream(path + fileName, FileMode.CreateNew);
+                var bw = new BinaryWriter(fs);
+                bw.Write(buff, 0, buff.Length);
+                bw.Close();
+                fs.Close();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("【下载失败】" + fileName + "--" + e.Message);
+            }
+        }
+
         public static void DownEcgFtpImage()
         {
             Console.WriteLine("-----------------------------------");
@@ -82,8 +295,9 @@ namespace DicomTool
             if (!Directory.Exists(EcgPath))
             {
                 Directory.CreateDirectory(EcgPath);
-            } 
-            DownloadFtpFile(files, name, password, EcgPath);
+            }
+
+            FtpHelper.DownloadFtpFile(files, name, password, EcgPath);
             UploadEcgImg(EcgPath, files.Select(s => s.ID.ToString()).ToList());
             Console.WriteLine("ECG 下载完毕");
             Console.WriteLine($"【ECG-END】{DateTime.Now:yyyy-MM-dd HH:mm}");
@@ -156,62 +370,9 @@ namespace DicomTool
             Console.WriteLine($@"【上传成功】{i}");
         }
 
-        /// <summary>
-        /// 下载ECG图片
-        /// </summary>
-        /// <param name="ftpUriList"></param>
-        /// <param name="username"></param>
-        /// <param name="password"></param>
-        /// <param name="localFilePath"></param>
-        public static void DownloadFtpFile(List<ReportEcg> ftpUriList, string username, string password, string localFilePath)
+        public static void SyncPacsReport()
         {
-            // 确保本地文件路径是目录
-            if (!Directory.Exists(localFilePath))
-            {
-                Directory.CreateDirectory(localFilePath);
-            }
-
-            foreach (var reportEcg in ftpUriList)
-            {
-                // 创建 FtpWebRequest 对象
-                try
-                {
-                    var request = (FtpWebRequest)WebRequest.Create(reportEcg.ReportUrl);
-                    request.Method = WebRequestMethods.Ftp.DownloadFile;
-                    request.Credentials = new NetworkCredential(username, password);
-                    // 获取响应并读取数据
-                    var response = (FtpWebResponse)request.GetResponse();
-                    var responseStream = response.GetResponseStream();
-
-                    // 获取文件名
-                    // string fileName = Path.GetFileName(new Uri(reportEcg.ReportUrl).LocalPath);
-                    var fileName = reportEcg.ID + ".jpg";
-                    Console.WriteLine("【下载】" + reportEcg.ID + ".jpg");
-                    var localFileFullPath = Path.Combine(localFilePath, fileName);
-                    // 将 FTP 文件内容写入本地文件
-                    using (FileStream fileStream = new FileStream(localFileFullPath, FileMode.Create, FileAccess.Write))
-                    {
-                        byte[] buffer = new byte[4096];
-                        int bytesRead;
-                        while ((bytesRead = responseStream.Read(buffer, 0, buffer.Length)) != 0)
-                        {
-                            fileStream.Write(buffer, 0, bytesRead);
-                        }
-                    }
-                    responseStream.Close();
-                    response.Close();
-                }
-                catch (WebException ex)
-                {
-                    // 处理异常，例如打印错误信息
-                    Console.WriteLine("Download failed for " + reportEcg + ": " + ex.Message);
-                    continue;
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine("Download failed for " + reportEcg + ": " + e.Message);
-                }
-            }
+            DAOHelp.ExecuteSql("EXEC sp_PacsRptInsert;");
         }
     }
 }

DicomTool/Utils/Test.cs

@@ -0,0 +1,129 @@
+using System;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Timers;
+using Dicom.Imaging;
+using DicomTool.Model;
+using DicomTool.Utils;
+
+namespace DicomTool.Utils
+{
+    public static class Test
+    {
+        private static string basePath = @"C:\Users\15012\Desktop\Tools";
+
+        public static void TestMethod()
+        { 
+            var filePath =  Path.Combine(basePath,"1.DCM");  
+            var image = new DicomImage(filePath);
+            //image.NumberOfFrames 如果有多帧图片需要将每帧都转成jpeg
+            //DCM转Bitmap
+            var bitmap = image.RenderImage().AsBitmap();
+            using (var streamImg = new MemoryStream())
+            {
+                //Bitmap To byte[]
+                bitmap.Save(streamImg, System.Drawing.Imaging.ImageFormat.Jpeg);
+                var imgBytes = streamImg.ToArray();
+                // 将byte数组写入到文件
+                File.WriteAllBytes(Path.Combine(basePath, "1.jpeg"), imgBytes);
+
+                Console.WriteLine("数据已写入到文件：" + filePath);
+            }
+        }
+    }
+}
+
+
+/*
+
+        /// <summary>
+        /// 下载所有图片
+        /// </summary>
+        private static void Execute2()
+        {
+            Console.WriteLine($"【同步所有图片】{DateTime.Now:yyyy-MM-dd HH:mm}");
+            // var dayBetween = $@"BETWEEN '2024-06-16' AND '2024-06-21'";
+            var dayBetween = $@"BETWEEN '{DateTime.Today:yyyy-MM-dd}' AND '{DateTime.Today.AddDays(1):yyyy-MM-dd}'";
+            Console.WriteLine($@"ExamDatetime {dayBetween}");
+            var reportList = DAOHelp.GetDataBySQL<ReportPacs>($@"
+SELECT A.PatientCode, A.ExamFeeitem_Code,A.AccessionNumber
+FROM PACS.DICOMSERVER.DBO.PEIS_PacsResult A
+where  A.ExamDatetime IS NOT NULL and a.ExamDatetime {dayBetween}
+	AND NOT EXISTS ( SELECT 1 FROM PACS.DICOMSERVER.DBO.ImgForReport WHERE AccessionNumber = A.AccessionNumber )
+	AND NOT EXISTS ( SELECT 1 FROM Report_Pacs WHERE EID = A.PatientCode AND ReportNo=A.ExamFeeitem_Code)
+             ");
+            Console.WriteLine($"【待下载报告】{reportList.Count}");
+            var fileNameList = new List<string>();
+            foreach (var report in reportList)
+            {
+                try
+                {
+                    var imageFiles = DAOHelp.GetDataBySQL<ReportPacs>
+                            ($@"SELECT ImageFile FROM PACS.DICOMSERVER.DBO.PEIS_PacsResult  WHERE  PatientCode='{report.PatientCode}' and 	ExamFeeitem_Code='{report.ExamFeeitem_Code}'")
+                        ?.FirstOrDefault()?.ImageFile;
+                    if (string.IsNullOrEmpty(imageFiles))
+                    {
+                        Console.WriteLine(
+                            $@"[ERROR] EID={report.PatientCode} - FID={report.ExamFeeitem_Code} ImageFile为空");
+                        continue;
+                    }
+
+                    // 得到DCM共享文件地址
+                    var dcmPaths = imageFiles.Split(';');
+                    // 路径为空
+                    if (!(dcmPaths?.Length > 0)) continue;
+                    //获取远程共享文件
+                    using (var client = new WebClient())
+                    {
+                        // 配置授权账户密码
+                        var credentials = new NetworkCredential(UserName, Password);
+                        client.Credentials = credentials;
+                        // 循环路径
+                        for (var index = 0; index < dcmPaths.Count(); index++)
+                        {
+                            try
+                            {
+                                // 当前路径
+                                var dcmPath = dcmPaths[index];
+                                if (string.IsNullOrEmpty(dcmPath)) continue;
+                                var name = $"{report.PatientCode}-{report.ExamFeeitem_Code}-";
+                                //下载远程文件
+                                var buffer = client.DownloadData(dcmPath);
+                                // 保存本地
+                                Bytes2File(buffer, DcmPath, $"{name}.DCM");
+                                fileNameList.Add($"{name}.DCM");
+                                Console.WriteLine($"下载：{name}.DCM");
+                            }
+                            catch (Exception e)
+                            {
+                                Console.WriteLine($"1." + e.Message);
+                            }
+                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine($"2." + e.Message);
+                }
+            }
+
+            Console.WriteLine($@"【下载】{fileNameList.Count}");
+            if (fileNameList.Count > 0)
+                // 保存到本地后上传到服务器
+                UploadDcmImg(DcmPath, fileNameList, InsertExamPacsImage);
+
+            Console.WriteLine($@"【等待】{intervalInMinutes}min");
+            // 删除文件夹下所有文件
+            foreach (var filePath in Directory.GetFiles(DcmPath))
+            {
+                File.Delete(filePath);
+            }
+        }
+
+ */

PEIS.sln

@@ -5,6 +5,10 @@ VisualStudioVersion = 15.0.33529.398
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PEIS", "PEIS\PEIS.csproj", "{8980800E-6620-4B2E-A7DD-8C4651E1A344}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{AB0394FA-735E-4213-9ACE-31C02F698FA7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Update", "Update\Update.csproj", "{8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,10 +25,21 @@ Global
 		{8980800E-6620-4B2E-A7DD-8C4651E1A344}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8980800E-6620-4B2E-A7DD-8C4651E1A344}.Release|x86.ActiveCfg = Release|Any CPU
 		{8980800E-6620-4B2E-A7DD-8C4651E1A344}.Release|x86.Build.0 = Release|Any CPU
+		{8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Debug|x86.Build.0 = Debug|Any CPU
+		{8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Release|x86.ActiveCfg = Release|Any CPU
+		{8894C92C-210D-459C-B5CD-7A6D2AB4CBE5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{8894C92C-210D-459C-B5CD-7A6D2AB4CBE5} = {AB0394FA-735E-4213-9ACE-31C02F698FA7}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {56DA78F6-DED1-4B17-AE1F-7DCF4A666388}
 	EndGlobalSection

PEIS/App.config

@@ -15,9 +15,9 @@
 		<!-- <add name="ConnString" connectionString="10C598E364BCAFCF71617738597417B368D095FA1A37D76CC4755C411E5B6E792E0D4950863434F9B242AA9F134426A2922569235322E2342030D4AE0170168D8F1BC9B44D56F367DE9614CDCCBB6CDAEF20B4992B3758AD9FF39A400D08CC48"/> -->
 
 		<!-- 德宏州中医院 peisdb-->
-		 <!--<add name="ConnString" connectionString="10C598E364BCAFCF71617738597417B368D095FA1A37D76CC4755C411E5B6E792E0D4950863434F9B242AA9F134426A27810AC34D6EDC4F6ABFC4BE6027BB990824DB7092BFDA15709314FEBC2C3C9E312752DFBDF33BC1BF3C0FC84EAA83A4F"/>--> 
+		<add name="ConnString" connectionString="10C598E364BCAFCF71617738597417B368D095FA1A37D76CC4755C411E5B6E792E0D4950863434F9B242AA9F134426A27810AC34D6EDC4F6ABFC4BE6027BB990824DB7092BFDA15709314FEBC2C3C9E312752DFBDF33BC1BF3C0FC84EAA83A4F"/>
 		<!-- 192.168.12.188 -->
-		 <add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C75BD46245729DFD1D3D78E221B3E0300765B697A8C044694AA8A0575480464D83E79206ED689FE4A1CE0C479D02BC880B7FDEDDC464EE6B74BDB082FD5B1B9EFC"/>
+		 <!-- <add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C75BD46245729DFD1D3D78E221B3E0300765B697A8C044694AA8A0575480464D83E79206ED689FE4A1CE0C479D02BC880B7FDEDDC464EE6B74BDB082FD5B1B9EFC"/> -->
 		<!-- 盈江妇幼YJFY  -->	
 		 <!--<add name="ConnString" connectionString="10C598E364BCAFCF5A016EA6C7463FAC7D75379F63924F4F82C1749BDA88D9414EC0303E1ECC3E76895E07FCFC13332D1D79643A2AD3AA60507FD3EAF9A41761B30F4FDE900F983F1FE6ED6F0245E5BF8BFCFC5F0A2C03E4"/>--> 
 		<!-- 芒市妇幼MSFY -->
@@ -31,6 +31,7 @@
 	</entityFramework>
 
 	<startup>
-		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
 	</startup>
 </configuration>
+ 

PEIS/Entity/BasePatient.cs

@@ -37,7 +37,6 @@ namespace PEIS.Entity
         public String Hisresult { get; set; }
         public String Hisid { get; set; }
         public DateTime? HiscreateTime { get; set; }
-        public String SpellCode { get; set; }
 
         #region other
 
@@ -87,28 +86,6 @@ namespace PEIS.Entity
         }
 
 
-        /// <summary>
-        /// 验证
-        /// </summary>
-        /// <returns></returns>
-        public bool Validate()
-        {
-            if (string.IsNullOrEmpty(Name)) return false;
-            if (string.IsNullOrEmpty(Sex)) return false;
-            if (string.IsNullOrEmpty(Nation)) return false;
-            if (string.IsNullOrEmpty(Marriage)) return false; 
-            if (CardNo?.Trim()?.Length != 18) return false;
-            var year = CardNo.Substring(6, 4);
-            var month = CardNo.Substring(10, 2);
-            var day = CardNo.Substring(12, 2);
-            var isDay = DateTime.TryParse($"{year}-{month}-{day}", out var birthday);
-            if (!isDay) return false;
-            Birthday = birthday;
-            CardType = "居民身份证";
-
-
-            return true;
-        }
 
         public virtual bool Exits()
         {

PEIS/Model/Enrollment/EnrollmentOrgModel.cs

@@ -51,14 +51,42 @@ namespace PEIS.Model.Enrollment
             var enrollmentPatient = $@"UPDATE Enrollment_Patient SET ExamDate = GETDATE(), SignTime = GETDATE(), SignerCode = '{Global.currentUser.Code}', Signer = '{Global.currentUser.Name}' WHERE ID = {eID} AND SignTime is null";
             var enrollmentFeeItem = $@"UPDATE a SET a.IsSend = 1 FROM Enrollment_FeeItem a LEFT JOIN Enrollment_CheckCost b ON a.OrderNO = b.ID AND a.EID = b.EID WHERE b.SendTime IS NOT NULL AND a.EID = {eID};";
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+            // 插入常规检查男/女
+            var normal = $@"EXEC sp_InsertNormalFeeItem {eID};";
+
+            // 发送后变更执行科室  //同步分检
+            var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01411', DeptName = '内科' WHERE KeyNo = '87933664' AND FeeItemCode = 'Z1061' AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01412', DeptName = '外科' WHERE KeyNo = '87933665' AND FeeItemCode = 'Z1062' AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01413', DeptName = '五官科' WHERE KeyNo = '87933667' AND FeeItemCode = 'Z1063' AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01415', DeptName = '口腔科' WHERE KeyNo = '87933670' AND FeeItemCode = 'Z1064' AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965917' AND FeeItemCode = 'Z1065' AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965918' AND FeeItemCode = 'Z1066' AND EID = {eID};  EXEC sp_SyncExamPart {eID};";
+=======
             // 插入分检步骤
             var part = $@"EXEC sp_SyncExamPart {eID}";
+>>>>>>> 81d9dc6 (1、发送到科室，移除中医院定制)
+=======
+            // 插入分检步骤
+            var part = $@"EXEC sp_SyncExamPart {eID}";
+>>>>>>> main
 
             var cResult = DAOHelp.ExecuteSql(checkCost, false);
             var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
             var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false);
+<<<<<<< HEAD
+<<<<<<< HEAD
+            var nResult = DAOHelp.ExecuteSql(normal);
+            var dResult = DAOHelp.ExecuteSql(dept);
+=======
+
+            var pResult = DAOHelp.ExecuteSql(part);
+>>>>>>> 81d9dc6 (1、发送到科室，移除中医院定制)
+=======
 
             var pResult = DAOHelp.ExecuteSql(part);
+>>>>>>> main
 
             return cResult > 0 && eResult > 0 && fResult > 0;
         }
@@ -92,28 +120,5 @@ namespace PEIS.Model.Enrollment
 
             return cResult > 0 && eResult > 0 && fResult > 0;
         }
-
-        public List<EnrollmentPatient> GetExcelList(Int64 oeID)
-        {
-            return DAOHelp.GetDataBySQL<EnrollmentPatient>($@"SELECT
-	                                                            a.ID,
-	                                                            a.Name,
-	                                                            CASE WHEN a.Sex = 1 THEN '男' ELSE '女' END AS 'Sex',
-	                                                            b.Marriage,
-	                                                            CONVERT ( VARCHAR, a.Age ) + a.AgeClass AS 'AgeClass',
-	                                                            a.CardNo,
-	                                                            a.Tel1,
-	                                                            c.DeptName,
-	                                                            a.SignTime,
-	                                                            d.Fee
-                                                            FROM
-	                                                            Enrollment_Patient a
-	                                                            LEFT JOIN Base_Patient b ON a.PID = b.ID
-	                                                            LEFT JOIN Base_OrgPatient c ON c.OID = a.OID AND c.PID = b.ID 
-	                                                            LEFT JOIN Enrollment_CheckCost d ON a.ID = d.EID AND a.OEID = d.OEID
-                                                            WHERE
-	                                                            a.OEID = {oeID} AND d.DeleteTime IS NULL 
-                                                            ORDER BY a.SignTime");
-        }
     }
 }

PEIS/Model/Enrollment/EnrollmentPatientModel.cs

@@ -55,11 +55,10 @@ namespace PEIS.Model.Enrollment
                             Description = '{item.Description}',
                             ExamDate = '{item.ExamDate}',
                             Photo = '{item.Photo}',
-                            Company = '{item.Company}',
-                            SpellCode = '{item.SpellCode}'        
+                            Company = '{item.Company}'
                             WHERE ID = {item.ID}";
 
-            var baseStr = $@"update base_patient set name =  '{item.Name}',  Sex = '{item.Sex}', Birthday = '{item.Birthday}', CardType = '{item.CardType}',  CardNo = '{item.CardNo}', SpellCode = '{item.SpellCode}', Marriage = '{item.Marriage}' where ID = {item.PID}";
+            var baseStr = $@"update base_patient set name =  '{item.Name}',  Sex = '{item.Sex}', CardType = '{item.CardType}',  CardNo = '{item.CardNo}' where ID = {item.PID}";
             DAOHelp.ExecuteSql(baseStr, false);
 
             return DAOHelp.ExecuteSql(sql, false) > 0;
@@ -78,7 +77,6 @@ namespace PEIS.Model.Enrollment
                                                             c.DeptName AS GroupName,
                                                             a.SignTime,   
                                                             a.Tel1,
-                                                            a.SpellCode,
                                                             CASE WHEN a.SignTime IS NULL 
                                                             THEN NULL
 	                                                            ELSE '已发送'
@@ -114,6 +112,35 @@ namespace PEIS.Model.Enrollment
             var enrollmentPatient = $@"UPDATE Enrollment_Patient SET ExamDate = GETDATE(), SignTime = GETDATE(), SignerCode = '{Global.currentUser.Code}', Signer = '{Global.currentUser.Name}' WHERE ID = {EId} AND SignTime is null";
             var enrollmentFeeItem = $@"UPDATE a SET a.IsSend = 1 FROM Enrollment_FeeItem a LEFT JOIN Enrollment_CheckCost b ON a.OrderNO = b.ID AND a.EID = b.EID WHERE b.SendTime IS NOT NULL AND a.EID = {EId}; ";
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+            // 插入常规检查男/女 //同步分检
+            var normal = $@"EXEC sp_InsertNormalFeeItem {EId};";
+            
+            // 发送后变更执行科室
+            var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01411', DeptName = '内科' WHERE KeyNo = '87933664' AND FeeItemCode = 'Z1061' AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01412', DeptName = '外科' WHERE KeyNo = '87933665' AND FeeItemCode = 'Z1062' AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01413', DeptName = '五官科' WHERE KeyNo = '87933667' AND FeeItemCode = 'Z1063' AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01415', DeptName = '口腔科' WHERE KeyNo = '87933670' AND FeeItemCode = 'Z1064' AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965917' AND FeeItemCode = 'Z1065' AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965918' AND FeeItemCode = 'Z1066' AND EID = {EId};   EXEC sp_SyncExamPart {EId};";
+            
+            var cResult = DAOHelp.ExecuteSql(checkCost, false);
+            var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
+            var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false);
+            var nResult = DAOHelp.ExecuteSql(normal);
+            var dResult = DAOHelp.ExecuteSql(dept);
+=======
+            // 插入分检步骤
+            var part = $@"EXEC sp_SyncExamPart {EId}";
+
+       
+            var cResult = DAOHelp.ExecuteSql(checkCost, false);
+            var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
+            var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false);
+            var pResult = DAOHelp.ExecuteSql(part);
+>>>>>>> 81d9dc6 (1、发送到科室，移除中医院定制)
+=======
             // 插入分检步骤
             var part = $@"EXEC sp_SyncExamPart {EId}";
 
@@ -122,6 +149,7 @@ namespace PEIS.Model.Enrollment
             var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
             var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false);
             var pResult = DAOHelp.ExecuteSql(part);
+>>>>>>> main
 
             return cResult > 0 && eResult > 0 && fResult > 0;
         }
@@ -184,6 +212,7 @@ namespace PEIS.Model.Enrollment
             return cResult > 0 && eResult > 0 && fResult > 0;
         }
 
+
         public List<EnrollmentPatient> GetEnrollmentPatientRegItems(string begDate, string endDate, string name) // 获取个人体检人员列表
         {
             if (String.IsNullOrEmpty(name))
@@ -204,8 +233,7 @@ namespace PEIS.Model.Enrollment
                                                             WHEN SignTime IS NOT NULL THEN '2'
                                                             WHEN SignTime IS NULL THEN '1' 
                                                             END AS Signer,
-                                                            FinishTime,
-                                                            SpellCode
+                                                            FinishTime           
                                                             FROM
 	                                                            Enrollment_Patient 
                                                             WHERE
@@ -235,12 +263,11 @@ namespace PEIS.Model.Enrollment
                                                             WHEN SignTime IS NOT NULL THEN '2'
                                                             WHEN SignTime IS NULL THEN '1' 
                                                             END AS Signer,
-                                                            FinishTime,
-                                                            SpellCode
+                                                            FinishTime           
                                                             FROM
 	                                                            Enrollment_Patient 
                                                             WHERE
-                                                                ( Name like '%{name}%' or id like '%{name}%' or SpellCode like '{name}%')
+                                                                ( Name like '%{name}%' or id like '%{name}%')
 	                                                            AND OEID IS NULL 
 	                                                            AND PID IS NOT NULL 
 	                                                            AND WeChatStatus IN ( 0, 1 )
@@ -268,29 +295,5 @@ namespace PEIS.Model.Enrollment
             var item = DAOHelp.GetDataBySQL<EnrollmentPatient>($@"Select * From Enrollment_Patient a LEFT JOIN Base_Patient b ON a.PID = b.ID WHERE a.ID = {EId}");
             return item.Count != 0 ? item[0] : null;
         }
-
-        public List<EnrollmentPatient> GetEnrollmentPatients(string name) // 全局搜索登记信息
-        {
-            return DAOHelp.GetDataBySQL<EnrollmentPatient>($@"SELECT 
-                                                            CASE WHEN OEID IS NOT NULL THEN '1' ELSE NULL END AS Tel2,
-	                                                        ID,
-                                                            NAME,
-                                                            SEX,
-                                                            CAST(AGE AS VARCHAR) + AgeClass AS AgeClass,
-                                                            CardNo,
-                                                            CreateTime,
-                                                            SignTime,
-                                                            OEID,
-                                                            OrgName,
-                                                            SpellCode
-                                                            FROM
-	                                                            Enrollment_Patient 
-                                                            WHERE
-                                                                ( Name like '%{name}%' or id like '%{name}%' or SpellCode like '{name}%')
-	                                                            AND PID IS NOT NULL 
-	                                                            AND WeChatStatus IN ( 0, 1 )
-                                                            ORDER BY
-	                                                            CreateTime DESC");
-        }
     }
 }

PEIS/Model/Exam/PartModel.cs

@@ -84,7 +84,7 @@ namespace PEIS.Model
             if (!string.IsNullOrWhiteSpace(team))
                 sql += long.TryParse(team, out _) ? $@" AND  OEID ={team}" : $@"AND  OrgName LIKE '%{team}%'";
             if (!string.IsNullOrWhiteSpace(info))
-                sql += long.TryParse(info, out _) ? $@" AND EID ={info}" : $@"AND ( Name LIKE '%{info}%' or SpellCode like '{info}%' )";
+                sql += long.TryParse(info, out _) ? $@" AND EID ={info}" : $@"AND  Name LIKE '%{info}%'";
 
             var data = DAOHelp.GetDataBySQL<EnrollmentPatient>(sql).OrderByDescending(o => o.SignTime).ToList();
             return data;

PEIS/Model/Exam/TotalModel.cs

@@ -63,7 +63,7 @@ namespace PEIS.Model
             if (!string.IsNullOrWhiteSpace(team))
                 sql += long.TryParse(team, out _) ? $@" AND  OEID ={team}" : $@"AND  OrgName LIKE '%{team}%'";
             if (!string.IsNullOrWhiteSpace(info))
-                sql += long.TryParse(info, out _) ? $@" AND  EID ={info}" : $@"AND ( Name LIKE '%{info}%' or SpellCode like '{info}%' )";
+                sql += long.TryParse(info, out _) ? $@" AND  EID ={info}" : $@"AND  Name LIKE '%{info}%'";
             return DAOHelp.GetDataBySQL<EnrollmentPatient>(sql).Distinct().OrderByDescending(o => o.SignTime).ToList();
         }
 

PEIS/Model/ReportModel.cs

@@ -103,7 +103,7 @@ namespace PEIS.Model
                                                             CASE WHEN Printer IS NOT NULL AND LastPrinter IS NOT NULL THEN LastPrinter
 	                                                            ELSE Printer
                                                             END AS Printer
-                                                            FROM Enrollment_Patient a WHERE (name like '%{name}%' or ID like '%{name}%' or SpellCode like '{name}%') AND FinishTime is not null");
+                                                            FROM Enrollment_Patient a WHERE (name like '%{name}%' or ID like '%{name}%') AND FinishTime is not null");
             }
         }
 
@@ -187,7 +187,7 @@ namespace PEIS.Model
         public List<Report> GetPacsPhoto(Int64 Eid)
         {
             var pacs =  DAOHelp.GetDataBySQL<Report>($"select ReportImage from Report where EID = { Eid } AND ReportImage IS NOT NULL");
-            var heart = DAOHelp.GetDataBySQL<Report>($"select ReportData AS ReportImage from Report_GSEXD where PatientNo = {Eid} AND ReportData IS NOT NULL");
+            var heart = DAOHelp.GetDataBySQL<Report>($"select ReportData AS ReportImage from Report_GSEXD where PatientNo = {Eid}");
 
             if (heart.Count == 0)
             {
@@ -201,7 +201,7 @@ namespace PEIS.Model
                     Image bitmap = Image.FromStream(memoryStream);
                     using (MemoryStream stream = new MemoryStream())
                     {
-                        bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
+                        bitmap.RotateFlip(RotateFlipType.Rotate90FlipNone);
                         bitmap.Save(stream, ImageFormat.Jpeg);
                         var img = stream.ToArray();
                         pacs.Add(new Report { ReportImage = img });

PEIS/PEIS.csproj

@@ -12,7 +12,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>PEIS</RootNamespace>
     <AssemblyName>PEIS</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
@@ -81,8 +81,9 @@
     <Reference Include="AForge.Video.DirectShow, Version=2.2.5.0, Culture=neutral, PublicKeyToken=61ea4348d43881b7, processorArchitecture=MSIL">
       <HintPath>..\packages\AForge.Video.DirectShow.2.2.5\lib\AForge.Video.DirectShow.dll</HintPath>
     </Reference>
-    <Reference Include="Aspose.Imaging, Version=19.1.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
-      <HintPath>..\packages\Aspose.Imaging.19.1.0\lib\net40\Aspose.Imaging.dll</HintPath>
+    <Reference Include="Aspose.Imaging, Version=2.7.0.0, Culture=neutral, PublicKeyToken=00725b1ceb58d0a9, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\..\Users\15012\Downloads\Aspose.Total for .NET (Apr 2018)\Aspose.Imaging for .NET v18.3\net4.0\Aspose.Imaging.dll</HintPath>
     </Reference>
     <Reference Include="ChnCharInfo, Version=1.0.0.0, Culture=neutral, PublicKeyToken=18f031bd02e5e291, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.PinYinConverter.1.0.0\lib\ChnCharInfo.dll</HintPath>
@@ -196,7 +197,6 @@
     <Compile Include="Entity\ExamResultIsm.cs" />
     <Compile Include="Entity\Log.cs" />
     <Compile Include="Model\Exam\HistoryModel.cs" />
-    <Compile Include="Presenter\EnrollmentSearchPresenter.cs" />
     <Compile Include="Presenter\NewBasePatientPresenter.cs" />
     <Compile Include="Presenter\NewEnrollmentPersonPresenter.cs" />
     <Compile Include="Utils\ColorHelper.cs" />
@@ -325,6 +325,12 @@
     <Compile Include="View\Base\OrgForm.Designer.cs">
       <DependentUpon>OrgForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="View\Base\PatientForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="View\Base\PatientForm.Designer.cs">
+      <DependentUpon>PatientForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="View\Base\PatientImportForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -361,14 +367,7 @@
     <Compile Include="View\Enrollment\CheckCostForm.Designer.cs">
       <DependentUpon>CheckCostForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="View\Enrollment\EnrollmentSearchForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="View\Enrollment\EnrollmentSearchForm.Designer.cs">
-      <DependentUpon>EnrollmentSearchForm.cs</DependentUpon>
-    </Compile>
     <Compile Include="View\Enrollment\ICheckCostView.cs" />
-    <Compile Include="View\Enrollment\IEnrollmentSearchView.cs" />
     <Compile Include="View\Enrollment\NewEnrollmentPersonForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -543,6 +542,9 @@
     <EmbeddedResource Include="View\Base\OrgForm.resx">
       <DependentUpon>OrgForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\Base\PatientForm.resx">
+      <DependentUpon>PatientForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="View\Base\PatientImportForm.resx">
       <DependentUpon>PatientImportForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -561,9 +563,6 @@
     <EmbeddedResource Include="View\Enrollment\CheckCostForm.resx">
       <DependentUpon>CheckCostForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="View\Enrollment\EnrollmentSearchForm.resx">
-      <DependentUpon>EnrollmentSearchForm.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="View\Enrollment\NewEnrollmentPersonForm.resx">
       <DependentUpon>NewEnrollmentPersonForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -661,9 +660,6 @@
     <None Include="ReportFiles\Health.frx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="ReportFiles\OrgExcel.frx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="ReportFiles\PReport-芒市妇幼.frx" />
     <None Include="ReportFiles\Teacher.frx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -671,9 +667,6 @@
     <None Include="ReportFiles\Work.frx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="ReportFiles\医院体检人员信息收集样表.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="Utils\SS860\RDCard64\license.dat" />
     <None Include="Utils\SS860\RDCard86\license.dat" />
   </ItemGroup>
@@ -703,6 +696,9 @@
     <None Include="ReportFiles\TCheckCost.frx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="ReportFiles\体检基本信息登记表.xls">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Resources\Excel.png" />
     <None Include="Resources\excelDown.png" />
     <None Include="Resources\menuItem.png" />
@@ -785,7 +781,5 @@
     <Error Condition="!Exists('..\packages\FastReport.Net.Pro.2022.1.0\build\net40\FastReport.Net.Pro.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\FastReport.Net.Pro.2022.1.0\build\net40\FastReport.Net.Pro.props'))" />
     <Error Condition="!Exists('..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2018.4.8.256\build\PdfiumViewer.Native.x86_64.v8-xfa.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2018.4.8.256\build\PdfiumViewer.Native.x86_64.v8-xfa.props'))" />
     <Error Condition="!Exists('..\packages\PdfiumViewer.Native.x86.v8-xfa.2018.4.8.256\build\PdfiumViewer.Native.x86.v8-xfa.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PdfiumViewer.Native.x86.v8-xfa.2018.4.8.256\build\PdfiumViewer.Native.x86.v8-xfa.props'))" />
-    <Error Condition="!Exists('..\packages\EmptyLicensesLicx.3.0.0\build\EmptyLicensesLicx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EmptyLicensesLicx.3.0.0\build\EmptyLicensesLicx.targets'))" />
   </Target>
-  <Import Project="..\packages\EmptyLicensesLicx.3.0.0\build\EmptyLicensesLicx.targets" Condition="Exists('..\packages\EmptyLicensesLicx.3.0.0\build\EmptyLicensesLicx.targets')" />
 </Project>

PEIS/Presenter/EnrollmentOrgPresenter.cs

@@ -159,10 +159,6 @@ namespace PEIS.Presenter
             {
                 new EnrollmentCheckCostModel().CancelGroupTag(args.EnrollmentOID, args.IdList);
             };
-            View.GetExcelList += (send, args) =>
-            {
-                View.ShowExcelList(new EnrollmentOrgModel().GetExcelList(args.EnrollmentOID));
-            };
         }
     }
 }

PEIS/Presenter/EnrollmentPersonPresenter.cs

@@ -58,6 +58,7 @@ namespace PEIS.Presenter
                 View.ShowCancelRegInfo(new EnrollmentPatientModel().CancelRegInfo(args.ID));
             };
             View.DeleteOrder += (send, args) =>
+
             {
                 View.ShowDeleteOrder(new EnrollmentPatientModel().DeleteOrder(args.ID));
             };

PEIS/Presenter/EnrollmentSearchPresenter.cs

@@ -1,22 +0,0 @@
-using PEIS.Base;
-using PEIS.Model.Enrollment;
-using PEIS.View.Enrollment;
-
-namespace PEIS.Presenter
-{
-    internal class EnrollmentSearchPresenter : Presenter<IEnrollmentSearchView>
-    {
-        public EnrollmentSearchPresenter(IEnrollmentSearchView view) : base(view)
-        {
-        }
-
-        protected override void OnViewSet()
-        {
-            // 全局搜索
-            View.GetRegItems += (send, args) =>
-            {
-                View.ShowRegItems(new EnrollmentPatientModel().GetEnrollmentPatients(args.Name));
-            };
-        }
-    }
-}

PEIS/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace PEIS.Properties {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -47,8 +47,8 @@ namespace PEIS.Properties {
         }
         
         /// <summary>
-        ///   重写当前线程的 CurrentUICulture 属性，对
-        ///   使用此强类型资源类的所有资源查找执行重写。
+        ///   重写当前线程的 CurrentUICulture 属性
+        ///   重写当前线程的 CurrentUICulture 属性。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {

PEIS/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace PEIS.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

PEIS/Properties/licenses.licx

@@ -0,0 +1,11 @@
+DevExpress.Patch.InMemoryPatch, DevExpress.Patch.Common, Version=8.0.0.0, Culture=neutral, PublicKeyToken=7fc7bfca2443de66
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

PEIS/ReportFiles/OrgExcel.frx

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="06/26/2023 17:47:58" ReportInfo.Modified="08/29/2024 10:00:30" ReportInfo.CreatorVersion="2022.1.0.0">
-  <ScriptText>using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Windows.Forms;
-using System.Drawing;
-using System.Data;
-using FastReport;
-using FastReport.Data;
-using FastReport.Dialog;
-using FastReport.Barcode;
-using FastReport.Table;
-using FastReport.Utils;
-
-namespace FastReport
-{
-  public class ReportScript
-  {
-
-    private void PeopleCount_AfterData(object sender, EventArgs e)
-    {
-      DataSourceBase rowData = Report.GetDataSource(&quot;O&quot;);
-      Cell86.Text = rowData[&quot;SignTime&quot;] == null ? &quot;&quot; : Convert.ToDateTime(rowData[&quot;SignTime&quot;]).ToString(&quot;yyyy-MM-dd&quot;);
-    }
-  }
-}
-</ScriptText>
-  <Dictionary>
-    <Parameter Name="OrgName" DataType="System.String"/>
-    <Parameter Name="TotalCount" DataType="System.String"/>
-    <Parameter Name="Yes" DataType="System.String"/>
-    <Parameter Name="No" DataType="System.String"/>
-  </Dictionary>
-  <ReportPage Name="Page1" RawPaperSize="9" Watermark.Font="宋体, 60pt">
-    <ColumnHeaderBand Name="ColumnHeader1" Width="718.2" Height="56.7" PrintOn="FirstPage">
-      <TextObject Name="Text1" Width="718.2" Height="56.7" Text="[OrgName]" AutoShrink="FontWidth" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 26pt, style=Bold"/>
-    </ColumnHeaderBand>
-    <DataBand Name="OrgExcel" Top="98.5" Width="718.2" Height="37.8" CanGrow="true" CanShrink="true" AfterDataEvent="PeopleCount_AfterData">
-      <TableObject Name="Table8" Width="718.19" Height="37.8">
-        <TableColumn Name="Column57" Width="36.96"/>
-        <TableColumn Name="Column58" Width="55.86"/>
-        <TableColumn Name="Column59" Width="55.86"/>
-        <TableColumn Name="Column60" Width="36.95"/>
-        <TableColumn Name="Column61" Width="36.96"/>
-        <TableColumn Name="Column62" Width="46.41"/>
-        <TableColumn Name="Column63" Width="169.25"/>
-        <TableColumn Name="Column64" Width="65.31"/>
-        <TableColumn Name="Column65" Width="74.77"/>
-        <TableColumn Name="Column66" Width="73.71"/>
-        <TableColumn Name="Column67"/>
-        <TableRow Name="Row8" Height="37.8">
-          <TableCell Name="Cell77" Border.Lines="All" Text="[Row#]" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          <TableCell Name="Cell78" Border.Lines="All" Text="[O.ID]" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          <TableCell Name="Cell79" Border.Lines="All" Text="[O.Name]" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          <TableCell Name="Cell80" Border.Lines="All" Text="[O.Sex]" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          <TableCell Name="Cell81" Border.Lines="All" Text="[O.Marriage]" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          <TableCell Name="Cell82" Border.Lines="All" Text="[O.AgeClass]" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          <TableCell Name="Cell83" Border.Lines="All" Text="[O.CardNo]" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          <TableCell Name="Cell84" Border.Lines="All" Text="[O.Tel1]" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          <TableCell Name="Cell85" Border.Lines="All" Text="[O.DeptName]" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          <TableCell Name="Cell86" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          <TableCell Name="Cell87" Border.Lines="All" Text="[O.Fee]" VertAlign="Center" Font="微软雅黑, 10pt"/>
-        </TableRow>
-      </TableObject>
-      <DataHeaderBand Name="DataHeader1" Top="58.7" Width="718.2" Height="37.8">
-        <TableObject Name="Table1" Width="718.19" Height="37.8">
-          <TableColumn Name="Column1" Width="36.96"/>
-          <TableColumn Name="Column2" Width="55.86"/>
-          <TableColumn Name="Column3" Width="55.86"/>
-          <TableColumn Name="Column4" Width="36.95"/>
-          <TableColumn Name="Column5" Width="36.96"/>
-          <TableColumn Name="Column6" Width="46.41"/>
-          <TableColumn Name="Column7" Width="169.25"/>
-          <TableColumn Name="Column8" Width="65.31"/>
-          <TableColumn Name="Column9" Width="74.77"/>
-          <TableColumn Name="Column45" Width="73.71"/>
-          <TableColumn Name="Column56"/>
-          <TableRow Name="Row1" Height="37.8">
-            <TableCell Name="Cell1" Border.Lines="All" Text="序号" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-            <TableCell Name="Cell2" Border.Lines="All" Text="体检号" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-            <TableCell Name="Cell3" Border.Lines="All" Text="姓名" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-            <TableCell Name="Cell4" Border.Lines="All" Text="性别" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-            <TableCell Name="Cell5" Border.Lines="All" Text="婚姻" Padding="0, 0, 0, 0" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-            <TableCell Name="Cell6" Border.Lines="All" Text="年龄" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-            <TableCell Name="Cell7" Border.Lines="All" Text="证件号" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-            <TableCell Name="Cell8" Border.Lines="All" Text="联系方式" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-            <TableCell Name="Cell9" Border.Lines="All" Text="部门" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-            <TableCell Name="Cell65" Border.Lines="All" Text="体检日期" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-            <TableCell Name="Cell76" Border.Lines="All" Text="体检费用" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          </TableRow>
-        </TableObject>
-      </DataHeaderBand>
-      <DataFooterBand Name="DataFooter1" Top="138.3" Width="718.2" Height="28.35">
-        <TableObject Name="Table5" Width="718.2" Height="28.35" Fill.Color="InactiveBorder">
-          <TableColumn Name="Column35" Width="718.2"/>
-          <TableRow Name="Row5" Height="28.35" AutoSize="true">
-            <TableCell Name="Cell55" Border.Lines="All" Fill.Color="InactiveBorder" Text="-总计-：[TotalCount]人，已体检：[Yes]人，未体检：[No]人" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          </TableRow>
-        </TableObject>
-      </DataFooterBand>
-    </DataBand>
-  </ReportPage>
-</Report>

PEIS/Utils/ExcelHelper.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
 using NPOI.HSSF.UserModel;
-using NPOI.SS.UserModel;
 using NPOI.XSSF.UserModel;
 using PEIS.Entity;
 
@@ -12,9 +12,9 @@ namespace PEIS.Utils
 {
     public class ExcelHelper
     {
-        private int StartRow = 4;
+
         public List<BasePatient> SuccessList = new List<BasePatient>();
-        public List<ExcelRowModel> ErrorList = new List<ExcelRowModel>();
+        public List<BasePatient> ErrorList = new List<BasePatient>();
         public void ReadOrgPatientList()
         {
             try
@@ -24,7 +24,17 @@ namespace PEIS.Utils
                 dialog.Filter = @"Excel文件 (*.xls;*.xlsx)|*.xls;*.xlsx";
                 if (dialog.ShowDialog() != DialogResult.OK) return;
                 var excelFilePath = dialog.FileName;
-                ReadExcelData(excelFilePath);
+                var fileExtension = Path.GetExtension(excelFilePath);
+                switch (fileExtension)
+                {
+                    case ".xls":
+                        ReadXLS(excelFilePath);
+                        break;
+
+                    case ".xlsx":
+                        ReadXLSX(excelFilePath);
+                        break;
+                }
             }
             catch (Exception e)
             {
@@ -32,124 +42,215 @@ namespace PEIS.Utils
                 Global.Msg("err", e.Message);
             }
         }
+
         /// <summary>
-        /// 读取Excel文件
+        /// 读取Excel XLS文件
         /// </summary>
-        /// <param name="excelFilePath">指定 .xlsx/.xls 文件的路径</param>
-        public void ReadExcelData(string excelFilePath)
+        /// <param name="excelFilePath"></param>
+        public void ReadXLS(string excelFilePath)
         {
-            var fileExtension = Path.GetExtension(excelFilePath);
-            if (fileExtension != ".xls" && fileExtension != ".xlsx") return;
             using (var fileStream = new FileStream(excelFilePath, FileMode.Open, FileAccess.Read))
             {
-                var sheet = GetSheet(fileStream, fileExtension); // 第一个工作表
-                for (int startIndex = 0; startIndex < StartRow; startIndex++)
+
+                // 使用 HSSFWorkbook 打开 .xls 文件
+                var workbook = new HSSFWorkbook(fileStream);
+                // 选择工作表 第一个工作表
+                var sheet = workbook.GetSheetAt(0);
+                // 获取工作表的行数
+                var rowCount = sheet.PhysicalNumberOfRows;
+                int continuousEmpty = 0;
+                // 遍历工作表并读取数据
+                for (var row = 3; row < rowCount; row++)
                 {
-                    ErrorList.Add(new ExcelRowModel(startIndex, sheet.GetRow(startIndex)));
+                    if (continuousEmpty == 3)
+                    {
+                        break; // 如果连续三个错误，停止循环
+                    }
+                    var dataRow = sheet.GetRow(row);
+
+                    var name = dataRow.GetCell(0).ToString();
+                    var cardNo = dataRow.GetCell(4)?.ToString();
+
+                    if (string.IsNullOrEmpty(dataRow.GetCell(0).ToString())
+                        || !string.IsNullOrEmpty(cardNo) && cardNo.Length != 18
+                        || (cardNo?.Length == 18 && !DateTime.TryParseExact(cardNo.Substring(6, 8), "yyyyMMdd", null,
+                            DateTimeStyles.None, out _)))
+                    {
+                        continuousEmpty++;
+                        ErrorList.Add(new BasePatient()
+                        {
+                            ID = row,
+                            Name = dataRow.GetCell(0).ToString(),
+                            Sex = dataRow.GetCell(1).ToString(),
+                            Marriage = dataRow.GetCell(2).ToString(),
+                            Nation = dataRow.GetCell(3).ToString(),
+                            CardNo = dataRow.GetCell(4).ToString(),
+                            CardType = "居民身份证",
+                            Education = dataRow.GetCell(5).ToString(),
+                            Tel1 = dataRow.GetCell(6).ToString(),
+                            Address1 = dataRow.GetCell(7).ToString(),
+                            DeptName = dataRow.GetCell(8).ToString(),
+                        });
+                        continue;
+                    }
+
+                    SuccessList.Add(new BasePatient()
+                    {
+                        Name = name,
+                        Sex = dataRow.GetCell(1).ToString(),
+                        Marriage = dataRow.GetCell(2).ToString(),
+                        Nation = dataRow.GetCell(3).ToString(),
+                        CardNo = cardNo,
+                        CardType = "居民身份证",
+                        Education = dataRow.GetCell(5).ToString(),
+                        Tel1 = dataRow.GetCell(6).ToString(),
+                        Address1 = dataRow.GetCell(7).ToString(),
+                        DeptName = dataRow.GetCell(8).ToString(),
+                    });
+                    continuousEmpty = 0;
                 }
+            };
+        }
+
+        /// <summary>
+        /// 读取Excel XLSX文件
+        /// </summary>
+        /// <param name="excelFilePath">指定 .xlsx 文件的路径</param>
+        public void ReadXLSX(string excelFilePath)
+        {
+            using (var fileStream = new FileStream(excelFilePath, FileMode.Open, FileAccess.Read))
+            {
+                var workbook = new XSSFWorkbook(fileStream);
+                var sheet = workbook.GetSheetAt(0); // 第一个工作表
+
                 // 获取工作表的行数和列数
                 var rowCount = sheet.PhysicalNumberOfRows;
+
                 int continuousEmpty = 0;
                 // 遍历工作表并读取数据
-                for (var row = StartRow; row < rowCount; row++)
+                for (var row = 2; row < rowCount; row++)
                 {
-                    if (continuousEmpty == 5)
+                    if (continuousEmpty == 3)
                     {
-                        break; // 如果连续5行错误，停止循环
+                        break; // 如果连续三个错误，停止循环
                     }
                     var dataRow = sheet.GetRow(row);
-                    var readPatient = ReadRowToBasePatient(dataRow);
-                    var isBasePatient = readPatient.Validate();
-                    if (!isBasePatient || SuccessList.Any(p => p.CardNo == readPatient.CardNo))
+                    var name = dataRow.GetCell(0).ToString();
+                    var cardNo = dataRow.GetCell(4)?.ToString();
+                    if (string.IsNullOrEmpty(dataRow.GetCell(0).ToString()) || !string.IsNullOrEmpty(cardNo) && cardNo.Length != 18 || (cardNo?.Length == 18 && !DateTime.TryParseExact(cardNo.Substring(6, 8), "yyyyMMdd", null,
+                            DateTimeStyles.None, out _)))
                     {
                         continuousEmpty++;
-                        if (!string.IsNullOrEmpty(dataRow.GetCell(4)?.ToString())){
-                            dataRow.GetCell(9).SetCellValue("身份证检验错误！");
-                        }
-                        ErrorList.Add(new ExcelRowModel(row, dataRow));
+                        ErrorList.Add(new BasePatient()
+                        {
+                            ID = row,
+                            Name = dataRow.GetCell(0).ToString(),
+                            Sex = dataRow.GetCell(1).ToString(),
+                            Marriage = dataRow.GetCell(2).ToString(),
+                            Nation = dataRow.GetCell(3).ToString(),
+                            CardNo = dataRow.GetCell(4).ToString(),
+                            CardType = "居民身份证",
+                            Education = dataRow.GetCell(5).ToString(),
+                            Tel1 = dataRow.GetCell(6).ToString(),
+                            Address1 = dataRow.GetCell(7).ToString(),
+                            DeptName = dataRow.GetCell(8).ToString(),
+                        });
                         continue;
                     }
-                    SuccessList.Add(readPatient);
+
+                    SuccessList.Add(new BasePatient()
+                    {
+                        Name = name,
+                        Sex = dataRow.GetCell(1).ToString(),
+                        Marriage = dataRow.GetCell(2).ToString(),
+                        Nation = dataRow.GetCell(3).ToString(),
+                        CardNo = cardNo,
+                        CardType = "居民身份证",
+                        Education = dataRow.GetCell(5).ToString(),
+                        Tel1 = dataRow.GetCell(6).ToString(),
+                        Address1 = dataRow.GetCell(7).ToString(),
+                        DeptName = dataRow.GetCell(8).ToString(),
+                    });
                     continuousEmpty = 0;
                 }
             };
         }
 
-        private static ISheet GetSheet(FileStream fileStream, string fileExtension)
+
+        // /// <summary>
+        // /// 导出Excel
+        // /// </summary>
+        // /// <param name="list"></param>
+        // /// <param name="propertyStr"></param>
+        // /// <returns></returns>
+        // private MemoryStream ExportExcel(List<EnrollmentPatient> list, string propertyStr)
+        // {
+        //     var properties = propertyStr.Split(',').ToList();
+        //     using (var package = new ExcelPackage())
+        //     {
+        //         // 添加工作表
+        //         var worksheet = package.Workbook.Worksheets.Add($"{DateTime.Now:yyyyMMdd}");
+        //         // 将列名添加到第一行
+        //         for (var i = 0; i < properties.Count; i++)
+        //         {
+        //             if (Properties.ContainsKey(properties[i]))
+        //                 worksheet.Cells[1, i + 1].Value = Properties[(properties[i])];
+        //         }
+        //         // 将数据写入单元格
+        //         for (var row = 0; row < list.Count; row++)
+        //         {
+        //             for (var col = 0; col < properties.Count; col++)
+        //             {
+        //                 worksheet.Cells[row + 2, col + 1].Value = GetValueByPropertyNameHandle(list[row], properties[col]);
+        //             }
+        //         }
+        //         // 自动调整列宽
+        //         worksheet.Cells.AutoFitColumns();
+        //         // 保存文件到 MemoryStream
+        //         var memoryStream = new MemoryStream(package.GetAsByteArray());
+        //         // 设置流的位置为起始位置
+        //         memoryStream.Seek(0, SeekOrigin.Begin);
+        //         // 返回 Excel 文件
+        //         return memoryStream;
+        //     }  
+        // }
+
+        /// <summary>
+        /// 可选字段
+        /// </summary>
+        private static Dictionary<string, string> Properties = new Dictionary<string, string>()
         {
-            if (fileExtension == ".xls")
-                return new HSSFWorkbook(fileStream).GetSheetAt(0);
+            {"Id", "id"},
+            {"CriticalName", "项目名称"},
+            {"CriticalCode", "项目代码"},
+            {"CriticalValue", "危急值"},
+            {"Description", "描述"},
+            {"Unit", "单位"},  
+        };
 
-            if (fileExtension == ".xlsx")
-                return new XSSFWorkbook(fileStream).GetSheetAt(0); // 第一个工作表 
-            return null;
-        }
-        private static BasePatient ReadRowToBasePatient(IRow dataRow)
+
+        /// <summary>
+        /// 根据属性名获取对象的属性值
+        /// </summary>
+        /// <param name="patient"></param>
+        /// <param name="propertyName"></param>
+        /// <returns></returns>
+        private string GetValueByPropertyNameHandle(EnrollmentPatient patient, string propertyName)
         {
-            var sex = dataRow.GetCell(2)?.ToString()??"";
-            return new BasePatient()
+            switch (propertyName)
             {
-                // A-0-序号，B-1-姓名，C-2-性别，D-3-民族，E-4-婚姻，F-5-身份证号，G-6-住址，H-7-电话，I-8-部门，J-9备注 
-                Name = dataRow.GetCell(1)?.ToString().Replace(" ", ""),
-                Contactor1 = dataRow.GetCell(1)?.ToString().Replace(" ", ""),
-                Sex = sex.Contains("女")?"2":"1",
-                Nation = dataRow.GetCell(3)?.ToString(),
-                Marriage = dataRow.GetCell(4)?.ToString(),
-                CardNo = dataRow.GetCell(5)?.ToString(),
-                CardType = "居民身份证",
-                Address1 = dataRow.GetCell(6)?.ToString(),
-                Tel1 = dataRow.GetCell(7)?.ToString(),
-                DeptName = dataRow.GetCell(8)?.ToString(),
-                Description = dataRow.GetCell(9)?.ToString(),
-                SpellCode = PingYinHelper.GetTotalPingYin(dataRow.GetCell(1)?.ToString().Replace(" ", "")).FirstPingYin.Count == 0 ? null : PingYinHelper.GetTotalPingYin(dataRow.GetCell(1)?.ToString().Replace(" ", "")).FirstPingYin[0]
-            };
+                case "Id":
+                    return patient.ID.ToString(); 
+                case "Name":
+                    return patient.Name; 
+                case "Age":
+                    return patient.Age + " " + patient.AgeClass; 
+                default:
+                    return "";
+            } 
         }
-    }
 
-    public class ExcelRowModel
-    {
-        public int RowCount { get; set; }
-        public string ColumnA { get; set; }
-        public string ColumnB { get; set; }
-        public string ColumnC { get; set; }
-        public string ColumnD { get; set; }
-        public string ColumnE { get; set; }
-        public string ColumnF { get; set; }
-        public string ColumnG { get; set; }
-        public string ColumnH { get; set; }
-        public string ColumnI { get; set; }
-        public string ColumnJ { get; set; }
-        public ExcelRowModel()
-        {
+}
 
-        }
 
-        public ExcelRowModel(int rowCount, IRow row)
-        {
-            RowCount = rowCount + 1;
-            ColumnA = row.GetCell(0)?.ToString()??"";
-            ColumnB = row.GetCell(1)?.ToString()??"";
-            ColumnC = row.GetCell(2)?.ToString()??"";
-            ColumnD = row.GetCell(3)?.ToString()??"";
-            ColumnE = row.GetCell(4)?.ToString()??"";
-            ColumnF = row.GetCell(5)?.ToString()??"";
-            ColumnG = row.GetCell(6)?.ToString()??"";
-            ColumnH = row.GetCell(7)?.ToString()??"";
-            ColumnI = row.GetCell(8)?.ToString()??"";
-            ColumnJ = row.GetCell(9)?.ToString()??"";
-        }
-        public ExcelRowModel(BasePatient p)
-        {
-            ColumnA = p.Name;
-            ColumnB = p.Sex;
-            ColumnC = p.Nation;
-            ColumnD = p.Marriage;
-            ColumnE = p.CardNo;
-            ColumnF = p.CardType;
-            ColumnG = p.Address1;
-            ColumnH = p.Tel1;
-            ColumnI = p.DeptName;
-            ColumnJ = p.Description;
-        }
-    }
 }

PEIS/Utils/ReportHelper.cs

@@ -274,7 +274,7 @@ namespace PEIS.Utils
             rpt.SetParameterValue("HospitalName", Global._hospital.Name);
             rpt.SetParameterValue("DeptName", patient.DeptName);
 
-            if(string.IsNullOrEmpty(patient.Photo))
+            if(patient.Photo == null)
             {
                 rpt.SetParameterValue("Avatar", patient.Photo);
             }

PEIS/View/Base/NewPersonForm.cs

@@ -308,8 +308,7 @@ namespace PEIS.View.Base
                 Description = Description.Text.Trim(),
                 CreateTime = DateTime.Now,
                 Creator = Global.currentUser.Name,
-                CreatorCode = Global.currentUser.Code,
-                SpellCode = PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin.Count == 0 ? null : PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin[0]
+                CreatorCode = Global.currentUser.Code
             };
 
             if (item.Save())

PEIS/View/Base/PatientForm.Designer.cs

@@ -0,0 +1,505 @@
+namespace PEIS.View.Base
+{
+    partial class PatientForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.DgcPatient = new DevExpress.XtraGrid.GridControl();
+            this.DgvPatient = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.colContactor2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemImageEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageEdit();
+            this.panel6 = new System.Windows.Forms.Panel();
+            this.OpsPatient = new PEIS.View.UControl.OpMenuSimple();
+            this.label2 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.DgcPatient)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DgvPatient)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemImageEdit1)).BeginInit();
+            this.panel6.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // DgcPatient
+            // 
+            this.DgcPatient.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.DgcPatient.Location = new System.Drawing.Point(0, 41);
+            this.DgcPatient.MainView = this.DgvPatient;
+            this.DgcPatient.Name = "DgcPatient";
+            this.DgcPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemImageEdit1});
+            this.DgcPatient.Size = new System.Drawing.Size(933, 596);
+            this.DgcPatient.TabIndex = 130;
+            this.DgcPatient.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.DgvPatient});
+            // 
+            // DgvPatient
+            // 
+            this.DgvPatient.Appearance.FooterPanel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.DgvPatient.Appearance.FooterPanel.ForeColor = System.Drawing.Color.Red;
+            this.DgvPatient.Appearance.FooterPanel.Options.UseFont = true;
+            this.DgvPatient.Appearance.FooterPanel.Options.UseForeColor = true;
+            this.DgvPatient.Appearance.GroupRow.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.DgvPatient.Appearance.GroupRow.Options.UseFont = true;
+            this.DgvPatient.Appearance.Row.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.DgvPatient.Appearance.Row.Options.UseFont = true;
+            this.DgvPatient.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn1,
+            this.gridColumn2,
+            this.gridColumn3,
+            this.gridColumn4,
+            this.gridColumn5,
+            this.gridColumn7,
+            this.gridColumn11,
+            this.gridColumn6,
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn16,
+            this.gridColumn17,
+            this.gridColumn9,
+            this.gridColumn19,
+            this.colContactor2,
+            this.gridColumn10,
+            this.gridColumn27,
+            this.gridColumn28,
+            this.gridColumn29,
+            this.gridColumn30,
+            this.gridColumn8,
+            this.gridColumn31});
+            this.DgvPatient.FixedLineWidth = 1;
+            this.DgvPatient.GridControl = this.DgcPatient;
+            this.DgvPatient.IndicatorWidth = 30;
+            this.DgvPatient.Name = "DgvPatient";
+            this.DgvPatient.OptionsSelection.MultiSelect = true;
+            this.DgvPatient.OptionsView.ColumnAutoWidth = false;
+            this.DgvPatient.OptionsView.ShowGroupPanel = false;
+            this.DgvPatient.RowHeight = 30;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gridColumn1.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen;
+            this.gridColumn1.AppearanceCell.Options.UseFont = true;
+            this.gridColumn1.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn1.Caption = "姓名";
+            this.gridColumn1.FieldName = "Name";
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.AllowEdit = false;
+            this.gridColumn1.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn1.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn1.OptionsColumn.ReadOnly = true;
+            this.gridColumn1.OptionsFilter.AllowFilter = false;
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 0;
+            this.gridColumn1.Width = 80;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gridColumn2.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen;
+            this.gridColumn2.AppearanceCell.Options.UseFont = true;
+            this.gridColumn2.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn2.Caption = "性别";
+            this.gridColumn2.FieldName = "Sex";
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.OptionsColumn.AllowEdit = false;
+            this.gridColumn2.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn2.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn2.OptionsColumn.ReadOnly = true;
+            this.gridColumn2.OptionsFilter.AllowFilter = false;
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 1;
+            this.gridColumn2.Width = 40;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "出生年月";
+            this.gridColumn3.FieldName = "Birthday";
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.OptionsColumn.AllowEdit = false;
+            this.gridColumn3.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn3.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn3.OptionsColumn.ReadOnly = true;
+            this.gridColumn3.OptionsFilter.AllowFilter = false;
+            this.gridColumn3.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Count, "BloodCode", "合计：{0} 个血袋")});
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 2;
+            this.gridColumn3.Width = 100;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "证件类型";
+            this.gridColumn4.FieldName = "CardType";
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.OptionsColumn.AllowEdit = false;
+            this.gridColumn4.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn4.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn4.OptionsColumn.ReadOnly = true;
+            this.gridColumn4.OptionsFilter.AllowFilter = false;
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 3;
+            this.gridColumn4.Width = 80;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gridColumn5.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen;
+            this.gridColumn5.AppearanceCell.Options.UseFont = true;
+            this.gridColumn5.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn5.Caption = "证件号码";
+            this.gridColumn5.FieldName = "CardNo";
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.OptionsColumn.AllowEdit = false;
+            this.gridColumn5.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn5.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn5.OptionsColumn.ReadOnly = true;
+            this.gridColumn5.OptionsFilter.AllowFilter = false;
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 4;
+            this.gridColumn5.Width = 160;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen;
+            this.gridColumn7.AppearanceCell.Options.UseFont = true;
+            this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn7.Caption = "民族";
+            this.gridColumn7.FieldName = "Nation";
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.OptionsColumn.AllowEdit = false;
+            this.gridColumn7.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn7.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn7.OptionsColumn.ReadOnly = true;
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 5;
+            this.gridColumn7.Width = 60;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "学历";
+            this.gridColumn11.FieldName = "Education";
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.OptionsColumn.AllowEdit = false;
+            this.gridColumn11.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn11.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn11.OptionsColumn.ReadOnly = true;
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 6;
+            this.gridColumn11.Width = 60;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "婚况";
+            this.gridColumn6.FieldName = "Marriage";
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.OptionsColumn.AllowEdit = false;
+            this.gridColumn6.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn6.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn6.OptionsColumn.ReadOnly = true;
+            this.gridColumn6.OptionsFilter.AllowFilter = false;
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 7;
+            this.gridColumn6.Width = 60;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "职业";
+            this.gridColumn14.FieldName = "Occupation";
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.OptionsColumn.AllowEdit = false;
+            this.gridColumn14.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn14.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn14.OptionsColumn.ReadOnly = true;
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 8;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "工作单位";
+            this.gridColumn15.FieldName = "Company";
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.OptionsColumn.AllowEdit = false;
+            this.gridColumn15.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn15.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn15.OptionsColumn.ReadOnly = true;
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 9;
+            this.gridColumn15.Width = 200;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "籍贯";
+            this.gridColumn16.FieldName = "CardAddress";
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.OptionsColumn.AllowEdit = false;
+            this.gridColumn16.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn16.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn16.OptionsColumn.ReadOnly = true;
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 10;
+            this.gridColumn16.Width = 200;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.Caption = "联系人1";
+            this.gridColumn17.FieldName = "Contactor1";
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.OptionsColumn.AllowEdit = false;
+            this.gridColumn17.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn17.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn17.OptionsColumn.ReadOnly = true;
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 11;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "联系电话1";
+            this.gridColumn9.FieldName = "Tel1";
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.OptionsColumn.AllowEdit = false;
+            this.gridColumn9.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn9.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn9.OptionsColumn.ReadOnly = true;
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 12;
+            this.gridColumn9.Width = 100;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "联系地址1";
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.OptionsColumn.AllowEdit = false;
+            this.gridColumn19.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn19.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn19.OptionsColumn.ReadOnly = true;
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 13;
+            // 
+            // colContactor2
+            // 
+            this.colContactor2.Caption = "联系人2";
+            this.colContactor2.FieldName = "Contactor2";
+            this.colContactor2.Name = "colContactor2";
+            this.colContactor2.OptionsColumn.AllowEdit = false;
+            this.colContactor2.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.colContactor2.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.colContactor2.OptionsColumn.ReadOnly = true;
+            this.colContactor2.Visible = true;
+            this.colContactor2.VisibleIndex = 14;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "联系电话2";
+            this.gridColumn10.FieldName = "Tel2";
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.OptionsColumn.AllowEdit = false;
+            this.gridColumn10.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn10.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn10.OptionsColumn.ReadOnly = true;
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 20;
+            this.gridColumn10.Width = 100;
+            // 
+            // gridColumn27
+            // 
+            this.gridColumn27.Caption = "联系地址2";
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.OptionsColumn.AllowEdit = false;
+            this.gridColumn27.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn27.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn27.OptionsColumn.ReadOnly = true;
+            this.gridColumn27.Visible = true;
+            this.gridColumn27.VisibleIndex = 15;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "备注";
+            this.gridColumn28.FieldName = "Description";
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.OptionsColumn.AllowEdit = false;
+            this.gridColumn28.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn28.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn28.OptionsColumn.ReadOnly = true;
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 16;
+            // 
+            // gridColumn29
+            // 
+            this.gridColumn29.Caption = "建档时间";
+            this.gridColumn29.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.gridColumn29.FieldName = "CreateTime";
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.OptionsColumn.AllowEdit = false;
+            this.gridColumn29.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn29.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn29.OptionsColumn.ReadOnly = true;
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 17;
+            this.gridColumn29.Width = 130;
+            // 
+            // gridColumn30
+            // 
+            this.gridColumn30.Caption = "建档人";
+            this.gridColumn30.FieldName = "Creator";
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.OptionsColumn.AllowEdit = false;
+            this.gridColumn30.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn30.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn30.OptionsColumn.ReadOnly = true;
+            this.gridColumn30.Visible = true;
+            this.gridColumn30.VisibleIndex = 18;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "ID";
+            this.gridColumn8.FieldName = "ID";
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.OptionsColumn.AllowEdit = false;
+            this.gridColumn8.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn8.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn8.OptionsColumn.ReadOnly = true;
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 19;
+            this.gridColumn8.Width = 40;
+            // 
+            // gridColumn31
+            // 
+            this.gridColumn31.Caption = "身份证照片";
+            this.gridColumn31.ColumnEdit = this.repositoryItemImageEdit1;
+            this.gridColumn31.FieldName = "Photo";
+            this.gridColumn31.Name = "gridColumn31";
+            this.gridColumn31.Visible = true;
+            this.gridColumn31.VisibleIndex = 21;
+            // 
+            // repositoryItemImageEdit1
+            // 
+            this.repositoryItemImageEdit1.AutoHeight = false;
+            this.repositoryItemImageEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemImageEdit1.Name = "repositoryItemImageEdit1";
+            // 
+            // panel6
+            // 
+            this.panel6.BackColor = System.Drawing.Color.White;
+            this.panel6.Controls.Add(this.OpsPatient);
+            this.panel6.Controls.Add(this.label2);
+            this.panel6.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel6.Location = new System.Drawing.Point(0, 0);
+            this.panel6.Name = "panel6";
+            this.panel6.Size = new System.Drawing.Size(933, 41);
+            this.panel6.TabIndex = 129;
+            // 
+            // OpsPatient
+            // 
+            this.OpsPatient.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.OpsPatient.Location = new System.Drawing.Point(136, 0);
+            this.OpsPatient.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.OpsPatient.Name = "OpsPatient";
+            this.OpsPatient.Size = new System.Drawing.Size(797, 41);
+            this.OpsPatient.TabIndex = 1;
+            // 
+            // label2
+            // 
+            this.label2.Dock = System.Windows.Forms.DockStyle.Left;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(0, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(136, 41);
+            this.label2.TabIndex = 0;
+            this.label2.Text = "人员基础信息库";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // PatientForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(933, 637);
+            this.Controls.Add(this.DgcPatient);
+            this.Controls.Add(this.panel6);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Name = "PatientForm";
+            this.Text = "人员基本信息";
+            ((System.ComponentModel.ISupportInitialize)(this.DgcPatient)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DgvPatient)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemImageEdit1)).EndInit();
+            this.panel6.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraGrid.GridControl DgcPatient;
+        private DevExpress.XtraGrid.Views.Grid.GridView DgvPatient;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private System.Windows.Forms.Panel panel6;
+        private UControl.OpMenuSimple OpsPatient;
+        private System.Windows.Forms.Label label2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn colContactor2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
+        private DevExpress.XtraEditors.Repository.RepositoryItemImageEdit repositoryItemImageEdit1;
+    }
+}

PEIS/View/Base/PatientForm.cs

@@ -0,0 +1,40 @@
+using PEIS.Base;
+using PEIS.Entity;
+using PEIS.Event;
+using PEIS.Presenter;
+using System;
+using System.Collections.Generic;
+
+namespace PEIS.View.Base
+{
+    public partial class PatientForm : ViewBase, IBasePatientView
+    {
+        public PatientForm()
+        {
+            InitializeComponent();
+            Shown += PatientForm_Shown;
+        }
+
+        protected override object CreatePresenter()
+        {
+            return new BasePatientPresenter(this);
+        }
+
+        private void PatientForm_Shown(object sender, EventArgs e)
+        {
+            OnGetBasePatient();
+        }
+
+        public event EventHandler<Args<BasePatient>> GetBasePatient;
+
+        protected virtual void OnGetBasePatient()
+        {
+            GetBasePatient?.Invoke(this, new Args<BasePatient> { });
+        }
+
+        public void ShowBasePatient(List<BasePatient> items)
+        {
+            DgcPatient.DataSource = items;
+        }
+    }
+}

PEIS/View/Base/PatientImportForm.Designer.cs

@@ -65,6 +65,15 @@
             this.DgcError = new DevExpress.XtraGrid.GridControl();
             this.DgvError = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.colNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
@@ -81,15 +90,6 @@
             this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.panel2 = new System.Windows.Forms.Panel();
             this.label1 = new System.Windows.Forms.Label();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.panel1.SuspendLayout();
             this.OpsPatient.SuspendLayout();
@@ -582,11 +582,133 @@
             // colNo
             // 
             this.colNo.Caption = "Excel行号";
-            this.colNo.FieldName = "RowCount";
+            this.colNo.FieldName = "id";
             this.colNo.Name = "colNo";
             this.colNo.Visible = true;
             this.colNo.VisibleIndex = 0;
             // 
+            // gridColumn7
+            // 
+            this.gridColumn7.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gridColumn7.AppearanceCell.Options.UseFont = true;
+            this.gridColumn7.Caption = "姓名";
+            this.gridColumn7.FieldName = "Name";
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn7.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn7.OptionsColumn.ReadOnly = true;
+            this.gridColumn7.OptionsFilter.AllowFilter = false;
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 1;
+            this.gridColumn7.Width = 100;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gridColumn8.AppearanceCell.Options.UseFont = true;
+            this.gridColumn8.Caption = "性别";
+            this.gridColumn8.FieldName = "Sex";
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn8.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn8.OptionsColumn.ReadOnly = true;
+            this.gridColumn8.OptionsFilter.AllowFilter = false;
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 2;
+            this.gridColumn8.Width = 50;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gridColumn14.AppearanceCell.Options.UseFont = true;
+            this.gridColumn14.Caption = "婚况";
+            this.gridColumn14.FieldName = "Marriage";
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn14.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn14.OptionsColumn.ReadOnly = true;
+            this.gridColumn14.OptionsFilter.AllowFilter = false;
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 3;
+            this.gridColumn14.Width = 60;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "民族";
+            this.gridColumn15.FieldName = "Nation";
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn15.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn15.OptionsColumn.ReadOnly = true;
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 4;
+            this.gridColumn15.Width = 100;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "身份证号";
+            this.gridColumn16.FieldName = "CardNo";
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn16.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn16.OptionsColumn.ReadOnly = true;
+            this.gridColumn16.OptionsFilter.AllowFilter = false;
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 5;
+            this.gridColumn16.Width = 140;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gridColumn17.AppearanceCell.Options.UseFont = true;
+            this.gridColumn17.Caption = "教育程度";
+            this.gridColumn17.FieldName = "Education";
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.OptionsColumn.AllowEdit = false;
+            this.gridColumn17.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn17.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn17.OptionsColumn.ReadOnly = true;
+            this.gridColumn17.OptionsFilter.AllowFilter = false;
+            this.gridColumn17.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Count, "BloodCode", "合计：{0} 个血袋")});
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 6;
+            this.gridColumn17.Width = 93;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "联系电话";
+            this.gridColumn19.FieldName = "Tel1";
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn19.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn19.OptionsColumn.ReadOnly = true;
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 7;
+            this.gridColumn19.Width = 100;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "联系地址";
+            this.gridColumn21.FieldName = "Address1";
+            this.gridColumn21.MinWidth = 200;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn21.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn21.OptionsColumn.ReadOnly = true;
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 8;
+            this.gridColumn21.Width = 300;
+            // 
+            // gridColumn27
+            // 
+            this.gridColumn27.Caption = "部门";
+            this.gridColumn27.FieldName = "DeptName";
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.Visible = true;
+            this.gridColumn27.VisibleIndex = 9;
+            this.gridColumn27.Width = 187;
+            // 
             // repositoryItemComboBox1
             // 
             this.repositoryItemComboBox1.AutoHeight = false;
@@ -755,85 +877,18 @@
             this.label1.Text = "导入失败列表：";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "A";
-            this.gridColumn7.FieldName = "ColumnA";
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 1;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.Caption = "B";
-            this.gridColumn8.FieldName = "ColumnB";
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 2;
-            // 
-            // gridColumn14
-            // 
-            this.gridColumn14.Caption = "C";
-            this.gridColumn14.FieldName = "ColumnC";
-            this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 3;
-            // 
-            // gridColumn15
-            // 
-            this.gridColumn15.Caption = "D";
-            this.gridColumn15.FieldName = "ColumnD";
-            this.gridColumn15.Name = "gridColumn15";
-            this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 4;
-            // 
-            // gridColumn16
-            // 
-            this.gridColumn16.Caption = "E";
-            this.gridColumn16.FieldName = "ColumnE";
-            this.gridColumn16.Name = "gridColumn16";
-            this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 5;
-            // 
-            // gridColumn17
-            // 
-            this.gridColumn17.Caption = "F";
-            this.gridColumn17.FieldName = "ColumnF";
-            this.gridColumn17.Name = "gridColumn17";
-            this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 6;
-            // 
-            // gridColumn19
-            // 
-            this.gridColumn19.Caption = "G";
-            this.gridColumn19.FieldName = "ColumnG";
-            this.gridColumn19.Name = "gridColumn19";
-            this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 7;
-            // 
-            // gridColumn21
-            // 
-            this.gridColumn21.Caption = "H";
-            this.gridColumn21.FieldName = "ColumnH";
-            this.gridColumn21.Name = "gridColumn21";
-            this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 8;
-            // 
-            // gridColumn27
-            // 
-            this.gridColumn27.Caption = "I";
-            this.gridColumn27.FieldName = "ColumnI";
-            this.gridColumn27.Name = "gridColumn27";
-            this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 9;
-            // 
             // gridColumn37
             // 
-            this.gridColumn37.Caption = "J";
-            this.gridColumn37.FieldName = "ColumnJ";
+            this.gridColumn37.Caption = "失败原因";
+            this.gridColumn37.FieldName = "ImportErrorInfo";
             this.gridColumn37.Name = "gridColumn37";
+            this.gridColumn37.OptionsColumn.AllowEdit = false;
+            this.gridColumn37.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn37.OptionsColumn.ReadOnly = true;
+            this.gridColumn37.OptionsFilter.AllowFilter = false;
             this.gridColumn37.Visible = true;
             this.gridColumn37.VisibleIndex = 10;
+            this.gridColumn37.Width = 125;
             // 
             // PatientImportForm
             // 
@@ -910,6 +965,15 @@
         private DevExpress.XtraGrid.GridControl DgcError;
         private DevExpress.XtraGrid.Views.Grid.GridView DgvError;
         private DevExpress.XtraGrid.Columns.GridColumn colNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
@@ -926,15 +990,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
     }
 }

PEIS/View/Base/PatientImportForm.cs

@@ -14,11 +14,11 @@ namespace PEIS.View.Base
 {
     public partial class PatientImportForm : ViewBase
     {
+
         protected override object CreatePresenter()
         {
             return new Presenter<ViewBase>(this);
         }
-
         private List<BaseOrgPatient> _lstPatient = new List<BaseOrgPatient>();
 
         // 定义一个委托
@@ -44,21 +44,18 @@ namespace PEIS.View.Base
 
         private void TsmiDown_Click(object sender, EventArgs e)
         {
-            // var file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", "体检基本信息登记表.xls");
-            var file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", "医院体检人员信息收集样表.xlsx");
+            var file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", "体检基本信息登记表.xls");
             if (!File.Exists(file))
             {
                 Global.MsgErr(@"未找到模板文件！");
                 return;
             }
-
             // 创建文件目标路径（用户选择的位置）
             using (var folderDialog = new FolderBrowserDialog())
             {
                 if (folderDialog.ShowDialog() != DialogResult.OK) return;
                 var targetFolderPath = folderDialog.SelectedPath;
-                // var targetFilePath = Path.Combine(targetFolderPath, "体检基本信息登记表.xls");
-                var targetFilePath = Path.Combine(targetFolderPath, "医院体检人员信息收集样表.xlsx");
+                var targetFilePath = Path.Combine(targetFolderPath, "体检基本信息登记表.xls");
                 try
                 {
                     // 复制文件
@@ -86,80 +83,100 @@ namespace PEIS.View.Base
                 Global.MsgInfo($"数据为空，请导入数据！");
                 return;
             }
-
             int succeedCount = 0;
-            var errorList = new List<ExcelRowModel>();
+            var errorList = new List<BasePatient>();
             _lstPatient = new List<BaseOrgPatient>();
             var createTime = DateTime.Now;
             foreach (var item in _patients)
             {
                 try
                 {
-                    var basePatient = item;
-                    basePatient.CreateTime = createTime;
-                    basePatient.Creator = Global.currentUser.Name;
-                    basePatient.CreatorCode = Global.currentUser.Code;
+                    var birthday = DateTime.Today;
+                    if (item.CardNo.Length == 18 && DateTime.TryParseExact(item.CardNo.Substring(6, 8), "yyyyMMdd", null,
+                            DateTimeStyles.None, out DateTime result))
+                    {
+                        birthday = result;
+                    }
+
+                    var basePatient = new BasePatient()
+                    {
+                        Name = item.Name?.Trim(),
+                        Sex = item.Sex == "女" ? "2" : "1",
+                        Nation = item.Nation,
+                        Birthday = birthday,
+                        CardType = "居民身份证",
+                        CardNo = item.CardNo,
+                        Marriage = item.Marriage,
+                        Occupation = item.Occupation,
+                        Education = item.Education,
+                        Contactor1 = item.Name,
+                        Contactor2 = item.Contactor2,
+                        Tel1 = item.Tel1,
+                        Tel2 = item.Tel2,
+                        Address1 = item.Address1,
+                        Address2 = item.Address2,
+                        Description = item.Description,
+                        CreateTime = createTime,
+                        Creator = Global.currentUser.Name,
+                        CreatorCode = Global.currentUser.Code
+                    };
+
                     if (!basePatient.Exits())
                     {
+                        // item.ImportErrorInfo = "身份证号已存在";
+                        // errorList.Add(item);
+                        // continue;
                         if (!basePatient.Save())
                         {
                             item.ImportErrorInfo = "信息保存失败";
-                            errorList.Add(new ExcelRowModel(item));
+                            errorList.Add(item);
                             continue;
                         }
                     }
+                   
+                    succeedCount++;
 
-                    
-                    var sql =
-                        $@"SELECT ID,Name,Sex,CardNo, CardType, Birthday, Education, Nation, Tel1, Tel2,Marriage,Address1 
+                    var sql = $@"SELECT ID,Name,Sex,CardNo, CardType, Birthday, Education, Nation, Tel1, Tel2,Marriage,Address1 
 FROM Base_Patient WHERE Name='{basePatient.Name}' AND CardNo = '{basePatient.CardNo}' ";
                     var add = (DAOHelp.GetDataBySQL<BasePatient>(sql).FirstOrDefault());
 
-                    if (add == null)
-                    {
-                        item.Description = "导入名单中的姓名和证件号与基础信息中不匹配！";
-                        errorList.Add(new ExcelRowModel(item));
-                        continue;
-                    }
-
-                    succeedCount++;
-
-                    _lstPatient?.Add(new BaseOrgPatient
-                    {
-                        OID = _org.ID,
-                        PID = add.ID,
-                        Seq = _lstPatient.Count + 1,
-                        Name = add.Name,
-                        Sex = add.Sex == "1" ? "男" : "女",
-                        CardNo = add.CardNo,
-                        CardType = add.CardType,
-                        Birthday = add.Birthday,
-                        Education = add.Education,
-                        Nation = add.Nation,
-                        Tel1 = add.Tel1,
-                        Tel2 = add.Tel2,
-                        Marriage = add.Marriage,
-                        DeptName = item.DeptName,
-                        Address1 = add.Address1
-                    });
+                    if (add != null)
+                        _lstPatient?.Add(new BaseOrgPatient
+                        {
+                            OID = _org.ID,
+                            PID = add.ID,
+                            Seq = _lstPatient.Count + 1,
+                            Name = add.Name,
+                            Sex = add.Sex == "1" ? "男" : "女",
+                            CardNo = add.CardNo,
+                            CardType = add.CardType,
+                            Birthday = add.Birthday,
+                            Education = add.Education,
+                            Nation = add.Nation,
+                            Tel1 = add.Tel1,
+                            Tel2 = add.Tel2,
+                            Marriage = add.Marriage,
+                            DeptName = item.DeptName,
+                            Address1 = add.Address1
+                        });
                 }
                 catch (Exception ex)
                 {
                     item.ImportErrorInfo = "错误：" + ex.Message;
-                    errorList.Add(new ExcelRowModel(item));
+                    errorList.Add(item);
                 }
             }
 
             if (errorList.Count > 0)
             {
-                Global.MsgErr($"添加成功：{succeedCount}，添加失败：{errorList.Count}。");
+                Global.MsgErr($"添加成功：{succeedCount}，添加失败：{ errorList.Count}。");
 
                 DgcPatient.DataSource = null;
                 DgcError.DataSource = errorList;
             }
             else
             {
-                Global.MsgInfo($"添加成功：{succeedCount}！");
+                Global.MsgInfo($"添加成功！");
                 ImportFormClosed?.Invoke(_lstPatient);
                 Close();
             }
@@ -174,12 +191,10 @@ FROM Base_Patient WHERE Name='{basePatient.Name}' AND CardNo = '{basePatient.Car
         {
             var excel = new ExcelHelper();
             excel.ReadOrgPatientList();
-            var list = excel.SuccessList;
+            var list = excel.SuccessList.Where(p=>!string.IsNullOrEmpty(p.CardNo)).ToList().Distinct().ToList();
             _patients = list.Count > 0 ? list : new List<BasePatient>();
-            label1.Text = "导入失败列表：" + $@"（已从Excel成功读取到 {excel.SuccessList.Count}行 数据）";
             DgcPatient.DataSource = _patients;
             DgcError.DataSource = excel.ErrorList.Distinct();
-            DgvError.BestFitColumns();
         }
     }
 }

PEIS/View/Base/PersonForm.Designer.cs

@@ -54,8 +54,8 @@
             this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemImageEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageEdit();
             this.panel6 = new System.Windows.Forms.Panel();
-            this.OpsPatient = new PEIS.View.UControl.OpMenu();
             this.label2 = new System.Windows.Forms.Label();
+            this.OpsPatient = new PEIS.View.UControl.OpMenu();
             ((System.ComponentModel.ISupportInitialize)(this.DgcPatient)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.DgvPatient)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemImageEdit1)).BeginInit();
@@ -65,14 +65,12 @@
             // DgcPatient
             // 
             this.DgcPatient.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.DgcPatient.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
-            this.DgcPatient.Location = new System.Drawing.Point(0, 75);
+            this.DgcPatient.Location = new System.Drawing.Point(0, 41);
             this.DgcPatient.MainView = this.DgvPatient;
-            this.DgcPatient.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.DgcPatient.Name = "DgcPatient";
             this.DgcPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemImageEdit1});
-            this.DgcPatient.Size = new System.Drawing.Size(1866, 1087);
+            this.DgcPatient.Size = new System.Drawing.Size(933, 596);
             this.DgcPatient.TabIndex = 130;
             this.DgcPatient.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvPatient});
@@ -112,27 +110,26 @@
             this.gridColumn31});
             this.DgvPatient.FixedLineWidth = 1;
             this.DgvPatient.GridControl = this.DgcPatient;
-            this.DgvPatient.IndicatorWidth = 70;
+            this.DgvPatient.IndicatorWidth = 30;
             this.DgvPatient.Name = "DgvPatient";
             this.DgvPatient.OptionsSelection.MultiSelect = true;
             this.DgvPatient.OptionsView.ColumnAutoWidth = false;
             this.DgvPatient.OptionsView.ShowGroupPanel = false;
-            this.DgvPatient.RowHeight = 45;
+            this.DgvPatient.RowHeight = 30;
             // 
             // gridColumn1
             // 
-            this.gridColumn1.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.gridColumn1.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.gridColumn1.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen;
             this.gridColumn1.AppearanceCell.Options.UseFont = true;
             this.gridColumn1.AppearanceCell.Options.UseForeColor = true;
             this.gridColumn1.Caption = "姓名";
             this.gridColumn1.FieldName = "Name";
             this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.AllowEdit = false;
             this.gridColumn1.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn1.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn1.OptionsColumn.AllowMove = false;
             this.gridColumn1.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn1.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn1.OptionsColumn.ReadOnly = true;
             this.gridColumn1.OptionsFilter.AllowFilter = false;
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 0;
@@ -140,18 +137,17 @@
             // 
             // gridColumn2
             // 
-            this.gridColumn2.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.gridColumn2.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.gridColumn2.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen;
             this.gridColumn2.AppearanceCell.Options.UseFont = true;
             this.gridColumn2.AppearanceCell.Options.UseForeColor = true;
             this.gridColumn2.Caption = "性别";
             this.gridColumn2.FieldName = "Sex";
             this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.OptionsColumn.AllowEdit = false;
             this.gridColumn2.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn2.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn2.OptionsColumn.AllowMove = false;
             this.gridColumn2.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn2.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn2.OptionsColumn.ReadOnly = true;
             this.gridColumn2.OptionsFilter.AllowFilter = false;
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 1;
@@ -159,15 +155,13 @@
             // 
             // gridColumn3
             // 
-            this.gridColumn3.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn3.AppearanceCell.Options.UseFont = true;
             this.gridColumn3.Caption = "出生年月";
             this.gridColumn3.FieldName = "Birthday";
             this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.OptionsColumn.AllowEdit = false;
             this.gridColumn3.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn3.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn3.OptionsColumn.AllowMove = false;
             this.gridColumn3.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn3.OptionsColumn.ReadOnly = true;
             this.gridColumn3.OptionsFilter.AllowFilter = false;
             this.gridColumn3.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
             new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Count, "BloodCode", "合计：{0} 个血袋")});
@@ -177,17 +171,12 @@
             // 
             // gridColumn4
             // 
-            this.gridColumn4.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn4.AppearanceCell.Options.UseFont = true;
             this.gridColumn4.Caption = "证件类型";
             this.gridColumn4.FieldName = "CardType";
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.OptionsColumn.AllowEdit = false;
             this.gridColumn4.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn4.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn4.OptionsColumn.AllowMove = false;
             this.gridColumn4.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn4.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
             this.gridColumn4.OptionsColumn.ReadOnly = true;
             this.gridColumn4.OptionsFilter.AllowFilter = false;
             this.gridColumn4.Visible = true;
@@ -196,18 +185,17 @@
             // 
             // gridColumn5
             // 
-            this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.gridColumn5.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen;
             this.gridColumn5.AppearanceCell.Options.UseFont = true;
             this.gridColumn5.AppearanceCell.Options.UseForeColor = true;
             this.gridColumn5.Caption = "证件号码";
             this.gridColumn5.FieldName = "CardNo";
             this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.OptionsColumn.AllowEdit = false;
             this.gridColumn5.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn5.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn5.OptionsColumn.AllowMove = false;
             this.gridColumn5.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn5.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn5.OptionsColumn.ReadOnly = true;
             this.gridColumn5.OptionsFilter.AllowFilter = false;
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 4;
@@ -215,7 +203,7 @@
             // 
             // gridColumn7
             // 
-            this.gridColumn7.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.gridColumn7.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen;
             this.gridColumn7.AppearanceCell.Options.UseFont = true;
             this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
@@ -224,10 +212,7 @@
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.OptionsColumn.AllowEdit = false;
             this.gridColumn7.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn7.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn7.OptionsColumn.AllowMove = false;
             this.gridColumn7.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn7.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
             this.gridColumn7.OptionsColumn.ReadOnly = true;
             this.gridColumn7.Visible = true;
             this.gridColumn7.VisibleIndex = 5;
@@ -235,32 +220,26 @@
             // 
             // gridColumn11
             // 
-            this.gridColumn11.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn11.AppearanceCell.Options.UseFont = true;
             this.gridColumn11.Caption = "学历";
             this.gridColumn11.FieldName = "Education";
             this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.OptionsColumn.AllowEdit = false;
             this.gridColumn11.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn11.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn11.OptionsColumn.AllowMove = false;
             this.gridColumn11.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn11.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn11.OptionsColumn.ReadOnly = true;
             this.gridColumn11.Visible = true;
             this.gridColumn11.VisibleIndex = 6;
             this.gridColumn11.Width = 60;
             // 
             // gridColumn6
             // 
-            this.gridColumn6.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn6.AppearanceCell.Options.UseFont = true;
             this.gridColumn6.Caption = "婚况";
             this.gridColumn6.FieldName = "Marriage";
             this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.OptionsColumn.AllowEdit = false;
             this.gridColumn6.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn6.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn6.OptionsColumn.AllowMove = false;
             this.gridColumn6.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn6.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn6.OptionsColumn.ReadOnly = true;
             this.gridColumn6.OptionsFilter.AllowFilter = false;
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 7;
@@ -268,161 +247,129 @@
             // 
             // gridColumn14
             // 
-            this.gridColumn14.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn14.AppearanceCell.Options.UseFont = true;
             this.gridColumn14.Caption = "职业";
             this.gridColumn14.FieldName = "Occupation";
             this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.OptionsColumn.AllowEdit = false;
             this.gridColumn14.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn14.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn14.OptionsColumn.AllowMove = false;
             this.gridColumn14.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn14.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn14.OptionsColumn.ReadOnly = true;
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 8;
             // 
             // gridColumn15
             // 
-            this.gridColumn15.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn15.AppearanceCell.Options.UseFont = true;
             this.gridColumn15.Caption = "工作单位";
             this.gridColumn15.FieldName = "Company";
             this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.OptionsColumn.AllowEdit = false;
             this.gridColumn15.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn15.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn15.OptionsColumn.AllowMove = false;
             this.gridColumn15.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn15.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn15.OptionsColumn.ReadOnly = true;
             this.gridColumn15.Visible = true;
             this.gridColumn15.VisibleIndex = 15;
             this.gridColumn15.Width = 200;
             // 
             // gridColumn16
             // 
-            this.gridColumn16.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn16.AppearanceCell.Options.UseFont = true;
             this.gridColumn16.Caption = "籍贯";
             this.gridColumn16.FieldName = "CardAddress";
             this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.OptionsColumn.AllowEdit = false;
             this.gridColumn16.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn16.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn16.OptionsColumn.AllowMove = false;
             this.gridColumn16.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn16.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn16.OptionsColumn.ReadOnly = true;
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 16;
             this.gridColumn16.Width = 200;
             // 
             // gridColumn17
             // 
-            this.gridColumn17.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn17.AppearanceCell.Options.UseFont = true;
             this.gridColumn17.Caption = "联系人1";
             this.gridColumn17.FieldName = "Contactor1";
             this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.OptionsColumn.AllowEdit = false;
             this.gridColumn17.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn17.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn17.OptionsColumn.AllowMove = false;
             this.gridColumn17.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn17.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn17.OptionsColumn.ReadOnly = true;
             this.gridColumn17.Visible = true;
             this.gridColumn17.VisibleIndex = 9;
             // 
             // gridColumn9
             // 
-            this.gridColumn9.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn9.AppearanceCell.Options.UseFont = true;
             this.gridColumn9.Caption = "联系电话1";
             this.gridColumn9.FieldName = "Tel1";
             this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.OptionsColumn.AllowEdit = false;
             this.gridColumn9.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn9.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn9.OptionsColumn.AllowMove = false;
             this.gridColumn9.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn9.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 10;
             this.gridColumn9.Width = 100;
             // 
             // gridColumn19
             // 
-            this.gridColumn19.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn19.AppearanceCell.Options.UseFont = true;
             this.gridColumn19.Caption = "联系地址1";
             this.gridColumn19.FieldName = "Address1";
             this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.OptionsColumn.AllowEdit = false;
             this.gridColumn19.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn19.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn19.OptionsColumn.AllowMove = false;
             this.gridColumn19.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn19.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn19.OptionsColumn.ReadOnly = true;
             this.gridColumn19.Visible = true;
             this.gridColumn19.VisibleIndex = 11;
             // 
             // gridColumn21
             // 
-            this.gridColumn21.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn21.AppearanceCell.Options.UseFont = true;
             this.gridColumn21.Caption = "联系人2";
             this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.OptionsColumn.AllowEdit = false;
             this.gridColumn21.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn21.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn21.OptionsColumn.AllowMove = false;
             this.gridColumn21.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn21.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn21.OptionsColumn.ReadOnly = true;
             this.gridColumn21.Visible = true;
             this.gridColumn21.VisibleIndex = 12;
             // 
             // gridColumn10
             // 
-            this.gridColumn10.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn10.AppearanceCell.Options.UseFont = true;
             this.gridColumn10.Caption = "联系电话2";
             this.gridColumn10.FieldName = "Tel2";
             this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.OptionsColumn.AllowEdit = false;
             this.gridColumn10.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn10.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn10.OptionsColumn.AllowMove = false;
             this.gridColumn10.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn10.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn10.OptionsColumn.ReadOnly = true;
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 13;
             this.gridColumn10.Width = 100;
             // 
             // gridColumn27
             // 
-            this.gridColumn27.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn27.AppearanceCell.Options.UseFont = true;
             this.gridColumn27.Caption = "联系地址2";
             this.gridColumn27.FieldName = "Address2";
             this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.OptionsColumn.AllowEdit = false;
             this.gridColumn27.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn27.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn27.OptionsColumn.AllowMove = false;
             this.gridColumn27.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn27.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn27.OptionsColumn.ReadOnly = true;
             this.gridColumn27.Visible = true;
             this.gridColumn27.VisibleIndex = 14;
             // 
             // gridColumn28
             // 
-            this.gridColumn28.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn28.AppearanceCell.Options.UseFont = true;
             this.gridColumn28.Caption = "备注";
             this.gridColumn28.FieldName = "Description";
             this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.OptionsColumn.AllowEdit = false;
             this.gridColumn28.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn28.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn28.OptionsColumn.AllowMove = false;
             this.gridColumn28.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn28.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn28.OptionsColumn.ReadOnly = true;
             this.gridColumn28.Visible = true;
             this.gridColumn28.VisibleIndex = 17;
             // 
             // gridColumn29
             // 
-            this.gridColumn29.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn29.AppearanceCell.Options.UseFont = true;
             this.gridColumn29.Caption = "建档时间";
             this.gridColumn29.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.gridColumn29.FieldName = "CreateTime";
@@ -437,8 +384,6 @@
             // 
             // gridColumn30
             // 
-            this.gridColumn30.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn30.AppearanceCell.Options.UseFont = true;
             this.gridColumn30.Caption = "建档人";
             this.gridColumn30.FieldName = "Creator";
             this.gridColumn30.Name = "gridColumn30";
@@ -451,8 +396,6 @@
             // 
             // gridColumn8
             // 
-            this.gridColumn8.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn8.AppearanceCell.Options.UseFont = true;
             this.gridColumn8.Caption = "ID";
             this.gridColumn8.FieldName = "ID";
             this.gridColumn8.Name = "gridColumn8";
@@ -466,19 +409,10 @@
             // 
             // gridColumn31
             // 
-            this.gridColumn31.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn31.AppearanceCell.Options.UseFont = true;
             this.gridColumn31.Caption = "身份证照片";
             this.gridColumn31.ColumnEdit = this.repositoryItemImageEdit1;
             this.gridColumn31.FieldName = "Photo";
             this.gridColumn31.Name = "gridColumn31";
-            this.gridColumn31.OptionsColumn.AllowEdit = false;
-            this.gridColumn31.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn31.OptionsColumn.AllowMove = false;
-            this.gridColumn31.OptionsColumn.AllowSize = false;
-            this.gridColumn31.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn31.OptionsColumn.ReadOnly = true;
-            this.gridColumn31.OptionsFilter.AllowFilter = false;
             this.gridColumn31.Visible = true;
             this.gridColumn31.VisibleIndex = 21;
             // 
@@ -496,42 +430,40 @@
             this.panel6.Controls.Add(this.label2);
             this.panel6.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel6.Location = new System.Drawing.Point(0, 0);
-            this.panel6.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.panel6.Name = "panel6";
-            this.panel6.Size = new System.Drawing.Size(1866, 75);
+            this.panel6.Size = new System.Drawing.Size(933, 41);
             this.panel6.TabIndex = 129;
             // 
-            // OpsPatient
-            // 
-            this.OpsPatient.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.OpsPatient.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.OpsPatient.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OpsPatient.Location = new System.Drawing.Point(272, 0);
-            this.OpsPatient.Margin = new System.Windows.Forms.Padding(4, 7, 4, 7);
-            this.OpsPatient.Name = "OpsPatient";
-            this.OpsPatient.Size = new System.Drawing.Size(1594, 75);
-            this.OpsPatient.TabIndex = 1;
-            // 
             // label2
             // 
             this.label2.Dock = System.Windows.Forms.DockStyle.Left;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.Location = new System.Drawing.Point(0, 0);
-            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(272, 75);
+            this.label2.Size = new System.Drawing.Size(136, 41);
             this.label2.TabIndex = 0;
             this.label2.Text = "人员基础信息库";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // OpsPatient
+            // 
+            this.OpsPatient.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.OpsPatient.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.OpsPatient.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OpsPatient.Location = new System.Drawing.Point(136, 0);
+            this.OpsPatient.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
+            this.OpsPatient.Name = "OpsPatient";
+            this.OpsPatient.Size = new System.Drawing.Size(797, 41);
+            this.OpsPatient.TabIndex = 1;
+            // 
             // PersonForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1866, 1162);
+            this.ClientSize = new System.Drawing.Size(933, 637);
             this.Controls.Add(this.DgcPatient);
             this.Controls.Add(this.panel6);
-            this.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "PersonForm";
             this.Text = "人员基本信息";
             ((System.ComponentModel.ISupportInitialize)(this.DgcPatient)).EndInit();

PEIS/View/Base/PersonForm.cs

@@ -1,19 +1,18 @@
-using PEIS.Base;
+ using PEIS.Base;
 using PEIS.Entity;
 using PEIS.Event;
 using PEIS.Presenter;
-using PEIS.Utils;
 using System;
 using System.Collections.Generic;
-using System.Threading;
-using System.Windows.Forms;
+ using System.Linq;
+ using System.Threading;
+using PEIS.Utils;
 
 namespace PEIS.View.Base
 {
     public partial class PersonForm : ViewBase, IBasePatientView
     {
-        private BasePatient _baseInfo = null;
-        private List<BasePatient> _lstBasePatients = null;
+        List<BasePatient> _lstBasePatients = null;
 
         public PersonForm()
         {
@@ -24,64 +23,15 @@ namespace PEIS.View.Base
             OpsPatient.TsmiAdd.Click += TsmiAdd_Click;
             // 性别转换
             DgvPatient.CustomColumnDisplayText += DgvPatient_CustomColumnDisplayText;
-            DgvPatient.CustomDrawRowIndicator += DgvPatient_CustomDrawRowIndicator;
-            DgvPatient.SelectionChanged += DgvPatient_SelectionChanged;
             // 刷新
             OpsPatient.TsmiRefresh.Click += (sender, e) => OnGetBasePatient();
-            // 保存
-            OpsPatient.TsmiSave.Click += TsmiSave_Click;
 
             OpsPatient.TsmiDelete.Visible = false;
+            OpsPatient.TsmiSave.Visible = false;
             OpsPatient.TsmiSearch.Visible = false;
-            OpsPatient.TstbKey.KeyDown += TstbKey_KeyDown;
-        }
-
-        private void TsmiSave_Click(object sender, EventArgs e)
-        {
-            if (_baseInfo == null) return;
-            // 使当前控件获得焦点，避免日期选择器修改后未生效
-            OpsPatient.Focus();
-            BasePatient basePatient = new BasePatient()
-            {
-                ID = _baseInfo.ID,
-                Name = _baseInfo.Name,
-                Sex = _baseInfo.Sex == "男" ? "1" : "2",
-                Birthday = DateTime.Parse(_baseInfo.Birthday?.ToShortDateString()),
-                CardNo = _baseInfo.CardNo,
-                CardType = _baseInfo.CardType,
-                CardAddress = _baseInfo.CardAddress,
-                Tel1 = _baseInfo.Tel1,
-                Tel2 = _baseInfo.Tel2,
-                Contactor1 = _baseInfo.Contactor1,
-                Contactor2 = _baseInfo.Contactor2,
-                Address1 = _baseInfo.Address1,
-                Address2 = _baseInfo.Address2,
-                Marriage = _baseInfo.Marriage,
-                Education = _baseInfo.Education,
-                Occupation = _baseInfo.Occupation,
-                Company = _baseInfo.Company,
-                CreateTime = _baseInfo.CreateTime,
-                CreatorCode = _baseInfo.CreatorCode,
-                Creator = _baseInfo.Creator
-            };
-            basePatient.Update();
-        }
-
-        private void DgvPatient_SelectionChanged(object sender, DevExpress.Data.SelectionChangedEventArgs e)
-        {
-            if (DgvPatient.GetRowCellValue(DgvPatient.GetSelectedRows()[0], "ID") == null) return;
-            _baseInfo = DgvPatient.GetRow(DgvPatient.GetSelectedRows()[0]) as BasePatient;
-        }
-
-        private void DgvPatient_CustomDrawRowIndicator(object sender, DevExpress.XtraGrid.Views.Grid.RowIndicatorCustomDrawEventArgs e)
-        {
-            if (e.RowHandle >= 0)
-                e.Info.DisplayText = (e.RowHandle + 1).ToString();
-        }
+            OpsPatient.TstbKey.TextChanged += Search_TextChanged;
 
-        private void TstbKey_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode == Keys.Enter) OnGetBasePatient();
+            DgvPatient.Initialize();
         }
 
         protected override object CreatePresenter()
@@ -93,6 +43,12 @@ namespace PEIS.View.Base
         {
             ThreadPool.QueueUserWorkItem(state => OnGetBasePatient());
         }
+        private void Search_TextChanged(object sender, EventArgs e)
+        {
+            var search = OpsPatient.TstbKey.Text.Trim();
+            if (search == @"输入条件查询") return;
+            DgcPatient.SetDataSource(string.IsNullOrEmpty(search) ? _lstBasePatients : _lstBasePatients.Where(a => a.Name.Contains(search) || a.CardNo.Contains(search)).ToList());
+        }
 
         private void DgvPatient_CustomColumnDisplayText(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDisplayTextEventArgs e)
         {
@@ -121,11 +77,10 @@ namespace PEIS.View.Base
             Invoke(new Action(() => _lstBasePatients = items));
             Invoke(new Action(() => DgcPatient.DataSource = null));
             Invoke(new Action(() => DgcPatient.DataSource = _lstBasePatients));
-            Invoke(new Action(() => DgvPatient.BestFitColumns()));
         }
         protected virtual void OnGetBasePatient()
         {
-            GetBasePatient?.Invoke(this, new Args<BasePatient> { Code = OpsPatient.TstbKey.Text.Trim() == "输入条件查询" ? null : string.IsNullOrEmpty(OpsPatient.TstbKey.Text) ? null : OpsPatient.TstbKey.Text.Trim() });
+            GetBasePatient?.Invoke(this, new Args<BasePatient>{});
         }
 
         #endregion

PEIS/View/Enrollment/EnrollmentOrgForm.cs

@@ -3,7 +3,6 @@ using DevExpress.XtraGrid.Columns;
 using DevExpress.XtraGrid.Views.Grid;
 using DevExpress.XtraGrid.Views.Grid.ViewInfo;
 using DevExpress.XtraPrinting.Native;
-using FastReport;
 using PEIS.Base;
 using PEIS.Entity;
 using PEIS.Event;
@@ -15,7 +14,6 @@ using System.Collections.Generic;
 using System.Data;
 using System.Drawing;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Windows.Forms;
 
@@ -43,7 +41,6 @@ namespace PEIS.View.Enrollment
         private List<EnrollmentCheckCost> _lstCheckCost = new List<EnrollmentCheckCost>();
         private List<EnrollmentCheckCost> _lstCheckCost2 = new List<EnrollmentCheckCost>();
         private List<EnrollmentPatient> _lstEnrollmentPatient = new List<EnrollmentPatient>();
-        private List<EnrollmentPatient> _lstExcelEPatient = new List<EnrollmentPatient>();
         private List<EnrollmentFeeItem> _lstEnrollmentFeeItem = new List<EnrollmentFeeItem>();
         private List<EnrollmentOrgFeeItem> _lstGroupFeeItem = new List<EnrollmentOrgFeeItem>();
         private List<EnrollmentOrgPatient> _lstGroupPatient = new List<EnrollmentOrgPatient>();
@@ -205,7 +202,7 @@ namespace PEIS.View.Enrollment
 
         private void EnrollmentOrgForm_Shown(object sender, EventArgs e)
         {
-            DtpBegDate.Value = DateTime.Now.AddDays(-30);
+            DtpBegDate.Value = DateTime.Now.AddDays(-3);
             DtpEndDate.Value = DateTime.Now;
             RiCmbExamType.Items.Add("已婚/未婚");
             RiCmbExamType.Items.AddRange(Global._lstConfig.Where(a => a.Key.Equals("ExamType")).ToList().Select(a => a.Value).ToList());
@@ -565,7 +562,7 @@ namespace PEIS.View.Enrollment
                 Unit = DgvFeeItem2.GetRowCellValue(DgvFeeItem2.GetSelectedRows()[0], "Unit")?.ToString(),
                 Price = Convert.ToDecimal(DgvFeeItem2.GetRowCellValue(DgvFeeItem2.GetSelectedRows()[0], "Price")?.ToString()),
                 SettlePrice = Convert.ToDecimal(DgvFeeItem2.GetRowCellValue(DgvFeeItem2.GetSelectedRows()[0], "SettlePrice")?.ToString()),
-                ItemClass = DgvFeeItem2.GetRowCellValue(DgvFeeItem2.GetSelectedRows()[0], "ItemClass")?.ToString(),
+                ItemClass = DgvFeeItem.GetRowCellValue(DgvFeeItem2.GetSelectedRows()[0], "ItemClass")?.ToString(),
                 CreateTime = DateTime.Now,
                 CreatorCode = Global.currentUser.Code,
                 Creator = Global.currentUser.Name,
@@ -688,7 +685,7 @@ namespace PEIS.View.Enrollment
             try
             {
                 var items = new List<EnrollmentFeeItem>();
-                _lstEnrollmentFeeItem.Where(w => w.OrderNo != null && !w.IsHide ).GroupBy(g => g.DeptCode).ForEach(dept =>
+                _lstEnrollmentFeeItem.Where(w => w.OrderNo != null && !w.IsHide && !(w.DeptName.Contains("金域"))).GroupBy(g => g.DeptCode).ForEach(dept =>
                 {
                     var item = new EnrollmentFeeItem()
                     {
@@ -824,7 +821,7 @@ namespace PEIS.View.Enrollment
 
         private void PatientSearch_TextChanged(object sender, EventArgs e) // 团体成员检索
         {
-            DgcEnrollment.DataSource = _lstEnrollmentPatient.Where(a => a?.Name.Contains(PatientSearch.Text) == true || a?.ID.ToString().Contains(PatientSearch.Text) == true || a?.SpellCode?.Contains(PatientSearch.Text) == true);
+            DgcEnrollment.DataSource = _lstEnrollmentPatient.Where(a => a?.Name.Contains(PatientSearch.Text) == true || a?.ID.ToString().Contains(PatientSearch.Text) == true);
             DgvEnrollment.ExpandAllGroups();
         }
 
@@ -857,41 +854,47 @@ namespace PEIS.View.Enrollment
 
         private void FastExport_Click(object sender, EventArgs e) // 导出所有团体成员
         {
-            OnGetExcelList();
-
-            if (_lstExcelEPatient.Count != 0)
+            if (_lstEnrollmentPatient.Count != 0)
             {
-                var rpt = new FastReport.Report(); //实例化一个Report报表
-                try
-                {
-                    var reportFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", "OrgExcel.frx");
-                    rpt.Load(reportFile);
-
-                    rpt.SetParameterValue("TotalCount", _lstExcelEPatient.Count());
-                    rpt.SetParameterValue("No", _lstExcelEPatient.Where(w => w.SignTime == null).ToList().Count());
-                    rpt.SetParameterValue("Yes", _lstExcelEPatient.Where(w => w.SignTime != null).ToList().Count());
-                    rpt.SetParameterValue("OrgName", DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "Name").ToString());
-
-                    // 人员数据
-                    rpt.RegisterData(_lstExcelEPatient, "O");
-                    DataBand checkCost = rpt.Report.FindObject("OrgExcel") as DataBand;
-                    checkCost.DataSource = rpt.Report.GetDataSource("O");
-                    rpt.GetDataSource("O").Enabled = true;
-
-                    rpt.Prepare();
-                    rpt.Show();
-                }
-                catch (Exception)
+                SaveFileDialog saveFileDialog = new SaveFileDialog();
+                saveFileDialog.Title = "导出Excel";
+                saveFileDialog.FileName = "团体名单";
+                saveFileDialog.Filter = "Excel文件(*.xls)|*.xls";
+                DialogResult dialogResult = saveFileDialog.ShowDialog(this);
+                if (dialogResult == DialogResult.OK)
                 {
-                    Global.MsgErr("预览失败，请联系管理员！");
+                    DevExpress.XtraPrinting.XlsExportOptionsEx options = new DevExpress.XtraPrinting.XlsExportOptionsEx();
+                    options.ShowGridLines = true;
+                    options.TextExportMode = DevExpress.XtraPrinting.TextExportMode.Value;
+                    options.ExportType = DevExpress.Export.ExportType.WYSIWYG;
+
+                    // 首先，创建一个新的列对象
+                    GridColumn newColumn = new GridColumn();
+                    // 设置列的标题，例如"序号"
+                    newColumn.Caption = "序号";
+                    // 设置列的字段名称，这将用于数据绑定
+                    newColumn.FieldName = "RowNumber";
+                    newColumn.VisibleIndex = 0;
+                    newColumn.AppearanceCell.Font = new Font("微软雅黑", 12);
+
+                    // 将列添加到GridView的Columns集合中
+                    DgvEnrollment.Columns.Add(newColumn);
+                  
+                    for (int i = 0; i < _lstEnrollmentPatient.Count(); i++)
+                    {
+                        // 使用GetRowCellValue方法获取当前行的序号列的值
+                        int rowNumber = DgvEnrollment.GetRowHandle(i); // 行句柄
+                        DgvEnrollment.SetRowCellValue(rowNumber, "RowNumber", i + 1);  // 设置序号列的值
+                    }
+
+                    DgcEnrollment.ExportToXls(saveFileDialog.FileName, options);
+                    DgvEnrollment.Columns.Remove(newColumn);
                 }
             }
         }
 
         private void FastExportTime_Click(object sender, EventArgs e) // 导出指定时间范围成员
         {
-            OnGetExcelList();
-
             DateTime currentDate = DateTime.Now;
 
             Form dateForm = new Form();
@@ -922,34 +925,46 @@ namespace PEIS.View.Enrollment
             confirmBtn.AutoSize = true;
             confirmBtn.Click += delegate (object a, EventArgs b)
             {
-                if (_lstExcelEPatient.Count != 0)
+                if (_lstEnrollmentPatient.Count != 0)
                 {
-                    var rpt = new FastReport.Report(); //实例化一个Report报表
-                    try
-                    {
-                        var reportFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", "OrgExcel.frx");
-                        rpt.Load(reportFile);
-
-                        rpt.SetParameterValue("TotalCount", _lstExcelEPatient.Count());
-                        rpt.SetParameterValue("No", _lstExcelEPatient.Where(w => w.SignTime == null).ToList().Count());
-                        rpt.SetParameterValue("Yes", _lstExcelEPatient.Where(w => w.SignTime != null).ToList().Count());
-                        rpt.SetParameterValue("OrgName", DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "Name").ToString());
-
-                        var list = _lstExcelEPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date);
-                        // 人员数据
-                        rpt.RegisterData(list, "O");
-                        DataBand checkCost = rpt.Report.FindObject("OrgExcel") as DataBand;
-                        checkCost.DataSource = rpt.Report.GetDataSource("O");
-                        rpt.GetDataSource("O").Enabled = true;
-
-                        rpt.Prepare();
-                        rpt.Show();
-                    }
-                    catch (Exception)
+                    SaveFileDialog saveFileDialog = new SaveFileDialog();
+                    saveFileDialog.Title = "导出Excel";
+                    saveFileDialog.FileName = "团体名单";
+                    saveFileDialog.Filter = "Excel文件(*.xls)|*.xls";
+                    DialogResult dialogResult = saveFileDialog.ShowDialog(this);
+                    if (dialogResult == DialogResult.OK)
                     {
-                        Global.MsgErr("预览失败，请联系管理员！");
+                        DevExpress.XtraPrinting.XlsExportOptionsEx options = new DevExpress.XtraPrinting.XlsExportOptionsEx();
+                        options.ShowGridLines = true;
+                        options.TextExportMode = DevExpress.XtraPrinting.TextExportMode.Value;
+                        options.ExportType = DevExpress.Export.ExportType.WYSIWYG;
+                        
+                        // 首先，创建一个新的列对象
+                        GridColumn newColumn = new GridColumn();
+                        // 设置列的标题，例如"序号"
+                        newColumn.Caption = "序号";
+                        // 设置列的字段名称，这将用于数据绑定
+                        newColumn.FieldName = "RowNumber";
+                        newColumn.VisibleIndex = 0;
+                        newColumn.AppearanceCell.Font = new Font("微软雅黑", 12);
+                   
+                        // 将列添加到GridView的Columns集合中
+                        DgvEnrollment.Columns.Add(newColumn);
+
+
+                        DgcEnrollment.DataSource = _lstEnrollmentPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date);
+                        for (int i = 0; i < _lstEnrollmentPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date).Count(); i++)
+                        {
+                            // 使用GetRowCellValue方法获取当前行的序号列的值
+                            int rowNumber = DgvEnrollment.GetRowHandle(i); // 行句柄
+                            DgvEnrollment.SetRowCellValue(rowNumber, "RowNumber", i + 1);  // 设置序号列的值
+                        }
+
+                        DgcEnrollment.ExportToXls(saveFileDialog.FileName, options);
+                        DgvEnrollment.Columns.Remove(newColumn);
                     }
                 }
+                ShowEnrollmentPatient(_lstEnrollmentPatient);
                 dateForm.Close();
             };
 
@@ -1363,7 +1378,11 @@ namespace PEIS.View.Enrollment
             grid.GroupText = Convert.ToBoolean(DgvCheckCost.GetRowCellValue(index, "GroupTag")) ? "分组缴费订单" : "未分组缴费订单";
         }
 
+<<<<<<< HEAD
+        private void DgvEnrollmentFeeItem_RowStyle(object sender, DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs e)
+=======
         private void DgvEnrollmentFeeItem_RowStyle(object sender, RowStyleEventArgs e)
+>>>>>>> main
         {
             if (DgvEnrollmentFeeItem.RowCount == 0) return;
             e.Appearance.ForeColor = DgvEnrollmentFeeItem.GetRowCellValue(e.RowHandle, "OrderNo") == null ? Color.Black : Color.DodgerBlue;
@@ -1583,8 +1602,6 @@ namespace PEIS.View.Enrollment
 
         public event EventHandler<Args<EnrollmentCheckCost>> CancelGroupTag;
 
-        public event EventHandler<Args<EnrollmentPatient>> GetExcelList;
-
         protected virtual void OnCancelGroupTag(Int64 oeID, List<Int64> idList)
         {
             CancelGroupTag?.Invoke(this, new Args<EnrollmentCheckCost> { EnrollmentOID = oeID, IdList = idList });
@@ -1742,17 +1759,6 @@ namespace PEIS.View.Enrollment
             });
         }
 
-        protected virtual void OnGetExcelList()
-        {
-            var oeID = Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString());
-            GetExcelList?.Invoke(this, new Args<EnrollmentPatient> { EnrollmentOID = oeID });
-        }
-
-        public void ShowExcelList(List<EnrollmentPatient> items)
-        {
-            _lstExcelEPatient = items;
-        }
-
         public void ShowCancelRegInfo(bool status)
         {
             OnGetEnrollmentPatient(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()));
@@ -1832,7 +1838,7 @@ namespace PEIS.View.Enrollment
 
         public void ShowEnrollmentPatient(List<EnrollmentPatient> items)
         {
-            items.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : a.Sex);
+            items.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : "");
             _lstEnrollmentPatient = items;
 
 

PEIS/View/Enrollment/EnrollmentOrgForm.resx

@@ -454,7 +454,7 @@
   <data name="新建NToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU
         0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j
         LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei
         ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3
@@ -465,7 +465,7 @@
   <data name="打开OToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp
         olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4
         4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm
         YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl
@@ -481,7 +481,7 @@
   <data name="保存SToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW
         DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3
         8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ
         1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH
@@ -497,7 +497,7 @@
   <data name="打印PToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0
         jGlByTSyJTXJwq2oKZQb1KAv6JCYWSxvBrkkZUq4CeQEiRABFeLL072Xa0zRra31bO8v57zP5znnPYf1
         X+TxhWF6O7VtGYcnwbSWijKPOLzYrPSvLPwLS3huGUMlT7o9wGD9grVUBj+icdid03S9tDmgNxNwTgVQ
         J+rA8XNtWwM+uuZATMwxmQVRycuJFNyzIRitDlScugKzjSgFRGJJaIwEsrk8AsHIhnSL/Ssck37UNipQ
@@ -512,7 +512,7 @@
   <data name="打印预览VToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGCSURBVDhPnZK9S0JRGMb9F1xb2gqaq6mhwCGDtvYIIyLI
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGCSURBVDhPnZK9S0JRGMb9F1xb2gqaq6mhwCGDtvYIIyLI
         cJOE1paoIYpMKUjFRDH87lpoakGlIZF9DA2hZJEQhJXl1xPn3HPV29WQfvBwOfA+P95zuDJ39A6/4wyl
         YOOSMHvOcHGThuwvSKEVRvsR+pQqWD3R1pK98DUbl7Jm5hA8SfESd6S5xH5wycalrO4E0D8yWQuriLH6
         E2xcSqlcoRJBxCpiTO5TNi4m/ZgDF4nDsOulsfujyGRzUsmWM8YqdcggKbveS3A88bEkslRye58RSzZt
@@ -525,7 +525,7 @@
   <data name="剪切TToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi
         LaVsERnRF5iCaSZJO1toCDVGFkgoFpWQWWRR2aIvUxm1BKN1wSnHCFw4TOCzue+9nPNw4eVVnav4Izzb
         QfxeGZ5TWaxT/rK3irzmC7CsusvC1G4IkbNLboIiDieF4GGUKeTeClDpppF8eeEu2PIfwfrzizSdw3Hk
         EnKlFpkMzV2wH77AosOFTV8A+vkl9CiHuJeLJNNZjM8tYWB0FkTvMAwmy/8ERTR6CwjlGAi1Ccence6C
@@ -538,7 +538,7 @@
   <data name="复制CToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH
         Xe1Cr7qKDIMkZixwNhfWLGWbnuki0kXKzLU023KubBNPJrbRdOzocm6e2dPOO21mMS+CHvjcvOf9PF++
         79H9M+7RT2iRRsIi9sEAXe43yAvf2LpSHq28G9uAnytNT4jMLewtcQ2Ht2pF8ps/aOt+gccX5lxD694S
         +1BQFD1RkN5DSFa4Z3uONKbgHE3h8KZ4OJTC1J8UiSzmfhd2uf1CoJHbyKOsZokl0kKwm+aeJaov+wjO
@@ -552,7 +552,7 @@
   <data name="粘贴PToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh
         FqYZRmJG1iKmUqKyLB2pqSm6vC1Nm5GXoeatEsVJ0RASR3eNzegikRq5lrV3857Fr/d9ddlICoL+8OfA
         Oef/e57zcIT/os7WLMw302muSGJ2689qqi7A44q8IzjtNYzarzHQm8tZtT8FmRqu6LToMxN+B8qhCbGR
         KVcDE85ajKUaxoaryEuL4UVXIudPB5Ko2oy98xjDptXERuz3hsgAOTzlqqMk6yjdllzE90UM9Wp5azlB

PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs

@@ -30,9 +30,19 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentPersonForm));
+<<<<<<< HEAD
+<<<<<<< HEAD
+            this.gridColumn118 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
+=======
+            DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
+            DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
+            this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
+=======
             DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
             DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
             this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
+>>>>>>> main
             this.gridColumn118 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn123 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn142 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -47,6 +57,10 @@
             this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
+<<<<<<< HEAD
+>>>>>>> d9d3303 (1、删除线)
+=======
+>>>>>>> main
             this.RegListPanel = new System.Windows.Forms.Panel();
             this.DgcRegItem = new DevExpress.XtraGrid.GridControl();
             this.RegMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
@@ -328,8 +342,20 @@
             this.gridColumn118.VisibleIndex = 0;
             this.gridColumn118.Width = 63;
             // 
+<<<<<<< HEAD
+<<<<<<< HEAD
+            // gridColumn52
+            // 
+            this.gridColumn52.Caption = "退费时间";
+            this.gridColumn52.FieldName = "CancelTime";
+            this.gridColumn52.Name = "gridColumn52";
+=======
+            // gridColumn123
+            // 
+=======
             // gridColumn123
             // 
+>>>>>>> main
             this.gridColumn123.Caption = "体检号";
             this.gridColumn123.FieldName = "EID";
             this.gridColumn123.Name = "gridColumn123";
@@ -561,6 +587,10 @@
             this.gridColumn38.Visible = true;
             this.gridColumn38.VisibleIndex = 13;
             this.gridColumn38.Width = 130;
+<<<<<<< HEAD
+>>>>>>> d9d3303 (1、删除线)
+=======
+>>>>>>> main
             // 
             // RegListPanel
             // 
@@ -2714,6 +2744,11 @@
             this.gridColumn53,
             this.gridColumn52});
             this.DgvCheckCost.FixedLineWidth = 1;
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> main
             gridFormatRule1.ApplyToRow = true;
             gridFormatRule1.Column = this.gridColumn52;
             gridFormatRule1.Name = "Format0";
@@ -2723,6 +2758,10 @@
             formatConditionRuleExpression1.PredefinedName = "Strikeout Text";
             gridFormatRule1.Rule = formatConditionRuleExpression1;
             this.DgvCheckCost.FormatRules.Add(gridFormatRule1);
+<<<<<<< HEAD
+>>>>>>> d9d3303 (1、删除线)
+=======
+>>>>>>> main
             this.DgvCheckCost.GridControl = this.DgcCheckCost;
             this.DgvCheckCost.IndicatorWidth = 40;
             this.DgvCheckCost.Name = "DgvCheckCost";

PEIS/View/Enrollment/EnrollmentPersonForm.cs

@@ -770,7 +770,7 @@ namespace PEIS.View.Enrollment
             items.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : "");
             Invoke(new Action(() => _lstRegItems = items));
             Invoke(new Action(() => { DgcRegItem.DataSource = null; DgcRegItem2.DataSource = null; }));
-            Invoke(new Action(() => { DgcRegItem.DataSource = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true || a?.SpellCode?.Contains(NameSearch.Text) == true); }));
+            Invoke(new Action(() => { DgcRegItem.DataSource = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true); }));
             Invoke(new Action(() =>
             {
                 var list = new List<EnrollmentPatient>();
@@ -779,7 +779,7 @@ namespace PEIS.View.Enrollment
 
             if (_lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true).Count() != 0)
             {
-                Invoke(new Action(() => _chooseRegItem = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true || a?.SpellCode?.Contains(NameSearch.Text) == true).ToList()[0]));
+                Invoke(new Action(() => _chooseRegItem = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true).ToList()[0]));
                 Invoke(new Action(() => OnGetRegInfo(_chooseRegItem.ID)));
                 Invoke(new Action(() => OnGetExamFeeItem(_chooseRegItem.ID, "0")));
                 Invoke(new Action(() => OnGetCheckCost(_chooseRegItem.ID)));

PEIS/View/Enrollment/EnrollmentSearchForm.Designer.cs

@@ -1,323 +0,0 @@
-namespace PEIS.View.Enrollment
-{
-    partial class EnrollmentSearchForm
-    {
-        /// <summary>
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows 窗体设计器生成的代码
-
-        /// <summary>
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.NameSearch = new System.Windows.Forms.TextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.DgcRegItem = new DevExpress.XtraGrid.GridControl();
-            this.DgvRegItem = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.DgcRegItem)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.DgvRegItem)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // panel1
-            // 
-            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel1.Controls.Add(this.NameSearch);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1520, 40);
-            this.panel1.TabIndex = 0;
-            // 
-            // NameSearch
-            // 
-            this.NameSearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.NameSearch.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.NameSearch.Location = new System.Drawing.Point(91, 8);
-            this.NameSearch.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
-            this.NameSearch.Name = "NameSearch";
-            this.NameSearch.Size = new System.Drawing.Size(506, 23);
-            this.NameSearch.TabIndex = 7;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(11, 8);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(90, 21);
-            this.label1.TabIndex = 1;
-            this.label1.Text = "模糊检索：";
-            // 
-            // DgcRegItem
-            // 
-            this.DgcRegItem.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.DgcRegItem.Location = new System.Drawing.Point(0, 40);
-            this.DgcRegItem.MainView = this.DgvRegItem;
-            this.DgcRegItem.Name = "DgcRegItem";
-            this.DgcRegItem.Size = new System.Drawing.Size(1520, 919);
-            this.DgcRegItem.TabIndex = 135;
-            this.DgcRegItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.DgvRegItem});
-            // 
-            // DgvRegItem
-            // 
-            this.DgvRegItem.Appearance.FooterPanel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold);
-            this.DgvRegItem.Appearance.FooterPanel.ForeColor = System.Drawing.Color.Red;
-            this.DgvRegItem.Appearance.FooterPanel.Options.UseFont = true;
-            this.DgvRegItem.Appearance.FooterPanel.Options.UseForeColor = true;
-            this.DgvRegItem.Appearance.GroupRow.Font = new System.Drawing.Font("微软雅黑", 10.5F);
-            this.DgvRegItem.Appearance.GroupRow.Options.UseFont = true;
-            this.DgvRegItem.Appearance.Row.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.DgvRegItem.Appearance.Row.Options.UseFont = true;
-            this.DgvRegItem.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn10,
-            this.gridColumn1,
-            this.gridColumn2,
-            this.gridColumn9,
-            this.gridColumn5,
-            this.gridColumn6,
-            this.gridColumn3,
-            this.gridColumn4,
-            this.gridColumn7,
-            this.gridColumn8});
-            this.DgvRegItem.GridControl = this.DgcRegItem;
-            this.DgvRegItem.GroupCount = 1;
-            this.DgvRegItem.GroupFormat = "";
-            this.DgvRegItem.Name = "DgvRegItem";
-            this.DgvRegItem.OptionsFilter.AllowFilterEditor = false;
-            this.DgvRegItem.OptionsMenu.EnableColumnMenu = false;
-            this.DgvRegItem.OptionsSelection.MultiSelect = true;
-            this.DgvRegItem.OptionsView.ColumnAutoWidth = false;
-            this.DgvRegItem.OptionsView.ShowGroupPanel = false;
-            this.DgvRegItem.RowHeight = 35;
-            this.DgvRegItem.SortInfo.AddRange(new DevExpress.XtraGrid.Columns.GridColumnSortInfo[] {
-            new DevExpress.XtraGrid.Columns.GridColumnSortInfo(this.gridColumn10, DevExpress.Data.ColumnSortOrder.Ascending)});
-            // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "gridColumn10";
-            this.gridColumn10.FieldName = "Tel2";
-            this.gridColumn10.Name = "gridColumn10";
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn1.AppearanceCell.Options.UseFont = true;
-            this.gridColumn1.Caption = "体检号";
-            this.gridColumn1.FieldName = "ID";
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.OptionsColumn.AllowEdit = false;
-            this.gridColumn1.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn1.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn1.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn1.OptionsColumn.ReadOnly = true;
-            this.gridColumn1.OptionsFilter.AllowFilter = false;
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 0;
-            this.gridColumn1.Width = 87;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn2.AppearanceCell.Options.UseFont = true;
-            this.gridColumn2.Caption = "姓名";
-            this.gridColumn2.FieldName = "Name";
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.OptionsColumn.AllowEdit = false;
-            this.gridColumn2.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn2.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn2.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn2.OptionsColumn.ReadOnly = true;
-            this.gridColumn2.OptionsFilter.AllowFilter = false;
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 1;
-            this.gridColumn2.Width = 87;
-            // 
-            // gridColumn9
-            // 
-            this.gridColumn9.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn9.AppearanceCell.Options.UseFont = true;
-            this.gridColumn9.Caption = "证件号";
-            this.gridColumn9.FieldName = "CardNo";
-            this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.OptionsColumn.AllowEdit = false;
-            this.gridColumn9.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn9.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn9.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn9.OptionsColumn.ReadOnly = true;
-            this.gridColumn9.OptionsFilter.AllowFilter = false;
-            this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 2;
-            this.gridColumn9.Width = 99;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn5.AppearanceCell.Options.UseFont = true;
-            this.gridColumn5.Caption = "性别";
-            this.gridColumn5.FieldName = "Sex";
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.OptionsColumn.AllowEdit = false;
-            this.gridColumn5.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn5.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn5.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn5.OptionsColumn.ReadOnly = true;
-            this.gridColumn5.OptionsFilter.AllowFilter = false;
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 3;
-            this.gridColumn5.Width = 66;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn6.AppearanceCell.Options.UseFont = true;
-            this.gridColumn6.Caption = "年龄";
-            this.gridColumn6.FieldName = "AgeClass";
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.OptionsColumn.AllowEdit = false;
-            this.gridColumn6.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn6.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn6.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn6.OptionsColumn.ReadOnly = true;
-            this.gridColumn6.OptionsFilter.AllowFilter = false;
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 4;
-            this.gridColumn6.Width = 62;
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn3.AppearanceCell.Options.UseFont = true;
-            this.gridColumn3.Caption = "登记日期";
-            this.gridColumn3.DisplayFormat.FormatString = "yyyy-MM-dd";
-            this.gridColumn3.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
-            this.gridColumn3.FieldName = "CreateTime";
-            this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.OptionsColumn.AllowEdit = false;
-            this.gridColumn3.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn3.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn3.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn3.OptionsColumn.ReadOnly = true;
-            this.gridColumn3.OptionsFilter.AllowFilter = false;
-            this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 5;
-            this.gridColumn3.Width = 109;
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn4.AppearanceCell.Options.UseFont = true;
-            this.gridColumn4.Caption = "签到日期";
-            this.gridColumn4.DisplayFormat.FormatString = "yyyy-MM-dd";
-            this.gridColumn4.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
-            this.gridColumn4.FieldName = "SignTime";
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.OptionsColumn.AllowEdit = false;
-            this.gridColumn4.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn4.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn4.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn4.OptionsColumn.ReadOnly = true;
-            this.gridColumn4.OptionsFilter.AllowFilter = false;
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 6;
-            this.gridColumn4.Width = 109;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn7.AppearanceCell.Options.UseFont = true;
-            this.gridColumn7.Caption = "团体号";
-            this.gridColumn7.FieldName = "OEID";
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.OptionsColumn.AllowEdit = false;
-            this.gridColumn7.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn7.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn7.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn7.OptionsColumn.ReadOnly = true;
-            this.gridColumn7.OptionsFilter.AllowFilter = false;
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 7;
-            this.gridColumn7.Width = 69;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn8.AppearanceCell.Options.UseFont = true;
-            this.gridColumn8.Caption = "团体名称";
-            this.gridColumn8.FieldName = "OrgName";
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.OptionsColumn.AllowEdit = false;
-            this.gridColumn8.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn8.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn8.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn8.OptionsColumn.ReadOnly = true;
-            this.gridColumn8.OptionsFilter.AllowFilter = false;
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 8;
-            this.gridColumn8.Width = 271;
-            // 
-            // EnrollmentSearchForm
-            // 
-            this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(1520, 959);
-            this.Controls.Add(this.DgcRegItem);
-            this.Controls.Add(this.panel1);
-            this.Name = "EnrollmentSearchForm";
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.DgcRegItem)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.DgvRegItem)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox NameSearch;
-        private DevExpress.XtraGrid.GridControl DgcRegItem;
-        private DevExpress.XtraGrid.Views.Grid.GridView DgvRegItem;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
-    }
-}

PEIS/View/Enrollment/EnrollmentSearchForm.cs

@@ -1,63 +0,0 @@
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using PEIS.Base;
-using PEIS.Entity;
-using PEIS.Event;
-using PEIS.Presenter;
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-
-namespace PEIS.View.Enrollment
-{
-    public partial class EnrollmentSearchForm : ViewBase, IEnrollmentSearchView
-    {
-        List<EnrollmentPatient> _lstRegItems = null;
-
-        public EnrollmentSearchForm()
-        {
-            InitializeComponent();
-            NameSearch.KeyDown += NameSearch_KeyDown;
-            // 分组别名
-            DgvRegItem.CustomDrawGroupRow += DgvRegItem_CustomDrawGroupRow;
-        }
-
-        private void DgvRegItem_CustomDrawGroupRow(object sender, DevExpress.XtraGrid.Views.Base.RowObjectCustomDrawEventArgs e)
-        {
-            GridGroupRowInfo grid = e.Info as GridGroupRowInfo;
-            var index = DgvRegItem.GetDataRowHandleByGroupRowHandle(e.RowHandle);
-
-            grid.GroupText = DgvRegItem.GetRowCellValue(index, "Tel2") == null ? "个人" : "团体";
-        }
-
-        private void NameSearch_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode == Keys.Enter) OnGetRegItems();
-        }
-
-        // 获取登记列表
-        public event EventHandler<Args<EnrollmentPatient>> GetRegItems;
-        public void ShowRegItems(List<EnrollmentPatient> items)
-        {
-            items.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : "");
-            Invoke(new Action(() => _lstRegItems = items));
-            Invoke(new Action(() => {
-                DgcRegItem.DataSource = null;
-                DgcRegItem.DataSource = _lstRegItems;
-                DgvRegItem.ExpandAllGroups();
-                DgvRegItem.BestFitColumns();
-            }));
-        }
-        protected virtual void OnGetRegItems()
-        {
-            GetRegItems?.Invoke(this, new Args<EnrollmentPatient>()
-            {
-                Name = NameSearch.Text.Trim()
-            });
-        }
-
-        protected override object CreatePresenter()
-        {
-            return new EnrollmentSearchPresenter(this);
-        }
-    }
-}

PEIS/View/Enrollment/IEnrollmentOrgView.cs

@@ -58,7 +58,6 @@ namespace PEIS.View.Enrollment
         event EventHandler<Args<EnrollmentCheckCost>> ChangeCost;
         event EventHandler<Args<EnrollmentCheckCost>> GroupTag;
         event EventHandler<Args<EnrollmentCheckCost>> CancelGroupTag;
-        event EventHandler<Args<EnrollmentPatient>> GetExcelList;
 
         void ShowEnrollmentOrg(List<EnrollmentOrg> items);
         void ShowEnrollmentOrgGroup(List<EnrollmentOrgGroup> items);
@@ -79,7 +78,6 @@ namespace PEIS.View.Enrollment
         void ShowRegInfo(EnrollmentPatient item);
         void ShowRecallDept(bool status);
         void ShowCancelRegInfo(bool status);
-        void ShowExcelList(List<EnrollmentPatient> items);
 
     }
 }

PEIS/View/Enrollment/IEnrollmentSearchView.cs

@@ -1,15 +0,0 @@
-using PEIS.Base;
-using PEIS.Entity;
-using PEIS.Event;
-using System;
-using System.Collections.Generic;
-
-namespace PEIS.View.Enrollment
-{
-    interface IEnrollmentSearchView : IViewBase
-    {
-        // 获取登记列表
-        event EventHandler<Args<EnrollmentPatient>> GetRegItems;
-        void ShowRegItems(List<EnrollmentPatient> items);
-    }
-}

PEIS/View/Enrollment/NewEnrollmentPersonForm.cs

@@ -274,7 +274,6 @@ namespace PEIS.View.Enrollment
                 Address1 = Address1.Text.Trim(),
                 Company = Company.Text.Trim(),
                 Description = Description.Text.Trim(),
-                SpellCode = PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin.Count == 0 ? null : PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin[0]
             };
 
             if (_editStatus)

PEIS/View/Exam/PartForm.cs

@@ -153,8 +153,6 @@ namespace PEIS.View.Exam
             DgvExamResult.FocusedRowChanged += DgvExamResult_FocusedRowChanged;
             //1.1.4.检查结果列表-单元格值修改
             DgvExamResult.CellValueChanged += DgvExamResult_CellValueChanged;
-            //1.1.5 按下回车-跳转下一行
-            DgvExamResult.KeyUp += DgvExamResult_KeyUp;
             //1.2.1.PACS
             DgvRptPacs.RowClick += DgvReportPacs_RowClick;
             //1.2.2.PACS图片选择列表-限制选中项数
@@ -1635,10 +1633,6 @@ namespace PEIS.View.Exam
         private void DgvExamResult_FocusedColumnChanged(object sender, FocusedColumnChangedEventArgs e)
         {
             Debug.WriteLine("DgvExamResult_FocusedColumnChanged");
-            // 获取当前聚焦的行行号
-            int rowHandle = DgvExamResult.FocusedRowHandle;
-            rowHandle = rowHandle + 1;
-
             if (e.FocusedColumn.Name != "colExamTextResult") return;
             if (!(DgvExamResult.GetFocusedRow() is ExamResult rowData)) return;
             var parameters = new Dictionary<string, string>() { { "sex", _patient.Sex == "女" ? "2" : "1" } };
@@ -1668,14 +1662,6 @@ namespace PEIS.View.Exam
             }
 
             ShowExamResultList(null, DgvExamResult.TopRowIndex);
-            if (rowHandle >= DgvExamResult.RowCount)
-            {
-                SetFocuse(DgvExamResult, 0, "colExamTextResult");
-            }
-            else
-            {
-                SetFocuse(DgvExamResult, rowHandle, "colExamTextResult");
-            }
         }
 
         /// <summary>
@@ -1686,10 +1672,6 @@ namespace PEIS.View.Exam
         private void DgvExamResult_FocusedRowChanged(object sender, FocusedRowChangedEventArgs e)
         {
             Debug.WriteLine("DgvExamResult_FocusedRowChanged");
-            // 获取当前聚焦的行行号
-            int rowHandle = DgvExamResult.FocusedRowHandle;
-            rowHandle = rowHandle + 1;
-
             if (e.FocusedRowHandle < 0) return;
             // 获取当前聚焦的行
             if (!(DgvExamResult.GetRow(e.FocusedRowHandle) is ExamResult rowData)) return;
@@ -1718,16 +1700,7 @@ namespace PEIS.View.Exam
                 _examResultList.Add(rowData);
             }
 
-            
             ShowExamResultList(null, DgvExamResult.TopRowIndex);
-            if (rowHandle >= DgvExamResult.RowCount)
-            {
-                SetFocuse(DgvExamResult, 0, "colExamTextResult");
-            }
-            else
-            {
-                SetFocuse(DgvExamResult, rowHandle, "colExamTextResult");
-            }
         }
 
         /// <summary>
@@ -1793,42 +1766,6 @@ namespace PEIS.View.Exam
             return result.ToString();
         }
 
-        /// <summary>
-        /// 1.1.5.按下回车-跳转下一行
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void DgvExamResult_KeyUp(object sender, KeyEventArgs e)
-        {
-           if(e.KeyCode == Keys.Enter)
-            {
-                int rowHandle = DgvExamResult.FocusedRowHandle;
-                rowHandle = rowHandle + 1;
-                if(rowHandle >= DgvExamResult.RowCount)
-                {
-                    SetFocuse(DgvExamResult, 0, "colExamTextResult");
-                }
-                else
-                {
-                    SetFocuse(DgvExamResult, rowHandle, "colExamTextResult");
-                }
-            }
-        }
-
-        /// <summary>
-        /// 重新聚焦
-        /// </summary>
-        /// <param name="view"></param>
-        /// <param name="rowHandle"></param>
-        /// <param name="columnName"></param>
-        private void SetFocuse(GridView view, Int32 rowHandle, string columnName)
-        {
-            view.Focus();
-            view.FocusedRowHandle = rowHandle;
-            view.FocusedColumn.Name = columnName;
-            view.ShowEditor();
-        }
-
         #endregion 1.检查结果列表相关
 
         #region PACS

PEIS/View/Exam/PartForm.resx

@@ -117,6 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>340, 17</value>
+  </metadata>
+  <metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>460, 17</value>
+  </metadata>
   <metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>460, 17</value>
   </metadata>
@@ -171,9 +177,6 @@
         fOB5L+flMi1KC1D4AAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="superTabControl1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>70</value>
   </metadata>

PEIS/View/Exam/TotalForm.resx

@@ -120,12 +120,15 @@
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>497, 55</value>
   </metadata>
+<<<<<<< HEAD
+=======
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>497, 55</value>
   </metadata>
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>377, 55</value>
   </metadata>
+>>>>>>> main
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>377, 55</value>
   </metadata>

PEIS/View/MainForm.Designer.cs

@@ -52,7 +52,7 @@ namespace PEIS.View
             this.lblHospital = new System.Windows.Forms.Label();
             this.NbcMain = new DevExpress.XtraNavBar.NavBarControl();
             this.NbgReg = new DevExpress.XtraNavBar.NavBarGroup();
-            this.NbiEnrollmentSearch = new DevExpress.XtraNavBar.NavBarItem();
+            this.NavBarItem1 = new DevExpress.XtraNavBar.NavBarItem();
             this.NbiEnrollmentPerson = new DevExpress.XtraNavBar.NavBarItem();
             this.NbiEnrollmentOrg = new DevExpress.XtraNavBar.NavBarItem();
             this.NbiBasePerson = new DevExpress.XtraNavBar.NavBarItem();
@@ -82,6 +82,7 @@ namespace PEIS.View
             ((System.ComponentModel.ISupportInitialize)(this.PbClose)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.XtmmMain)).BeginInit();
             this.panelFooter.SuspendLayout();
+            this.stepPanel.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.NbcMain)).BeginInit();
             this.SuspendLayout();
             // 
@@ -309,6 +310,7 @@ namespace PEIS.View
             // 
             // stepPanel
             // 
+            this.stepPanel.Controls.Add(this.stepViewer2);
             this.stepPanel.Dock = System.Windows.Forms.DockStyle.Fill;
             this.stepPanel.Location = new System.Drawing.Point(100, 4);
             this.stepPanel.Margin = new System.Windows.Forms.Padding(0);
@@ -316,6 +318,16 @@ namespace PEIS.View
             this.stepPanel.Size = new System.Drawing.Size(1336, 79);
             this.stepPanel.TabIndex = 0;
             // 
+            // stepViewer2
+            // 
+            this.stepViewer2.Dock = System.Windows.Forms.DockStyle.Left;
+            this.stepViewer2.Eid = null;
+            this.stepViewer2.Location = new System.Drawing.Point(0, 0);
+            this.stepViewer2.Margin = new System.Windows.Forms.Padding(0);
+            this.stepViewer2.Name = "stepViewer2";
+            this.stepViewer2.Size = new System.Drawing.Size(1561, 79);
+            this.stepViewer2.TabIndex = 1;
+            // 
             // lblStep
             // 
             this.lblStep.Dock = System.Windows.Forms.DockStyle.Left;
@@ -370,7 +382,7 @@ namespace PEIS.View
             this.NbgNull});
             this.NbcMain.HideGroupCaptions = true;
             this.NbcMain.Items.AddRange(new DevExpress.XtraNavBar.NavBarItem[] {
-            this.NbiEnrollmentSearch,
+            this.NavBarItem1,
             this.NbiEnrollmentPerson,
             this.NbiEnrollmentOrg,
             this.NbiBasePerson,
@@ -403,18 +415,19 @@ namespace PEIS.View
             this.NbgReg.Caption = "检前登记";
             this.NbgReg.Expanded = true;
             this.NbgReg.ItemLinks.AddRange(new DevExpress.XtraNavBar.NavBarItemLink[] {
-            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiEnrollmentSearch),
+            new DevExpress.XtraNavBar.NavBarItemLink(this.NavBarItem1),
             new DevExpress.XtraNavBar.NavBarItemLink(this.NbiEnrollmentPerson),
             new DevExpress.XtraNavBar.NavBarItemLink(this.NbiEnrollmentOrg),
             new DevExpress.XtraNavBar.NavBarItemLink(this.NbiBasePerson),
             new DevExpress.XtraNavBar.NavBarItemLink(this.NbiBaseOrg)});
             this.NbgReg.Name = "NbgReg";
             // 
-            // NbiEnrollmentSearch
+            // NavBarItem1
             // 
-            this.NbiEnrollmentSearch.Caption = "查找";
-            this.NbiEnrollmentSearch.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiEnrollmentSearch.LargeImage")));
-            this.NbiEnrollmentSearch.Name = "NbiEnrollmentSearch";
+            this.NavBarItem1.Caption = "查找";
+            this.NavBarItem1.LargeImage = ((System.Drawing.Image)(resources.GetObject("NavBarItem1.LargeImage")));
+            this.NavBarItem1.Name = "NavBarItem1";
+            this.NavBarItem1.Visible = false;
             // 
             // NbiEnrollmentPerson
             // 
@@ -595,6 +608,7 @@ namespace PEIS.View
             ((System.ComponentModel.ISupportInitialize)(this.XtmmMain)).EndInit();
             this.panelFooter.ResumeLayout(false);
             this.panelFooter.PerformLayout();
+            this.stepPanel.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.NbcMain)).EndInit();
             this.ResumeLayout(false);
 
@@ -618,7 +632,7 @@ namespace PEIS.View
         private System.Windows.Forms.Panel panelFooter;
         private DevExpress.XtraNavBar.NavBarControl NbcMain;
         private DevExpress.XtraNavBar.NavBarGroup NbgReg;
-        private DevExpress.XtraNavBar.NavBarItem NbiEnrollmentSearch;
+        private DevExpress.XtraNavBar.NavBarItem NavBarItem1;
         private DevExpress.XtraNavBar.NavBarItem NbiEnrollmentPerson;
         private DevExpress.XtraNavBar.NavBarItem NbiEnrollmentOrg;
         private DevExpress.XtraNavBar.NavBarItem NbiBasePerson;

PEIS/View/MainForm.cs

@@ -51,7 +51,6 @@ namespace PEIS.View
             // 子页面切换隐藏左侧导航菜单
             XtmmMain.SelectedPageChanged += XtmmMain_SelectedPageChanged;
             // 体检登记子菜单
-            NbiEnrollmentSearch.LinkClicked += (s, e) => AddTab("NbiEnrollmentSearch", e.Link.Item);
             NbiEnrollmentPerson.LinkClicked += (s, e) => AddTab("NbiEnrollmentPerson", e.Link.Item);
             NbiEnrollmentOrg.LinkClicked += (s, e) => AddTab("NbiEnrollmentOrg", e.Link.Item);
             NbiBaseOrg.LinkClicked += (s, e) => AddTab("NbiBaseOrg", e.Link.Item);
@@ -240,6 +239,7 @@ namespace PEIS.View
                 case "NbiEnrollmentPerson":
                     var PersonForm = new EnrollmentPersonForm();
                     PersonForm.SelectedPatientEvent += UpdateStepViewerEid;
+
                     isNeedShowPanelFooter = true;
                     return PersonForm;
 
@@ -249,9 +249,6 @@ namespace PEIS.View
                     isNeedShowPanelFooter = true;
                     return EnrollmentOrgForm;
 
-                case "NbiEnrollmentSearch":
-                    return new EnrollmentSearchForm();
-
                 case "NbiFeeItem":
                     return new FeeItemForm();
 

PEIS/View/MainForm.resx

@@ -247,7 +247,7 @@
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>86</value>
   </metadata>
-  <data name="NbiEnrollmentSearch.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NavBarItem1.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAh1JREFUSEu9
         lbFLHEEUxrcVQpRAsLGwCiQQSSfq7rAQQZIqQa6Iuzs5UUSsxC6kSLp0+gekTGeZIiRYpIhKikBC8D8I

PEIS/View/Setting/ConclusionForm.cs

@@ -54,7 +54,8 @@ namespace PEIS.View.Setting
             DgcConclusion.SetDataSource(string.IsNullOrEmpty(search)
                 ? _lstConclusion
                 : _lstConclusion.Where(a =>
-                    (a.ConclusionName != null && a.ConclusionName.Contains(search))).ToList());
+                    (a.ConclusionName != null && a.ConclusionName.Contains(search)) ||
+                    (a.Suggestion != null && a.Suggestion.Contains(search))).ToList());
         }
 
         /// <summary>

PEIS/packages.config

@@ -6,17 +6,15 @@
   <package id="AForge.Math" version="2.2.5" targetFramework="net40" />
   <package id="AForge.Video" version="2.2.5" targetFramework="net40" />
   <package id="AForge.Video.DirectShow" version="2.2.5" targetFramework="net40" />
-  <package id="Aspose.Imaging" version="19.1.0" targetFramework="net452" />
   <package id="DotNetZip" version="1.16.0" targetFramework="net40" />
-  <package id="EmptyLicensesLicx" version="3.0.0" targetFramework="net452" developmentDependency="true" />
   <package id="EPPlus" version="4.5.3" targetFramework="net40" />
   <package id="FastReport.Compat" version="2021.3.0" targetFramework="net40" />
   <package id="FastReport.Core" version="2022.1.0" targetFramework="net40" />
   <package id="FastReport.Net.Pro" version="2022.1.0" targetFramework="net40" />
   <package id="Microsoft.PinYinConverter" version="1.0.0" targetFramework="net40" />
   <package id="ncalc" version="1.3.8" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net40" requireReinstallation="true" />
-  <package id="NLog" version="4.4.13" targetFramework="net40" requireReinstallation="true" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net40" />
+  <package id="NLog" version="4.4.13" targetFramework="net40" />
   <package id="NLog.Schema" version="4.4.13" targetFramework="net40" />
   <package id="NPOI" version="2.3.0" targetFramework="net40" />
   <package id="PdfiumViewer" version="2.13.0.0" targetFramework="net40" />