diff --git a/PEIS/Utils/ReportHelper.cs b/PEIS/Utils/ReportHelper.cs
index baa2995..4f9638b 100644
--- a/PEIS/Utils/ReportHelper.cs
+++ b/PEIS/Utils/ReportHelper.cs
@@ -536,7 +536,7 @@ namespace PEIS.Utils
rpt.SetParameterValue("CardNo", regInfo.CardNo);
rpt.SetParameterValue("HospitalName", Global._hospital?.Name);
- if (regInfo.Photo == null)
+ if (string.IsNullOrEmpty(regInfo.Photo))
{
rpt.SetParameterValue("Avatar", regInfo.Photo);
}
diff --git a/PEIS/View/Exam/PartForm.Designer.cs b/PEIS/View/Exam/PartForm.Designer.cs
index a1516de..372c2b7 100644
--- a/PEIS/View/Exam/PartForm.Designer.cs
+++ b/PEIS/View/Exam/PartForm.Designer.cs
@@ -239,6 +239,7 @@
this.colRptExtTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.colRptExtDesc = new DevExpress.XtraGrid.Columns.GridColumn();
this.superTabControl1 = new FastReport.DevComponents.DotNetBar.SuperTabControl();
+ this.tsmiPick = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.splitContainerBase)).BeginInit();
this.splitContainerBase.Panel1.SuspendLayout();
this.splitContainerBase.Panel2.SuspendLayout();
@@ -2850,6 +2851,7 @@
this.tsmiReview,
this.tsmiConclusion,
this.tsmiSave,
+ this.tsmiPick,
this.strip1,
this.stripTxtEid,
this.strip2,
@@ -3001,6 +3003,16 @@
this.superTabControl1.SelectedTabIndex = -1;
this.superTabControl1.TabIndex = 0;
//
+ // tsmiPick
+ //
+ this.tsmiPick.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.tsmiPick.Image = global::PEIS.Properties.Resources.刷新;
+ this.tsmiPick.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tsmiPick.Name = "tsmiPick";
+ this.tsmiPick.Size = new System.Drawing.Size(131, 40);
+ this.tsmiPick.Text = "重新提取结果";
+ this.tsmiPick.Visible = false;
+ //
// PartForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@@ -3319,5 +3331,6 @@
private UControl.OpMenuSimple opsConclusion;
private System.Windows.Forms.Label label19;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private System.Windows.Forms.ToolStripMenuItem tsmiPick;
}
}
\ No newline at end of file
diff --git a/PEIS/View/Exam/PartForm.cs b/PEIS/View/Exam/PartForm.cs
index 03f7955..0345d14 100644
--- a/PEIS/View/Exam/PartForm.cs
+++ b/PEIS/View/Exam/PartForm.cs
@@ -114,6 +114,8 @@ namespace PEIS.View.Exam
// rdoStatus3.Click += RadioButton_Click;
rdoStatus4.Click += RadioButton_Click;
btnRefresh.Click += (s, e) => { OnGetPatients(); };
+ // 菜单-重新提取检查结果
+ tsmiPick.Click += TsmiPick_Click;
//菜单-保存
tsmiSave.Click += TsmiSave_Click;
//菜单-生成小结结论
@@ -433,6 +435,16 @@ namespace PEIS.View.Exam
{
OnGetExamPart();
//OnGetPatients();
+
+ // 选中检查科室提取结果按钮显示
+ if (_currentDept.DeptCode == "3201" || _currentDept.DeptCode == "3202" )
+ {
+ tsmiPick.Visible = true;
+ }
+ else
+ {
+ tsmiPick.Visible = false;
+ }
}
// else
// {
@@ -1071,6 +1083,23 @@ namespace PEIS.View.Exam
}
}
+ ///
+ /// 重新提取检查结果
+ ///
+ ///
+ ///
+ private void TsmiPick_Click(object sender, EventArgs e)
+ {
+ if (_patient.ID <= 0 || _patient.FinishTime != null || _examPart.VerifyTime != null || _examPart.GiveUpTime != null) return;
+ DAOHelp.ExecuteSql($@"DELETE FROM Report WHERE ID IN (
+ SELECT a.ID
+ FROM Report a
+ LEFT JOIN Enrollment_FeeItem b ON (a.ReportNo = b.ID OR a.ReportNo = b.OldId)
+ WHERE a.EID = {_patient.ID} AND b.DeptCode = '{_examPart.DeptCode}')");
+
+ DAOHelp.ExecuteSql($@"EXEC sp_PacsRptInsert {_patient.ID}");
+ }
+
///
/// 保存科室分检
///
@@ -1566,6 +1595,8 @@ namespace PEIS.View.Exam
item = item ?? _examPart;
//保存:未审核+未弃检
Invoke(new Action(() => tsmiSave.Enabled = (item.GiveUpTime == null && item.VerifyTime == null)));
+ // 提取结果:未审核+未弃检
+ Invoke(new Action(() => tsmiPick.Enabled = (item.GiveUpTime == null && item.VerifyTime == null)));
//结论:已保存+未审核+未弃检
Invoke(new Action(() =>
tsmiConclusion.Enabled =
diff --git a/PEIS/View/Exam/PartForm.resx b/PEIS/View/Exam/PartForm.resx
index 6d4f03e..14ad733 100644
--- a/PEIS/View/Exam/PartForm.resx
+++ b/PEIS/View/Exam/PartForm.resx
@@ -171,9 +171,6 @@
fOB5L+flMi1KC1D4AAAAAElFTkSuQmCC
-
- 17, 17
-
70