diff --git a/PEIS/Entity/EnrollmentFeeItem.cs b/PEIS/Entity/EnrollmentFeeItem.cs
index a5cc8c9..f64ef74 100644
--- a/PEIS/Entity/EnrollmentFeeItem.cs
+++ b/PEIS/Entity/EnrollmentFeeItem.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using PEIS.Utils;
@@ -62,10 +62,14 @@ namespace PEIS.Entity
[RefFlag(true)]
public Decimal? TotalPrice { get; set; }
- //是否治疗费
+ //是否分总检隐藏(不进行科室分检和总检)
[RefFlag(true)]
public Boolean IsHide { get; set; }
+ //是否指引单隐藏(不出现在指引单)
+ [RefFlag(true)]
+ public Boolean IsHideInGuide { get; set; }
+
// 科室注意事项
[RefFlag(true)]
public String DeptTips { get; set; }
diff --git a/PEIS/Entity/FeeItem.cs b/PEIS/Entity/FeeItem.cs
index 7ab4105..6504e0e 100644
--- a/PEIS/Entity/FeeItem.cs
+++ b/PEIS/Entity/FeeItem.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using PEIS.Utils;
namespace PEIS.Entity
@@ -16,6 +16,13 @@ namespace PEIS.Entity
public String Unit { get; set; }
public String KeyNo { get; set; }
public String FeeItemTips { get; set; }
+ ///
+ /// 指引单隐藏:勾选后该项目不出现在指引单
+ ///
+ public Boolean IsHideInGuide { get; set; }
+ ///
+ /// 分总检隐藏:勾选后该项目不进行科室分检和总检
+ ///
public Boolean IsHide { get; set; }
public String ClassName { get; set; }
diff --git a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs
index 108018b..a62daf0 100644
--- a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs
+++ b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs
@@ -1,4 +1,4 @@
-#region CopyRight
+#region CopyRight
/****************************************************************
* Project:健康体检信息管理系统(PEIS)
@@ -297,11 +297,12 @@ namespace PEIS.Model.Enrollment
return DAOHelp.GetDataBySQL($@"SELECT
a.*,
b.IsHide,
+ b.IsHideInGuide,
c.Address,
c.DeptTips
FROM
[dbo].[Enrollment_FeeItem] a
- LEFT JOIN Dict_FeeItem b ON a.KeyNo = b.KeyNo
+ LEFT JOIN Dict_FeeItem b ON a.KeyNo = b.KeyNo
LEFT JOIN Dict_Dept c ON a.DeptCode = c.HISCode AND a.DeptName = c.Name
WHERE
a.EID = {EId}");
diff --git a/PEIS/Model/EnrollmentFeeItemModel.cs b/PEIS/Model/EnrollmentFeeItemModel.cs
index 43e75b2..8847997 100644
--- a/PEIS/Model/EnrollmentFeeItemModel.cs
+++ b/PEIS/Model/EnrollmentFeeItemModel.cs
@@ -1,4 +1,4 @@
-#region CopyRight
+#region CopyRight
/****************************************************************
* Project:健康体检信息管理系统(PEIS)
@@ -33,7 +33,7 @@ namespace PEIS.Model
public List GetItemsByEnrollmentID(Int64 enrollmentID)
{
- return DAOHelp.GetDataBySQL($"Select a.*, b.Address, c.IsHide From Enrollment_FeeItem a LEFT JOIN Dict_Dept b ON a.DeptCode = b.HISCode LEFT JOIN Dict_FeeItem c ON a.KeyNo = c.KeyNo Where a.EID = {enrollmentID} Order by a.PackName DESC, a.OrderNo, a.DeptName");
+ return DAOHelp.GetDataBySQL($"Select a.*, b.Address, c.IsHide, c.IsHideInGuide From Enrollment_FeeItem a LEFT JOIN Dict_Dept b ON a.DeptCode = b.HISCode LEFT JOIN Dict_FeeItem c ON a.KeyNo = c.KeyNo Where a.EID = {enrollmentID} Order by a.PackName DESC, a.OrderNo, a.DeptName");
}
public List GetItems4CheckCost(Int64 oeID, Int64 enrollmentID)
diff --git a/PEIS/Model/ZbxxInfo.cs b/PEIS/Model/ZbxxInfo.cs
new file mode 100644
index 0000000..d9e2188
--- /dev/null
+++ b/PEIS/Model/ZbxxInfo.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using PEIS.Utils;
+
+namespace PEIS.Model
+{
+ ///
+ /// 专病信息查询(HIS数据库视图 v_flup_zbxx)
+ ///
+ public class ZbxxInfo
+ {
+ public long PatientID { get; set; }
+ public string PatientName { get; set; }
+ public string ChronicName { get; set; }
+ public string PersonID { get; set; }
+
+ ///
+ /// 根据身份证号查询专病信息(直接用DataTable读取,避免DAO泛型映射问题)
+ ///
+ /// 身份证号
+ /// 专病信息列表
+ public static List GetByCardNo(string cardNo)
+ {
+ var list = new List();
+ if (string.IsNullOrEmpty(cardNo)) return list;
+
+ try
+ {
+ var sql = string.Format(
+ "SELECT PatientID, PatientName, ChronicName, PersonID FROM [his].[hisdata].[dbo].[v_flup_zbxx] WHERE PersonID = '{0}' AND ChronicType <> '已作废' ",
+ cardNo.Replace("'", "''"));
+
+ DataTable dt = DAOHelp.GetDataBySQL(sql);
+ if (dt == null || dt.Rows.Count == 0) return list;
+
+ foreach (DataRow row in dt.Rows)
+ {
+ var item = new ZbxxInfo();
+ if (dt.Columns.Contains("PatientID") && row["PatientID"] != DBNull.Value)
+ item.PatientID = Convert.ToInt64(row["PatientID"]);
+ if (dt.Columns.Contains("PatientName") && row["PatientName"] != DBNull.Value)
+ item.PatientName = Convert.ToString(row["PatientName"]);
+ if (dt.Columns.Contains("ChronicName") && row["ChronicName"] != DBNull.Value)
+ item.ChronicName = Convert.ToString(row["ChronicName"]);
+ if (dt.Columns.Contains("PersonID") && row["PersonID"] != DBNull.Value)
+ item.PersonID = Convert.ToString(row["PersonID"]);
+ list.Add(item);
+ }
+ }
+ catch { }
+
+ return list;
+ }
+
+ ///
+ /// 根据身份证号获取专病信息摘要(病名顿号连接)
+ ///
+ /// 身份证号
+ /// 专病信息对象,含PatientID和病名文本;无数据返回null
+ public static ZbxxInfo GetSummaryByCardNo(string cardNo)
+ {
+ try
+ {
+ var list = GetByCardNo(cardNo);
+ if (list == null || list.Count == 0) return null;
+
+ var chronicNames = list
+ .Where(x => !string.IsNullOrEmpty(x.ChronicName))
+ .Select(x => x.ChronicName)
+ .Distinct()
+ .ToList();
+
+ if (chronicNames.Count == 0) return null;
+
+ return new ZbxxInfo
+ {
+ PatientID = list.First().PatientID,
+ PatientName = list.First().PatientName,
+ PersonID = list.First().PersonID,
+ ChronicName = string.Join("、", chronicNames)
+ };
+ }
+ catch
+ {
+ return null;
+ }
+ }
+ }
+}
diff --git a/PEIS/PEIS.csproj b/PEIS/PEIS.csproj
index d523b87..931fe17 100644
--- a/PEIS/PEIS.csproj
+++ b/PEIS/PEIS.csproj
@@ -286,6 +286,7 @@
+
diff --git a/PEIS/Utils/Global.cs b/PEIS/Utils/Global.cs
index bebe6f4..cd00183 100644
--- a/PEIS/Utils/Global.cs
+++ b/PEIS/Utils/Global.cs
@@ -1,4 +1,4 @@
-#region CopyRight
+#region CopyRight
/****************************************************************
* Project:健康体检信息管理系统(PEIS)
@@ -121,6 +121,68 @@ namespace PEIS.Utils
///
public static string CAUserId { get; set; }
+ ///
+ /// 是否显示专病信息开关(Dict_Config中Key=IsShowZBXX,Value=1开启)
+ ///
+ public static bool IsShowZBXX
+ {
+ get
+ {
+ try
+ {
+ if (_lstConfig == null || _lstConfig.Count == 0) return false;
+ var config = _lstConfig.FirstOrDefault(x => x != null && x.Key == "IsShowZBXX");
+ var val = config?.Value ?? "0";
+ return val == "1" || val.Equals("true", StringComparison.OrdinalIgnoreCase);
+ }
+ catch
+ {
+ return false;
+ }
+ }
+ }
+
+ ///
+ /// 专病信息链接模板,{0}占位符为PatientID
+ /// 默认:http://200.200.200.60:7070/crm/static/index.html#/chronicDiseaseRecords?patientId={0}
+ ///
+ public static string ZBXXUrlTemplate
+ {
+ get
+ {
+ try
+ {
+ if (_lstConfig == null || _lstConfig.Count == 0)
+ return "http://200.200.200.60:7070/crm/static/index.html#/chronicDiseaseRecords?patientId={0}";
+ var config = _lstConfig.FirstOrDefault(x => x != null && x.Key == "ZBXXUrlTemplate");
+ return config?.Value ?? "http://200.200.200.60:7070/crm/static/index.html#/chronicDiseaseRecords?patientId={0}";
+ }
+ catch
+ {
+ return "http://200.200.200.60:7070/crm/static/index.html#/chronicDiseaseRecords?patientId={0}";
+ }
+ }
+ }
+
+ ///
+ /// 生成专病信息链接
+ ///
+ /// 患者ID
+ /// 完整URL
+ public static string BuildZBXXUrl(long patientId)
+ {
+ try
+ {
+ return string.Format(ZBXXUrlTemplate, patientId);
+ }
+ catch
+ {
+ return string.Format(
+ "http://200.200.200.60:7070/crm/static/index.html#/chronicDiseaseRecords?patientId={0}",
+ patientId);
+ }
+ }
+
///
/// 返回*.exe.cdddonfig文件中appSettings配置节的value项
///
diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs
index e942380..74b5d3d 100644
--- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs
+++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs
@@ -1,4 +1,4 @@
-using DevExpress.Data;
+using DevExpress.Data;
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
@@ -1063,7 +1063,7 @@ namespace PEIS.View.Enrollment
try
{
var items = new List();
- _lstEnrollmentFeeItem.Where(w => w.OrderNo != null && !w.IsHide).GroupBy(g => g.DeptCode).ForEach(dept =>
+ _lstEnrollmentFeeItem.Where(w => w.OrderNo != null && !w.IsHideInGuide).GroupBy(g => g.DeptCode).ForEach(dept =>
{
var item = new EnrollmentFeeItem()
{
diff --git a/PEIS/View/Enrollment/EnrollmentPersonForm.cs b/PEIS/View/Enrollment/EnrollmentPersonForm.cs
index e51b0e0..10aa7f8 100644
--- a/PEIS/View/Enrollment/EnrollmentPersonForm.cs
+++ b/PEIS/View/Enrollment/EnrollmentPersonForm.cs
@@ -1,13 +1,15 @@
-using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using DevExpress.XtraPrinting.Native;
using PEIS.Base;
using PEIS.Entity;
using PEIS.Event;
+using PEIS.Model;
using PEIS.Presenter;
using PEIS.Utils;
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Drawing;
using System.Dynamic;
using System.IO;
@@ -29,6 +31,7 @@ namespace PEIS.View.Enrollment
List _lstCheckCost = null;
List _lstFeeItem = null, _lstPackFeeItem = null;
EnrollmentPatient _chooseRegItem = null;
+ LinkLabel _lblZbxxInfo;
GridHitInfo pInfo = new GridHitInfo();
GridHitInfo fInfo = new GridHitInfo();
@@ -153,6 +156,8 @@ namespace PEIS.View.Enrollment
DgvEFeeItem.MouseDown += DgvEFeeItem_MouseDown;
#endregion
+ // 初始化专病信息链接
+ InitZbxxInfoLink();
}
private void DgvEFeeItem_CustomSummaryCalculate(object sender, DevExpress.Data.CustomSummaryEventArgs e)
@@ -668,7 +673,7 @@ namespace PEIS.View.Enrollment
try
{
var items = new List();
- _lstEFeeItem.Where(w => w.OrderNo != null && !w.IsHide).GroupBy(g => g.DeptCode).ForEach(dept =>
+ _lstEFeeItem.Where(w => w.OrderNo != null && !w.IsHideInGuide).GroupBy(g => g.DeptCode).ForEach(dept =>
{
var item = new EnrollmentFeeItem()
{
@@ -1298,6 +1303,88 @@ namespace PEIS.View.Enrollment
CompanyLabel.Text = item?.Company;
RegAvatar.Image = Base64ToImage(item?.Photo);
}));
+
+ // 加载专病信息
+ LoadZbxxInfo(item?.CardNo);
+ }
+
+ ///
+ /// 初始化专病信息链接控件
+ ///
+ private void InitZbxxInfoLink()
+ {
+ try
+ {
+ if (panel1 == null || panel1.IsDisposed) return;
+
+ _lblZbxxInfo = new LinkLabel
+ {
+ AutoSize = true,
+ Font = new Font("微软雅黑", 9F),
+ LinkColor = Color.FromArgb(0, 102, 204),
+ ActiveLinkColor = Color.FromArgb(0, 102, 204),
+ VisitedLinkColor = Color.FromArgb(0, 102, 204),
+ Location = new Point(960, 123),
+ Name = "_lblZbxxInfo",
+ TabIndex = 200,
+ Text = "专病信息:加载中...",
+ Visible = Global.IsShowZBXX
+ };
+ _lblZbxxInfo.LinkClicked += (s, e) =>
+ {
+ if (!string.IsNullOrEmpty(_lblZbxxInfo.Tag?.ToString()))
+ {
+ System.Diagnostics.Process.Start(_lblZbxxInfo.Tag.ToString());
+ }
+ };
+ panel1.Controls.Add(_lblZbxxInfo);
+ _lblZbxxInfo.BringToFront();
+ }
+ catch { }
+ }
+
+ ///
+ /// 加载专病信息
+ ///
+ private void LoadZbxxInfo(string cardNo)
+ {
+ try
+ {
+ if (_lblZbxxInfo == null || _lblZbxxInfo.IsDisposed) return;
+ if (!Global.IsShowZBXX) return;
+
+ _lblZbxxInfo.Visible = false;
+ _lblZbxxInfo.Text = string.IsNullOrEmpty(cardNo) ? "专病信息:暂无身份证号" : "专病信息:加载中...";
+ _lblZbxxInfo.Tag = null;
+
+ if (string.IsNullOrEmpty(cardNo)) return;
+
+ // 异步加载专病信息
+ ThreadPool.QueueUserWorkItem(state =>
+ {
+ try
+ {
+ var info = ZbxxInfo.GetSummaryByCardNo(cardNo);
+ if (info == null || string.IsNullOrEmpty(info.ChronicName)) return;
+
+ Invoke(new Action(() =>
+ {
+ try
+ {
+ if (_lblZbxxInfo == null || _lblZbxxInfo.IsDisposed) return;
+ _lblZbxxInfo.Text = $"专病信息:{info.ChronicName}";
+ _lblZbxxInfo.Tag = Global.BuildZBXXUrl(info.PatientID);
+ _lblZbxxInfo.Visible = true;
+ _lblZbxxInfo.Links.Clear();
+ _lblZbxxInfo.Links.Add(5, _lblZbxxInfo.Text.Length - 5);
+ }
+ catch { }
+ }));
+ }
+ catch { }
+ });
+ }
+ catch { }
}
#endregion
diff --git a/PEIS/View/Exam/PartForm.cs b/PEIS/View/Exam/PartForm.cs
index 67974b5..382e348 100644
--- a/PEIS/View/Exam/PartForm.cs
+++ b/PEIS/View/Exam/PartForm.cs
@@ -7,6 +7,7 @@ using DevExpress.XtraTab;
using PEIS.Base;
using PEIS.Entity;
using PEIS.Event;
+using PEIS.Model;
using PEIS.Model.Exam;
using PEIS.Presenter;
using PEIS.Utils;
@@ -72,6 +73,7 @@ namespace PEIS.View.Exam
private User _currentDept;
private ImageList _pacsImgList;
private HistoryView historyView;
+ private LinkLabel _lblZbxxInfo;
#region 基础方法
@@ -200,6 +202,9 @@ namespace PEIS.View.Exam
{
if (e.KeyCode == Keys.Enter) OnGetPatients();
};
+
+ // 初始化专病信息链接
+ InitZbxxInfoLink();
}
#region 【part01】.体检者列表
@@ -2482,6 +2487,81 @@ namespace PEIS.View.Exam
}
Invalidate(); // 使控件无效以重绘
+
+ // 加载专病信息
+ LoadZbxxInfo(patient?.CardNo);
+ }
+
+ ///
+ /// 初始化专病信息链接控件
+ ///
+ private void InitZbxxInfoLink()
+ {
+ _lblZbxxInfo = new LinkLabel
+ {
+ AutoSize = false,
+ Dock = DockStyle.Fill,
+ Font = new Font("微软雅黑", 9F),
+ LinkColor = Color.FromArgb(0, 102, 204),
+ ActiveLinkColor = Color.FromArgb(0, 102, 204),
+ VisitedLinkColor = Color.FromArgb(0, 102, 204),
+ Name = "_lblZbxxInfo",
+ Text = "专病信息",
+ TextAlign = ContentAlignment.MiddleLeft,
+ Visible = Global.IsShowZBXX
+ };
+ _lblZbxxInfo.LinkClicked += (s, e) =>
+ {
+ if (!string.IsNullOrEmpty(_lblZbxxInfo.Tag?.ToString()))
+ {
+ System.Diagnostics.Process.Start(_lblZbxxInfo.Tag.ToString());
+ }
+ };
+ tableLayoutPanel1.Controls.Add(_lblZbxxInfo, 9, 3);
+ }
+
+ ///
+ /// 加载专病信息
+ ///
+ private void LoadZbxxInfo(string cardNo)
+ {
+ try
+ {
+ if (_lblZbxxInfo == null || _lblZbxxInfo.IsDisposed) return;
+ if (!Global.IsShowZBXX) return;
+
+ _lblZbxxInfo.Visible = false;
+ _lblZbxxInfo.Text = string.IsNullOrEmpty(cardNo) ? "专病信息:暂无身份证号" : "专病信息:加载中...";
+ _lblZbxxInfo.Tag = null;
+
+ if (string.IsNullOrEmpty(cardNo)) return;
+
+ // 异步加载专病信息
+ System.Threading.ThreadPool.QueueUserWorkItem(state =>
+ {
+ try
+ {
+ var info = ZbxxInfo.GetSummaryByCardNo(cardNo);
+ if (info == null || string.IsNullOrEmpty(info.ChronicName)) return;
+
+ Invoke(new Action(() =>
+ {
+ try
+ {
+ if (_lblZbxxInfo == null || _lblZbxxInfo.IsDisposed) return;
+ _lblZbxxInfo.Text = $"专病信息:{info.ChronicName}";
+ _lblZbxxInfo.Tag = Global.BuildZBXXUrl(info.PatientID);
+ _lblZbxxInfo.Visible = true;
+ _lblZbxxInfo.Links.Clear();
+ _lblZbxxInfo.Links.Add(5, _lblZbxxInfo.Text.Length - 5);
+ }
+ catch { }
+ }));
+ }
+ catch { }
+ });
+ }
+ catch { }
}
}
}
\ No newline at end of file
diff --git a/PEIS/View/Exam/TotalForm.cs b/PEIS/View/Exam/TotalForm.cs
index 3c23df4..72b61e2 100644
--- a/PEIS/View/Exam/TotalForm.cs
+++ b/PEIS/View/Exam/TotalForm.cs
@@ -12,6 +12,7 @@ using PEIS.Utils;
using PEIS.View.UControl;
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Drawing;
using System.Globalization;
using System.IO;
@@ -37,6 +38,7 @@ namespace PEIS.View.Exam
private HistoryView historyView;
private readonly string _watermarkTeam = @"团检号或团队名称";
private readonly string _watermarkInfo = @"体检号或体检者姓名";
+ private LinkLabel _lblZbxxInfo;
// 定义一个委托
public delegate void SelectedPatientDelegate(long? eid);
@@ -262,6 +264,9 @@ namespace PEIS.View.Exam
DgvExamConclusion.OptionsView.RowAutoHeight = true;
this.InitResultView();
+
+ // 初始化专病信息链接
+ InitZbxxInfoLink();
}
private void InitResultView()
@@ -1202,6 +1207,81 @@ namespace PEIS.View.Exam
TsmiWeChatViewReport.ForeColor = status ? Color.Black : Color.Red;
Invalidate(); // 使控件无效以重绘
+
+ // 加载专病信息
+ LoadZbxxInfo(patient?.CardNo);
+ }
+
+ ///
+ /// 初始化专病信息链接控件
+ ///
+ private void InitZbxxInfoLink()
+ {
+ _lblZbxxInfo = new LinkLabel
+ {
+ AutoSize = false,
+ Dock = DockStyle.Fill,
+ Font = new Font("微软雅黑", 9F),
+ LinkColor = Color.FromArgb(0, 102, 204),
+ ActiveLinkColor = Color.FromArgb(0, 102, 204),
+ VisitedLinkColor = Color.FromArgb(0, 102, 204),
+ Name = "_lblZbxxInfo",
+ Text = "专病信息",
+ TextAlign = ContentAlignment.MiddleLeft,
+ Visible = Global.IsShowZBXX
+ };
+ _lblZbxxInfo.LinkClicked += (s, e) =>
+ {
+ if (!string.IsNullOrEmpty(_lblZbxxInfo.Tag?.ToString()))
+ {
+ Process.Start(_lblZbxxInfo.Tag.ToString());
+ }
+ };
+ tableLayoutPanel1.Controls.Add(_lblZbxxInfo, 9, 3);
+ }
+
+ ///
+ /// 加载专病信息
+ ///
+ private void LoadZbxxInfo(string cardNo)
+ {
+ try
+ {
+ if (_lblZbxxInfo == null || _lblZbxxInfo.IsDisposed) return;
+ if (!Global.IsShowZBXX) return;
+
+ _lblZbxxInfo.Visible = false;
+ _lblZbxxInfo.Text = string.IsNullOrEmpty(cardNo) ? "专病信息:暂无身份证号" : "专病信息:加载中...";
+ _lblZbxxInfo.Tag = null;
+
+ if (string.IsNullOrEmpty(cardNo)) return;
+
+ // 异步加载专病信息
+ System.Threading.ThreadPool.QueueUserWorkItem(state =>
+ {
+ try
+ {
+ var info = ZbxxInfo.GetSummaryByCardNo(cardNo);
+ if (info == null || string.IsNullOrEmpty(info.ChronicName)) return;
+
+ Invoke(new Action(() =>
+ {
+ try
+ {
+ if (_lblZbxxInfo == null || _lblZbxxInfo.IsDisposed) return;
+ _lblZbxxInfo.Text = $"专病信息:{info.ChronicName}";
+ _lblZbxxInfo.Tag = Global.BuildZBXXUrl(info.PatientID);
+ _lblZbxxInfo.Visible = true;
+ _lblZbxxInfo.Links.Clear();
+ _lblZbxxInfo.Links.Add(5, _lblZbxxInfo.Text.Length - 5);
+ }
+ catch { }
+ }));
+ }
+ catch { }
+ });
+ }
+ catch { }
}
///
diff --git a/PEIS/View/Setting/FeeItemForm.Designer.cs b/PEIS/View/Setting/FeeItemForm.Designer.cs
index 6ba39eb..cd34eb4 100644
--- a/PEIS/View/Setting/FeeItemForm.Designer.cs
+++ b/PEIS/View/Setting/FeeItemForm.Designer.cs
@@ -66,6 +66,7 @@ namespace PEIS.View.Setting
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
+ this.gridColumnHideInGuide = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
@@ -527,6 +528,7 @@ namespace PEIS.View.Setting
this.gridColumn7,
this.gridColumn31,
this.gridColumn36,
+ this.gridColumnHideInGuide,
this.gridColumn40,
this.gridColumn24});
this.DgvFeeItem.FixedLineWidth = 1;
@@ -705,17 +707,28 @@ namespace PEIS.View.Setting
// repositoryItemMemoEdit1
//
this.repositoryItemMemoEdit1.Name = "repositoryItemMemoEdit1";
- //
+ //
+ // gridColumnHideInGuide
+ //
+ this.gridColumnHideInGuide.Caption = "指引单隐藏";
+ this.gridColumnHideInGuide.FieldName = "IsHideInGuide";
+ this.gridColumnHideInGuide.Name = "gridColumnHideInGuide";
+ this.gridColumnHideInGuide.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumnHideInGuide.OptionsFilter.AllowFilter = false;
+ this.gridColumnHideInGuide.ToolTip = "勾选后该项目不出现在指引单";
+ this.gridColumnHideInGuide.Visible = true;
+ this.gridColumnHideInGuide.VisibleIndex = 10;
+ //
// gridColumn40
- //
- this.gridColumn40.Caption = "治疗费";
+ //
+ this.gridColumn40.Caption = "分总检隐藏";
this.gridColumn40.FieldName = "IsHide";
this.gridColumn40.Name = "gridColumn40";
this.gridColumn40.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn40.OptionsFilter.AllowFilter = false;
- this.gridColumn40.ToolTip = "勾选后该项目不进行科室分检";
+ this.gridColumn40.ToolTip = "勾选后该项目不进行科室分检和总检";
this.gridColumn40.Visible = true;
- this.gridColumn40.VisibleIndex = 10;
+ this.gridColumn40.VisibleIndex = 11;
//
// gridColumn24
//
@@ -727,7 +740,7 @@ namespace PEIS.View.Setting
this.gridColumn24.OptionsColumn.ReadOnly = true;
this.gridColumn24.OptionsFilter.AllowFilter = false;
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 11;
+ this.gridColumn24.VisibleIndex = 12;
this.gridColumn24.Width = 40;
//
// repositoryItemCheckEdit1
@@ -1478,6 +1491,7 @@ namespace PEIS.View.Setting
private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumnHideInGuide;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn41;