From ed73865459b95858de62b953a8a84398d1b6abc3 Mon Sep 17 00:00:00 2001
From: lsm <zlysdm@163.com>
Date: Thu, 29 Aug 2024 09:25:24 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=A7=91=E5=AE=A4=E5=B0=8F=E7=BB=93?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PEIS/Model/Exam/TotalModel.cs        |  7 +++++--
 PEIS/View/Exam/TotalForm.Designer.cs |  5 +++--
 PEIS/View/Exam/TotalForm.cs          | 11 +++++++++--
 PEIS/View/Exam/TotalForm.resx        |  6 +++---
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/PEIS/Model/Exam/TotalModel.cs b/PEIS/Model/Exam/TotalModel.cs
index 51ffed9..b01d57c 100644
--- a/PEIS/Model/Exam/TotalModel.cs
+++ b/PEIS/Model/Exam/TotalModel.cs
@@ -149,8 +149,11 @@ namespace PEIS.Model
         /// <returns></returns>
         public List<ExamPart> GetSummary(long eid)
         {
-            return DAOHelp.GetDataBySQL<ExamPart>($@" SELECT * FROM Exam_Part WHERE EID= {eid} ORDER BY DeptCode")
-                .ToList();
+            return DAOHelp.GetDataBySQL<ExamPart>($@" SELECT * FROM Exam_Part WHERE EID= {eid} ORDER BY CASE WHEN DeptName = '一般检查' THEN 1 
+                                                      WHEN DeptName = '医学检验科' THEN 2
+                                                      WHEN DeptName = '超声诊断科' THEN 3
+                                                      WHEN DeptName = '医学影像科' THEN 4
+                                                      ELSE 5 END").ToList();
         }
         public string GetExamResult(long eid)
         {
diff --git a/PEIS/View/Exam/TotalForm.Designer.cs b/PEIS/View/Exam/TotalForm.Designer.cs
index a872252..535d654 100644
--- a/PEIS/View/Exam/TotalForm.Designer.cs
+++ b/PEIS/View/Exam/TotalForm.Designer.cs
@@ -943,7 +943,7 @@
             this.gridColumn31,
             this.gridColumn32});
             this.DgvExamResultData.GridControl = this.DgcExamResultData;
-            this.DgvExamResultData.GroupCount = 2;
+            this.DgvExamResultData.GroupCount = 1;
             this.DgvExamResultData.GroupFormat = "{1} {2}";
             this.DgvExamResultData.GroupRowHeight = 30;
             this.DgvExamResultData.Name = "DgvExamResultData";
@@ -973,6 +973,7 @@
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
             this.gridColumn12.OptionsFilter.AllowFilter = false;
+            this.gridColumn12.SortMode = DevExpress.XtraGrid.ColumnSortMode.Value;
             this.gridColumn12.Visible = true;
             this.gridColumn12.VisibleIndex = 0;
             this.gridColumn12.Width = 150;
@@ -1023,7 +1024,7 @@
             this.gridColumn18.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
             this.gridColumn18.OptionsFilter.AllowFilter = false;
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 1;
+            this.gridColumn18.VisibleIndex = 2;
             this.gridColumn18.Width = 120;
             // 
             // repositoryItemMemoEdit4
diff --git a/PEIS/View/Exam/TotalForm.cs b/PEIS/View/Exam/TotalForm.cs
index 6d02413..510533f 100644
--- a/PEIS/View/Exam/TotalForm.cs
+++ b/PEIS/View/Exam/TotalForm.cs
@@ -1081,8 +1081,15 @@ namespace PEIS.View.Exam
                 LEFT JOIN Exam_Result B ON A.ID = B.PID
             WHERE
             A.VerifyTime IS NOT NULL
-            AND A.EID = {eid}
-            ORDER BY A.DeptCode,FeeItemName,B.ID");
+            AND A.EID = {eid} 
+            ORDER BY
+            CASE WHEN A.DeptName = '一般检查' THEN 1 
+            WHEN A.DeptName = '医学检验科' THEN 2
+            WHEN A.DeptName = '超声诊断科' THEN 3
+            WHEN A.DeptName = '医学影像科' THEN 4
+            ELSE 5 END,
+            FeeItemName,
+            B.ID");
 
             DgcExamResultData.DataSource = null;
             DgcExamResultData.DataSource = data;
diff --git a/PEIS/View/Exam/TotalForm.resx b/PEIS/View/Exam/TotalForm.resx
index 7155ed1..3d1fe79 100644
--- a/PEIS/View/Exam/TotalForm.resx
+++ b/PEIS/View/Exam/TotalForm.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>377, 55</value>
+  </metadata>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>497, 55</value>
   </metadata>
@@ -126,9 +129,6 @@
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>377, 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>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="TsmiAbandoned.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>