From bf392c0fe5e94c80c5bd8d12885a3aac3ed1c6dc Mon Sep 17 00:00:00 2001
From: zlysdm <zlysdm@163.com>
Date: Tue, 23 Jul 2024 22:07:22 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=BF=83=E7=94=B5=E5=9B=BE=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96=E6=A0=BC=E5=BC=8F=E6=94=B9=E4=B8=BAPDF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PEIS/Model/ReportModel.cs  | 49 +++++++++++++++++++-------------------
 PEIS/Utils/ReportHelper.cs | 13 +++++-----
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/PEIS/Model/ReportModel.cs b/PEIS/Model/ReportModel.cs
index 94d2b10..ade1521 100644
--- a/PEIS/Model/ReportModel.cs
+++ b/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())
-                    {
-                        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))
+                    // 图片格式
+                    //Image bitmap = Image.FromStream(memoryStream);
+                    //using (MemoryStream stream = new 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.Rotate90FlipNone);
-                    //                bitmap.Save(stream, ImageFormat.Jpeg);
-                    //                var img = stream.ToArray();
-                    //                pacs.Add(new Report { ReportImage = img });
-                    //            }
-                    //        }
-                    //    }
+                    //    bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
+                    //    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 });
+                                }
+                            }
+                        }
+                    }
                 }
 
             }
diff --git a/PEIS/Utils/ReportHelper.cs b/PEIS/Utils/ReportHelper.cs
index 4674bd3..aa193c5 100644
--- a/PEIS/Utils/ReportHelper.cs
+++ b/PEIS/Utils/ReportHelper.cs
@@ -42,11 +42,13 @@ namespace PEIS.Utils
         {
             try
             {
-                // 德宏中医院 ECG 心电保存的结果为图片JPG 不是PDF
-                using (var ms = new MemoryStream(pdf, 0, pdf.Length))
-                {
-                    return Image.FromStream(ms, true);
-                }
+                // 图片格式
+                //using (var ms = new MemoryStream(pdf, 0, pdf.Length))
+                //{
+                //    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();