From a854063b05973be7ecf87bac045d3d1792c25096 Mon Sep 17 00:00:00 2001
From: HI <15012290903@163.com>
Date: Thu, 11 Jul 2024 11:47:00 +0800
Subject: [PATCH] =?UTF-8?q?+=E6=80=BB=E6=A3=80=E7=BB=93=E8=AE=BA=E8=AF=8D?=
=?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=8E=92=E5=BA=8F=E3=80=81=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E7=BB=93=E8=AE=BA=E8=AF=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
PEIS/Properties/Resources.Designer.cs | 20 ++
PEIS/Properties/Resources.resx | 30 +-
PEIS/Resources/shang.png | Bin 0 -> 2348 bytes
PEIS/Resources/xia.png | Bin 0 -> 2360 bytes
PEIS/View/Exam/TotalForm.Designer.cs | 481 +++++++++++---------------
PEIS/View/Exam/TotalForm.cs | 119 +++++--
PEIS/View/Exam/TotalForm.resx | 26 +-
7 files changed, 359 insertions(+), 317 deletions(-)
create mode 100644 PEIS/Resources/shang.png
create mode 100644 PEIS/Resources/xia.png
diff --git a/PEIS/Properties/Resources.Designer.cs b/PEIS/Properties/Resources.Designer.cs
index a86da42..797f1ab 100644
--- a/PEIS/Properties/Resources.Designer.cs
+++ b/PEIS/Properties/Resources.Designer.cs
@@ -140,6 +140,16 @@ namespace PEIS.Properties {
}
}
+ ///
+ /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ ///
+ internal static System.Drawing.Bitmap shang {
+ get {
+ object obj = ResourceManager.GetObject("shang", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
///
@@ -170,6 +180,16 @@ namespace PEIS.Properties {
}
}
+ ///
+ /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ ///
+ internal static System.Drawing.Bitmap xia {
+ get {
+ object obj = ResourceManager.GetObject("xia", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
///
diff --git a/PEIS/Properties/Resources.resx b/PEIS/Properties/Resources.resx
index 5bebda9..6bd5584 100644
--- a/PEIS/Properties/Resources.resx
+++ b/PEIS/Properties/Resources.resx
@@ -130,6 +130,9 @@
..\Resources\审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\menu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -157,9 +160,6 @@
..\Resources\Report.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\预览报告.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\查找.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -172,6 +172,9 @@
..\Resources\刷新.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\个人信息 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\添加.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -184,6 +187,9 @@
..\Resources\结论.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\wechatlogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\添加1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -199,25 +205,25 @@
..\Resources\WeChat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\取消审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\取消.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\分检页面.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\取消审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\总检页面.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\个人信息 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\预览报告.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\wechatlogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\shang.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\xia.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/PEIS/Resources/shang.png b/PEIS/Resources/shang.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c9abf23eee9dde21f271735b48864de3b0de4a0
GIT binary patch
literal 2348
zcmeHISy)r&77YO-C}>3+Yz9E)!9o#{IfN1ks02j4A0PrMlQJ1mfk26IDp*M%0u_VQ
z8Y0w-Kmvl1K)?YZDbk2jf{m0gUgXA}5WHLUR&W*T}hNC^xJgu%Fswc5k0
zpdLDu5V+qf{OHeViys&?8f`<-PkPJejkVMhyOVlYli$1ISM|fKm=6&1xY>=H@rYf{
zvNu6b`Vp4y_++<0aKAp`3&S~j*R@vK7VC}fJ7Q>IXU=oEJL{vw|*?
z;R3|DSY$=c0^HYL2t)g>r{YH+D0ogJVk~|w&zs!ygG(TKFTzkHF4x_c(3#C_RZUr!~=bq78%ixq5pM=JJ?m
z!-o+rad5vj$^2}xS
zPMi4K5TZfy0OIu@fp~q_bDv18m@G$6l4aTmmiS!=PDh-M-VYJMa)|hxJ>?Zc0NloV
zjcV;#rVwKJ7BpinVQ3VZ;Q^Hitv^AEF5n-gQ!sabBO}tH^ZsMw8Br&bN
z%mI1>HX{vlcT2DiajJQi+2>s@&z?XJXf1Yt;1pPipEtx~$`6Xq+LDuP~d%H>tdt?K}iFqQq0ieh5LVc4#vJvl{w=2yNjHb@o8mU8m;S6uJ1w|k`dzt9MeB~h;@2mmzUyh-h2a>VEY$8Ua0
z3}N`7%!;cW=$9-c<-PTR`o?1)i=O`zxW5la;l*M~PG=P^eWWnPc-kOQzF5!|#(wYL
zhd0Mn-H0N+t9V+o)q?owsOlbp38;pMiqJfnlSux^cx(YU0Jf%eP9ceGtvVZQWxBAM
zwlI%@Gw+;#Xur(UjKKN0>n~Rh)iX{r*uU{X^~|g*6UcaVe`coS_IrN;p0YRq9w%=X
zcq-kQKu&9y3zazYwylV#`2gqpAl2AJwHImwD_)rCZz>P;iBg+6%N{ADt%A9ZHq$TZ
z!7nB#HlTW1lKZ;t3QzNuJ~;TE%b8OGZ_3Px)+e(anblOEC9?L7u4}1(jBX?39&0;Q
zSHQ0=98D!;$py=eWj11A-EiCR(-{qgC%q&m`!iEKcWgzpoW*}Wy{WwlFyPtFhw=F+9Zlx;28`=;?
z-4k8qoklh=)?y^I0buF>-YsR};mv&4znlL@i%^i`=ghA29p}35P?8{nGy3o$_e|XF
z6_Jm)DV)*UafzgJ6xdaTG%<5JI`6&R_+%ZU_bPB<-JkW8mK)mM+lPb$C{BU$lf4sk
zQ?})8>j)T}-kBFG>H{?PM8#F0h^}MccN3Ya@VWrH1^OR4yEAYu!~ERh?;_k3FSQ4n
z*oh2r`+>p9pG9`_f~~m8i1}jy5|6ti$S6pgG!+f4$>4DXq+GzwZPLM|Lf%=TZw!
zeBL)UogN^(r)mr^HLjPuRQfY#Jp&3yol1i@_G|Cns92#4p6w9{OPJUlfCy`TDp4KpyYslm0Mf5-CvLHKLBkxamD}u
literal 0
HcmV?d00001
diff --git a/PEIS/Resources/xia.png b/PEIS/Resources/xia.png
new file mode 100644
index 0000000000000000000000000000000000000000..087b6f70c30f2de68116f47666ff0bf895167d29
GIT binary patch
literal 2360
zcmeH|=~okH6o*4F0T(L71s8TGiWQI+NeD<17L!1UMp>lnilPW&1OW+x5iBYs5lFzA
zxEujfSzIEh)d00XB0^jeDFqcUfGi3aDFhOd>5To-p8f+pJ^k>`z3+X0=iWPaW}Z2-
zokBEPv}O?u1~Vd)e0P9$IkXIs;FWpC+z2#!DLaVXup3X!M#0U3ctRin2D{B(JRgey
z&&gk1LTa?__9@ar2khv
zzxlMbA+5f_?{gu{WiV>f={Q55pEC5Q$g}VU{a>~_Md3M&iW5|Q2Lp@|C#3Ff+(7?u
z{*kvZJ9~%Z8+t>#VSFS~aLC=5FC2n#78_W(TzQ?n-c-Ne^>Fii3_Uy6uk|s%dAQqs
z7J*;Y@@^St=PsAlHvOt4pyH$QP42pTj?5`zF5EuBPL#%CH}g!(oV~fRU{)QVQUT>2
z8cO1M%ecAs!)0t-Q_lRY#Nt}LTgHzLtTOC(HAdo{BGD2_(Yf}R6IU2kWsRAcZ#}Kc
z9>ECuWJHj2383WFH5cIy&)RPfwG
z!y!+?RWM0S+f;M<%_C3BGx*gy+gaPG{x%RCM=(|?|SA6_F`)k^T@!0-79gm
zYdVfh+gtGNf7sH&mN=`+l!f1O)~++Yqb(oB42>Q0bdv?lwa#9_v52k}VD9s+y~zq5
zAz>qsn)SRdaQ{ZPXG-Y~!poAq6_j!l8n_9Wx>rodhPH~*OtOg%La0_^l>
z)nUC%leC@w9?A65*T%PCFNo=r$GIsM;{56NUpJOa&BhBP203ak
zuinfj?=Bj}{r+t9@J!0IkLMRMa~n>{*wQbjf%0vn
zQ|8i7(c);;I;E(dBlTEK(nd?eZah`cOiFs2=PPPSZn2YCR=1{Fg)8i8$P5+%E3({<
zQr#vatk4pry+yjB{>NW!!c@KJNnoQzzVf@5dqsdGNdz3-4rw$wm$TR6($(OLf1#zw
zlgf^}NOxW>spmI&=)!?lb*DJeho+C;4)JF9oh!8^qWW@J$)#66IJVNpZ5jcIa{O1Y
zRFD;#_%)MwYIz%Wrtw%`yb@E`B`ekHx&pgJ;S5)eBI{D6Ep75mh*^D-c6THcjIb>b4?Optndd6)@sGlx%jO6qyd!>lY%q*$RN
zit6gow2hQ*KK>BRS0?Ulc~K~IXUvPMY^f@H);o@L;o!26)nqf3>!mUjkd4!6?_}7q
zkRWi*dDLtu&M+FNuOW-RS0)6G(q2MQ_mJgn;t_AN%^>myEh@LlxR?YGmXG271r-5*
zN)TKWxl8dQ1UREax?N;p`8AMJu64CVshe3BK*|a8k_sx?{}g|j6kr$0{;V)`+k#Tu
zhqR~NHlq}?r$DLfWMDxaCOhya8vH=pHD7PDCJ4%P``;89O9W5_$M8_Q78)7?Fyb{B
z%z~OZd*8;IrGbvWsv9Gn-sAE)Si1qG*u{q^`#jAK90cUaLO}0xtYWLTSv&O*AKy{R
z%)^vIWoig=(rKS^$Rqm-c`4Y7Ds*I|R!VUgXD(F>l-8vXfNNfKTH31nT+gCr6!{9O
zdVN!%`^DdN=f%^Op=$sb9BR#{C7wg@KVXdGVz=$*f`v~ipzhXR`ggic2snp@KjCh;
z;C${sOx19{eEr}=Q}x=Bswy3QOvSz?a0rbSOJIkpKe0PU_CG+kcfOxB{@Jl%1MZ=^
zAxM)iCl7w|^Mv0o&cS+(OhzG4m;I3Lf`!oqFy-~Dx}I|XW{_E}!B+Ly;xLLpiOVsu
zgqw2#d9_TAWi9tYej?-v(E+0exN@h<)aQul_`-
+ {
+ ConclusionSort(-1);
+ };
+ OpsConclusion.TsmiAdd.Click += (s, e) =>
+ {
+ ConclusionSort(1);
+ };
//结论-删除
OpsConclusion.TsmiDelete.Click += ConclusionDelete_Click;
//结论-保存
@@ -212,22 +224,59 @@ namespace PEIS.View.Exam
{
SearchAllConclusion();
};
- DgvExamConclusion.OptionsCustomization.AllowSort = true;
+ DgvExamConclusion.OptionsCustomization.AllowSort = true;
//DgcAllConclusion.DataSource = Global._lstConclusion;
// DgvAllConclusion.OptionsFind.AlwaysVisible = true;
// DgvAllConclusion.OptionsFind.ShowClearButton = false;
// DgvAllConclusion.OptionsFind.ShowCloseButton = false;
DgvAllConclusion.DoubleClick += DgvAllConclusion_DoubleClick;
DgvExamResultData.CustomDrawCell += DgvExamResultData_CustomDrawCell;
+
+ // 启用行选择
+ DgvExamConclusion.OptionsSelection.EnableAppearanceFocusedCell = false;
+ DgvExamConclusion.OptionsSelection.MultiSelect = false; // 限制单选
+ // 启用编辑功能,以便显示勾选框
+ DgvExamConclusion.OptionsBehavior.Editable = true;
+ // 设置行头自动调整高度以显示勾选框
+ DgvExamConclusion.OptionsView.RowAutoHeight = true;
}
+ private void ConclusionSort(int i)
+ {
+ if (DgvExamConclusion.GetFocusedRow() is ExamConclusion selected)
+ {
+ var current = _examConclusion.IndexOf(selected);
+ if ((current == 0 && i < 0) || (current == _examConclusion.Count - 1 && i > 0))
+ {
+ return;
+ }
+
+ var temp = _examConclusion[current + i];
+ var tempSeq = _examConclusion[current + i].Seq;
+ temp.Seq = selected.Seq;
+ selected.Seq = tempSeq;
+ _examConclusion[current + i] = selected;
+ _examConclusion[current] = temp;
+ _examConclusion = _examConclusion.OrderBy(o => o.Seq).ToList();
+ // for (int j = 0; j < _examConclusion.Count; j++)
+ // {
+ // _examConclusion[j].Seq = j + 1;
+ // }
+ Invoke(new Action(() => DgcExamConclusion.DataSource = null));
+ Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion));
+ Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion));
+ Invoke(new Action(() => DgvExamConclusion.FocusedRowHandle = current+i));
+ Invoke(new Action(() => DgvExamConclusion.SelectRow(current + i)));
+
+ }
+ }
private void SearchAllConclusion()
{
var query = txtConclusionSerch.Text;
var isId = long.TryParse(query, out var id);
- var list=string.IsNullOrEmpty(query)
- ? Global._lstConclusion
- : Global._lstConclusion.Where(p => p.SpellCode.Contains(query) || p.ConclusionName.Contains(query) || (isId && p.ID == id)).ToList();
+ var list = string.IsNullOrEmpty(query)
+ ? Global._lstConclusion
+ : Global._lstConclusion.Where(p => p.SpellCode.Contains(query) || p.ConclusionName.Contains(query) || (isId && p.ID == id)).ToList();
Invoke(new Action(() => DgcAllConclusion.DataSource = null));
Invoke(new Action(() => DgcAllConclusion.DataSource = list));
@@ -337,12 +386,12 @@ namespace PEIS.View.Exam
if (rowData != null)
{
- var conclusion = DgvExamConclusion.GetFocusedRow() as ExamConclusion;
- if (rowData == null || conclusion == null) return;
- var index = _examConclusion.IndexOf(conclusion);
- _examConclusion[index].Conclusion = rowData.ConclusionName;
- _examConclusion[index].Suggestion = rowData.Suggestion;
- ShowExamConclusion(_examConclusion);
+ var conclusion = DgvExamConclusion.GetFocusedRow() as ExamConclusion;
+ if (rowData == null || conclusion == null) return;
+ var index = _examConclusion.IndexOf(conclusion);
+ _examConclusion[index].Conclusion = rowData.ConclusionName;
+ _examConclusion[index].Suggestion = rowData.Suggestion;
+ ShowExamConclusion(_examConclusion);
}
}
}
@@ -472,9 +521,9 @@ namespace PEIS.View.Exam
///
/// 3. 获取科室小结
///
- public event EventHandler> GetSummary;
+ public event EventHandler> GetSummary;
+
-
public void ShowSummary(List items)
{
Invoke(new Action(() => _examPart = items));
@@ -504,6 +553,11 @@ namespace PEIS.View.Exam
public void ShowExamConclusion(List items)
{
+ items = items.OrderBy(o => o.Seq).ToList();
+ for (int j = 0; j < items.Count; j++)
+ {
+ items[j].Seq = j + 1;
+ }
Invoke(new Action(() => DgcExamConclusion.DataSource = null));
Invoke(new Action(() => _examConclusion = items));
Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion));
@@ -537,8 +591,8 @@ namespace PEIS.View.Exam
{
GetPatient?.Invoke(this, new Args
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAlJJREFUWEfV
- lrFP20AUxpNCiIoEAuEwVEBM24WhCimIZKjoWrNARQQjf0K7tWuBuaqABXVpJ5hYSar+A8xBXRmRGFqE
- QGoloLx3/i44vjv7HFOp/KQ3vO/ufe9y8Z2dudeUvG9vOMpz3yuQ/h09vY8eztQO/1rGNsrS0+c8zwfN
- q8s/9jCk8GR6/dlMrXkZmH+Aoc4gg6Y0KxS9HGQraCF1WZvLD2Qh2yOLK7XDNUgdIX2Q2tFRUQTkdcV+
- 3T0DeUhmaOvEtiPV4i+weYzUCr8m5kfJB462fRWSgpWRgdjauAmt8WzXA0iJcNz5Ia6nI90P6RZ5zgvF
- V9qnvdU8JUafqAZRY0lxxheLxgVUltRL5i6bS9iv5DW+IPXRNZHNKU4pftkGmX+ChRaao/4oRSDkxBRx
- Dqs26Aif8DhSfqvV37YJAaQZUmueVj++M9VSv902PWoBjMkojuHHr0e4bmJ204UkUBZQ9urVuAadLkJX
- R8/IkeJlY64zi2N8em0jXEP5H8WHBX6fIzXC85TiCGgB78Pz4fETqY8vNi+RRgKDC6SR0LzfPB+pIJwL
- qPm2diAl7Enen5FynwNjH0zeR5qObFfW99Nuv/Z+4EHz6ixBg1ZAFlB+FtYUdIW20LkXr1sOpzj/ArKA
- 7oJR1t2pDyuQ9OTyg3LrriDdCXJhSONJXGBg4uXWGLyuIdnBH5ByEY67MAQ5EVQr/nMOSMmRBhwFd3EM
- ciQ0VzzMHLH/uQ38DScNA3Ey6TV2OHC3i+s1EPqjlpbSXONrqFEw2q/X/59M5gZwQwBmYRNKogAAAABJ
- RU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAYBJREFUWEft
+ lM9KwzAcx4sIwjqQTQU91j2DdOyk4lNsB1/AJxBkUpVOJqakhzag+AwevPsSvoMXbx4ERU3mNyWGdDat
+ dJd+4AfJ9/eXNKnT0GBLFLMvYdjWi2y+kAHU5rUPoDevdQC9aa0D6M0FtQ1gai5QdWEkTo46ne4y3P+D
+ 2gBShurTjVD2iLDyqAUh5bLj9zf5CYRqjjASpXcIsUMtAsmKiLKXrAZln5CLUbW5SqlaMmFtfaMLqRLW
+ QxCaXMqEluu2IFdC1iMxe4I0H3UISJWxrjeZRrFMcg0nIX0Ge+PxSwjLmFxF9z/+9BXS36hD6HdC6vNs
+ d+9gH+EzpI5tMfLuRF4xHh9Inx7Dn+SH2Pv+oA2pGKY7oe91XLe9ImOEnZ1PRyfji6FYE5o+IKw4+p2Q
+ a7hzOQ3CRMbyV3BbNM+IOoRNIW+7t1omz4j6OWwKeV7v1yeBXI6y/4lxEB7P8ih7hlQefqGurd404M3f
+ h6PDG2wXg98fbGHZ0AAc5xt8asXwHSUE5wAAAABJRU5ErkJggg==