Recoding
/
PEIS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、重新提取检查结果

Browse Source
dhzzyy
lsm 7 months ago
parent 394b532798
commit 6ae6e1efa2
3 changed files with 69 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      PEIS/View/Exam/PartForm.Designer.cs
  2. 46
      PEIS/View/Exam/PartForm.cs
  3. 15
      PEIS/View/Exam/PartForm.resx

29
PEIS/View/Exam/PartForm.Designer.cs generated
Unescape View File

@ -28,7 +28,6 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PartForm));
this.splitContainerBase = new System.Windows.Forms.SplitContainer();
this.panelPatients = new System.Windows.Forms.Panel();
@ -77,7 +76,7 @@
this.dgvSign = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.dgcExamResult = new DevExpress.XtraGrid.GridControl();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip();
this.menuGiveUp1 = new System.Windows.Forms.ToolStripMenuItem();
this.menuGiveUp2 = new System.Windows.Forms.ToolStripMenuItem();
this.menuGiveUp3 = new System.Windows.Forms.ToolStripMenuItem();
@ -229,6 +228,7 @@
this.tsmiReview = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiConclusion = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiSave = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiPick = new System.Windows.Forms.ToolStripMenuItem();
this.strip1 = new System.Windows.Forms.ToolStripMenuItem();
this.stripTxtEid = new System.Windows.Forms.ToolStripTextBox();
this.strip2 = new System.Windows.Forms.ToolStripMenuItem();
@ -239,7 +239,6 @@
this.colRptExtTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.colRptExtDesc = new DevExpress.XtraGrid.Columns.GridColumn();
this.superTabControl1 = new FastReport.DevComponents.DotNetBar.SuperTabControl();
this.tsmiRefresh = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.splitContainerBase)).BeginInit();
this.splitContainerBase.Panel1.SuspendLayout();
this.splitContainerBase.Panel2.SuspendLayout();
@ -2851,7 +2850,7 @@
this.tsmiReview,
this.tsmiConclusion,
this.tsmiSave,
this.tsmiRefresh,
this.tsmiPick,
this.strip1,
this.stripTxtEid,
this.strip2,
@ -2903,6 +2902,16 @@
this.tsmiSave.Size = new System.Drawing.Size(73, 40);
this.tsmiSave.Text = "保存";
//
// 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;
//
// strip1
//
this.strip1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@ -3003,16 +3012,6 @@
this.superTabControl1.SelectedTabIndex = -1;
this.superTabControl1.TabIndex = 0;
//
// tsmiRefresh
//
this.tsmiRefresh.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.tsmiRefresh.Image = global::PEIS.Properties.Resources.刷新;
this.tsmiRefresh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.tsmiRefresh.Name = "tsmiRefresh";
this.tsmiRefresh.Size = new System.Drawing.Size(131, 40);
this.tsmiRefresh.Text = "重新提取结果";
this.tsmiRefresh.Visible = false;
//
// PartForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@ -3331,6 +3330,6 @@
private UControl.OpMenuSimple opsConclusion;
private System.Windows.Forms.Label label19;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private System.Windows.Forms.ToolStripMenuItem tsmiRefresh;
private System.Windows.Forms.ToolStripMenuItem tsmiPick;
}
}

46
PEIS/View/Exam/PartForm.cs
Unescape View File

@ -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 == "3203" || _currentDept.DeptCode == "3204" || _currentDept.DeptCode == "3101")
{
tsmiPick.Visible = true;
}
else
{
tsmiPick.Visible = false;
}
}
// else
// {
@ -1070,6 +1082,23 @@ namespace PEIS.View.Exam
}
}
/// <summary>
/// 重新提取检查结果
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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}");
}
/// <summary>
/// 保存科室分检
/// </summary>
@ -1147,6 +1176,21 @@ namespace PEIS.View.Exam
var result = MessageBox.Show(@"是否确认审核？", @"审核", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (result != DialogResult.Yes) return;
// 检验科判断项目是否完全出结果
if(_examPart.DeptCode == "3001")
{
//var resultFeeItem = DAOHelp.GetDataBySQL<ExamResult>($@"SELECT FeeItemName FROM Exam_Result WHERE PID = {_examPart.ID} AND DeptName LIKE '%医学检验科%' GROUP BY FeeItemName");
//var examFeeItem = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"SELECT FeeItemName FROM Enrollment_FeeItem WHERE EID = {_patient.ID} and DeptCode = '3001'");
//if(resultFeeItem.Count != examFeeItem.Count)
//{
// Msg("info", "请核对检验项目是否齐全后重试！");
// return;
//}
}
Review?.Invoke(this, new Args<DateTime?>
{
ID = _examPart.ID,
@ -1565,6 +1609,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 =

15
PEIS/View/Exam/PartForm.resx
Unescape View File

@ -117,12 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>460, 17</value>
</metadata>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>175, 17</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>340, 17</value>
</metadata>
@ -171,6 +165,15 @@
fOB5L+flMi1KC1D4AAAAAElFTkSuQmCC
</value>
</data>
<metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>460, 17</value>
</metadata>
<metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>460, 17</value>
</metadata>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>175, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>70</value>
</metadata>

Write Preview
Loading…
Cancel
Save