1、心电图读取格式改为PDF

PEIS/Model/ReportModel.cs

@@ -198,32 +198,33 @@ namespace PEIS.Model
             {
                 using (MemoryStream memoryStream = new MemoryStream(heart[0].ReportImage))
                 {
-                    Image bitmap = Image.FromStream(memoryStream);
+                    // 图片格式
-                    using (MemoryStream stream = new MemoryStream())
+                    //Image bitmap = Image.FromStream(memoryStream);
-                    {
+                    //using (MemoryStream stream = new MemoryStream())
-                        bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
-                        bitmap.Save(stream, ImageFormat.Jpeg);
-                        var img = stream.ToArray();
-                        pacs.Add(new Report { ReportImage = img });
-                    }
-                 
-
-                    //using (PdfDocument pdfDocument = PdfDocument.Load(memoryStream))
                     //{
-                    //    for (int pageIndex = 0; pageIndex < pdfDocument.PageCount; pageIndex++)
+                    //    bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
-                    //    {
+                    //    bitmap.Save(stream, ImageFormat.Jpeg);
-                    //        using (Image bitmap = pdfDocument.Render(pageIndex, 2480, 3508, false))
+                    //    var img = stream.ToArray();
-                    //        {
+                    //    pacs.Add(new Report { ReportImage = img });
-                    //            using (MemoryStream stream = new MemoryStream())
-                    //            {
-                    //                bitmap.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                    //                bitmap.Save(stream, ImageFormat.Jpeg);
-                    //                var img = stream.ToArray();
-                    //                pacs.Add(new Report { ReportImage = img });
-                    //            }
-                    //        }
-                    //    }
                     //}
+
+                    // PDF格式
+                    using (PdfDocument pdfDocument = PdfDocument.Load(memoryStream))
+                    {
+                        for (int pageIndex = 0; pageIndex < pdfDocument.PageCount; pageIndex++)
+                        {
+                            using (Image bitmap = pdfDocument.Render(pageIndex, 2480, 3508, false))
+                            {
+                                using (MemoryStream stream = new MemoryStream())
+                                {
+                                    bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
+                                    bitmap.Save(stream, ImageFormat.Jpeg);
+                                    var img = stream.ToArray();
+                                    pacs.Add(new Report { ReportImage = img });
+                                }
+                            }
+                        }
+                    }
                 }
 
             }

PEIS/Utils/ReportHelper.cs

@@ -42,11 +42,13 @@ namespace PEIS.Utils
         {
             try
             {
-                // 德宏中医院 ECG 心电保存的结果为图片JPG 不是PDF
+                // 图片格式
-                using (var ms = new MemoryStream(pdf, 0, pdf.Length))
+                //using (var ms = new MemoryStream(pdf, 0, pdf.Length))
-                {
+                //{
-                    return Image.FromStream(ms, true);
+                //    return Image.FromStream(ms, true);
-                }
+                //}
+
+                // PDF格式
                 using (var memoryStream = new MemoryStream(pdf))
                 {
                     using (var pdfDocument = PdfiumViewer.PdfDocument.Load(memoryStream))
@@ -57,7 +59,6 @@ namespace PEIS.Utils
                             {
                                 using (var stream = new MemoryStream())
                                 {
-                                    bitmap.RotateFlip(RotateFlipType.Rotate90FlipNone);
                                     bitmap.Save(stream, ImageFormat.Jpeg);
                                     var img = stream.ToArray();