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

1、导检单模板修改，2、团体登记界面加载速度优化

Browse Source
mzzyy
lsm 8 months ago
parent 69e0c84288
commit 7a25d67cc2
7 changed files with 92 additions and 198 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. 4
      PEIS/Model/BaseOrgModel.cs
  2. 19
      PEIS/Model/Enrollment/EnrollmentPatientModel.cs
  3. 2
      PEIS/Presenter/EnrollmentOrgPresenter.cs
  4. 24
      PEIS/ReportFiles/Guide.frx
  5. 200
      PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
  6. 18
      PEIS/View/Enrollment/EnrollmentOrgForm.cs
  7. 23
      PEIS/View/Enrollment/EnrollmentOrgForm.resx

4
PEIS/Model/BaseOrgModel.cs
Unescape View File

@ -36,9 +36,9 @@ namespace PEIS.Model
return DAOHelp.GetDataBySQL<BaseOrgPatient>($"SELECT a.*, b.Name,b.Birthday,b.CardType, b.CardNo,b.Education, b.Marriage,b.Nation, b.Tel1,b.Address1, b.Tel2, CASE b.Sex WHEN 1 THEN '男' WHEN 2 THEN '女' ELSE '' END AS Sex FROM Base_OrgPatient a LEFT JOIN Base_Patient b ON a.PID = b.ID WHERE OID = {orgID} ORDER BY a.Seq");
}
public List<BaseOrgPatient> GetPatientByEnrollment(Int64 orgID, Int64 enrollmentID)
public List<BaseOrgPatient> GetPatientByEnrollment(Int64 orgID, Int64 enrollmentID, Int64 groupID)
{
return DAOHelp.GetDataBySQL<BaseOrgPatient>($"SELECT a.*, b.Name,b.Birthday,b.CardType, b.CardNo,b.Education, b.Marriage,b.Nation, b.Tel1,b.Address1, b.Tel2, CASE b.Sex WHEN 1 THEN '男' WHEN 2 THEN '女' ELSE '' END AS Sex FROM Base_OrgPatient a LEFT JOIN Base_Patient b ON a.PID = b.ID WHERE OID = {orgID} AND pid NOT IN (SELECT pid FROM dbo.Enrollment_OrgPatient WHERE OID = {enrollmentID}) ORDER BY a.Seq");
return DAOHelp.GetDataBySQL<BaseOrgPatient>($"SELECT a.*, b.Name,b.Birthday,b.CardType, b.CardNo,b.Education, b.Marriage,b.Nation, b.Tel1,b.Address1, b.Tel2, CASE b.Sex WHEN 1 THEN '男' WHEN 2 THEN '女' ELSE '' END AS Sex FROM Base_OrgPatient a LEFT JOIN Base_Patient b ON a.PID = b.ID WHERE OID = {orgID} AND pid NOT IN (SELECT pid FROM dbo.Enrollment_OrgPatient WHERE OID = {enrollmentID} and GroupID = {groupID} ) ORDER BY a.Seq");
}
public void AddBaseOrgPatient(Int64 oid, Int64 pid)

19
PEIS/Model/Enrollment/EnrollmentPatientModel.cs
Unescape View File

@ -71,24 +71,19 @@ namespace PEIS.Model.Enrollment
a.ID,
a.SEX,
CONVERT(VARCHAR,a.Age) + a.AgeClass AgeClass,
b.BirthDay,
a.CardNo,
a.CardType,
b.Marriage,
c.DeptName AS GroupName,
a.SignTime,
a.Tel1,
a.SpellCode,
CASE WHEN a.SignTime IS NULL
THEN NULL
ELSE '已发送'
END AS Signer
from Enrollment_Patient a LEFT JOIN Base_Patient b ON a.PID = b.ID LEFT JOIN Base_OrgPatient c ON c.OID = a.OID AND c.PID = b.ID Where a.OEID = {oeID} order by c.DeptName,a.SignTime");
from Enrollment_Patient a LEFT JOIN Base_OrgPatient c ON c.OID = a.OID AND c.PID = a.PID Where a.OEID = {oeID} order by c.DeptName,a.SignTime");
}
// 记 账
public bool ChargeOrder(Int64 Id, String isAlll)
@ -104,7 +99,7 @@ namespace PEIS.Model.Enrollment
{
return DAOHelp.ExecuteSql(single, false) > 0;
}
}
// 发送到科室
@ -124,7 +119,7 @@ namespace PEIS.Model.Enrollment
// 插入分检步骤
var part = $@"EXEC sp_SyncExamPart {EId}";
var cResult = DAOHelp.ExecuteSql(checkCost, false);
var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false);
var fResult = DAOHelp.ExecuteSql(enrollmentFeeItem, false);
@ -167,7 +162,7 @@ namespace PEIS.Model.Enrollment
return DAOHelp.ExecuteSql(sql, false) > 0;
}
public List<FeeItem> GetItemsByPack(Int64 id) // 从套餐获取收费项目
{

2
PEIS/Presenter/EnrollmentOrgPresenter.cs
Unescape View File

@ -42,7 +42,7 @@ namespace PEIS.Presenter
};
View.GetOrgPatient += (send, args) =>
{
View.ShowOrgPatient(new BaseOrgModel().GetPatientByEnrollment(args.BaseOID, args.EnrollmentOID));
View.ShowOrgPatient(new BaseOrgModel().GetPatientByEnrollment(args.BaseOID, args.EnrollmentOID, args.GroupID));
};
View.GetGroupPatient += (send, args) =>
{

24
PEIS/ReportFiles/Guide.frx
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="09/24/2024 09:24:43" ReportInfo.CreatorVersion="2022.1.0.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="09/25/2024 09:49:38" ReportInfo.CreatorVersion="2022.1.0.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -154,22 +154,22 @@ namespace FastReport
</TableObject>
<BarcodeObject Name="Barcode1" Left="9.45" Top="9.45" Width="143.75" Height="56.7" AutoSize="false" Expression="[ExamID]" Text="" Barcode="Code128" Barcode.AutoEncode="true"/>
</ReportTitleBand>
<DataBand Name="FeeItems" Top="438.88" Width="718.2" Height="81.27" CanGrow="true" CanShrink="true">
<TableObject Name="Table2" Width="718.2" Height="81.27">
<DataBand Name="FeeItems" Top="438.21" Width="718.2" Height="66.15" CanGrow="true" CanShrink="true">
<TableObject Name="Table2" Width="718.2" Height="66.15">
<TableColumn Name="Column11" Width="143.64"/>
<TableColumn Name="Column12" Width="143.64"/>
<TableColumn Name="Column13" Width="143.64"/>
<TableColumn Name="Column14" Width="143.64"/>
<TableColumn Name="Column15" Width="143.64"/>
<TableRow Name="Row4" Height="81.27" AutoSize="true">
<TableRow Name="Row4" Height="66.15" AutoSize="true">
<TableCell Name="Cell41" Border.Lines="All" Font="宋体, 9pt" ColSpan="5">
<TextObject Name="Text10" Top="18.9" Width="75.6" Height="18.9" CanBreak="false" Text="参检项目:" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TextObject Name="Text11" Left="378" Top="62.37" Width="85.05" Height="18.9" Text="医师签字：" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TextObject Name="Text12" Left="548.1" Top="62.37" Width="85.05" Height="18.9" Text="弃检签字：" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TextObject Name="Text13" Left="66.15" Top="18.9" Width="642.6" Height="18.9" CanGrow="true" CanShrink="true" CanBreak="false" Text="[F.FeeItemName]" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TextObject Name="Text9" Width="548.1" Height="18.9" CanGrow="true" CanBreak="false" Text="[F.DeptName]" AutoWidth="true" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
<TextObject Name="Text14" Top="37.8" Width="75.6" Height="18.9" CanBreak="false" Text="科室地址:" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TextObject Name="Text15" Left="66.15" Top="37.8" Width="642.6" Height="18.9" CanGrow="true" CanShrink="true" CanBreak="false" Text="[F.Address]" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TextObject Name="Text10" Top="15.12" Width="75.6" Height="18.9" CanBreak="false" Text="参检项目:" Font="微软雅黑, 9pt"/>
<TextObject Name="Text11" Left="378" Top="41.58" Width="85.05" Height="18.9" Text="医师签字：" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text12" Left="548.1" Top="41.58" Width="85.05" Height="18.9" Text="弃检签字：" VertAlign="Center" Font="微软雅黑, 9pt"/>
<TextObject Name="Text13" Left="66.15" Top="15.12" Width="642.6" Height="18.9" CanGrow="true" CanShrink="true" CanBreak="false" Text="[F.FeeItemName]" Font="微软雅黑, 9pt" LineHeight="20"/>
<TextObject Name="Text9" Width="406.35" Height="18.9" CanGrow="true" CanBreak="false" Text="【[F.DeptName]】" AutoWidth="true" Font="微软雅黑, 9pt, style=Bold"/>
<TextObject Name="Text14" Left="406.35" Top="1.89" Width="75.6" Height="18.9" CanBreak="false" Text="科室地址:" Font="微软雅黑, 9pt"/>
<TextObject Name="Text15" Left="472.5" Top="1.89" Width="245.7" Height="18.9" CanGrow="true" CanShrink="true" CanBreak="false" Text="[F.Address]" Font="微软雅黑, 9pt"/>
</TableCell>
<TableCell Name="Cell42" Border.Lines="All" Font="宋体, 9pt"/>
<TableCell Name="Cell43" Border.Lines="All" Font="宋体, 9pt"/>
@ -178,7 +178,7 @@ namespace FastReport
</TableRow>
</TableObject>
</DataBand>
<PageFooterBand Name="PageFooter1" Top="522.81" Width="718.2" Height="85.05">
<PageFooterBand Name="PageFooter1" Top="506.36" Width="718.2" Height="85.05">
<TextObject Name="Text7" Top="56.7" Width="160.65" Height="28.35" Text="第[Page#]页，共[TotalPages#]页" Font="微软雅黑, 10pt"/>
<TextObject Name="Text8" Left="500.85" Top="56.7" Width="217.35" Height="28.35" Text="打印时间：[Date]" Font="微软雅黑, 10pt"/>
<TextObject Name="Text16" Width="37.8" Height="18.9" CanBreak="false" Text="身高" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 9pt"/>

200
PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs generated
Unescape View File

@ -30,13 +30,13 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentOrgForm));
DevExpress.XtraGrid.GridFormatRule gridFormatRule3 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression3 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
DevExpress.XtraGrid.GridFormatRule gridFormatRule2 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression2 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
this.repositoryItemImageEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemImageEdit();
this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemImageEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemImageEdit();
this.repositoryItemMemoEdit21 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.panel1 = new System.Windows.Forms.Panel();
this.DgcOrg = new DevExpress.XtraGrid.GridControl();
@ -151,6 +151,7 @@
this.gridColumn78 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn80 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn81 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridView9 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.splitter4 = new System.Windows.Forms.Splitter();
this.panel9 = new System.Windows.Forms.Panel();
this.tabControl1 = new System.Windows.Forms.TabControl();
@ -360,11 +361,6 @@
this.gridColumn90 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn108 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn91 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn93 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn94 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn95 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn96 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn104 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn();
this.PatientSearch = new System.Windows.Forms.TextBox();
@ -398,7 +394,6 @@
this.gridView5 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView7 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView8 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView9 = new DevExpress.XtraGrid.Views.Grid.GridView();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemImageEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit();
this.panel1.SuspendLayout();
@ -434,6 +429,7 @@
((System.ComponentModel.ISupportInitialize)(this.DgcGroupFeeItem)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.DgvGroupFeeItem)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView9)).BeginInit();
this.panel9.SuspendLayout();
this.tabControl1.SuspendLayout();
this.TpPack.SuspendLayout();
@ -501,16 +497,8 @@
((System.ComponentModel.ISupportInitialize)(this.gridView5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView9)).BeginInit();
this.SuspendLayout();
//
// repositoryItemImageEdit2
//
this.repositoryItemImageEdit2.AutoHeight = false;
this.repositoryItemImageEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemImageEdit2.Name = "repositoryItemImageEdit2";
//
// gridColumn99
//
this.gridColumn99.Caption = "退费时间";
@ -547,6 +535,13 @@
this.gridColumn102.Visible = true;
this.gridColumn102.VisibleIndex = 15;
//
// repositoryItemImageEdit2
//
this.repositoryItemImageEdit2.AutoHeight = false;
this.repositoryItemImageEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemImageEdit2.Name = "repositoryItemImageEdit2";
//
// repositoryItemMemoEdit21
//
this.repositoryItemMemoEdit21.Appearance.Options.UseTextOptions = true;
@ -2164,6 +2159,11 @@
this.gridColumn81.VisibleIndex = 7;
this.gridColumn81.Width = 40;
//
// gridView9
//
this.gridView9.GridControl = this.DgcGroupFeeItem;
this.gridView9.Name = "gridView9";
//
// splitter4
//
this.splitter4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
@ -3003,15 +3003,15 @@
this.gridColumn100,
this.gridColumn99});
this.DgvCheckCost2.FixedLineWidth = 1;
gridFormatRule1.ApplyToRow = true;
gridFormatRule1.Column = this.gridColumn99;
gridFormatRule1.Name = "Format0";
formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Gray;
formatConditionRuleExpression1.Appearance.Options.UseForeColor = true;
formatConditionRuleExpression1.Expression = "[CancelTime] Is Not Null";
formatConditionRuleExpression1.PredefinedName = "Strikeout Text";
gridFormatRule1.Rule = formatConditionRuleExpression1;
this.DgvCheckCost2.FormatRules.Add(gridFormatRule1);
gridFormatRule3.ApplyToRow = true;
gridFormatRule3.Column = this.gridColumn99;
gridFormatRule3.Name = "Format0";
formatConditionRuleExpression3.Appearance.ForeColor = System.Drawing.Color.Gray;
formatConditionRuleExpression3.Appearance.Options.UseForeColor = true;
formatConditionRuleExpression3.Expression = "[CancelTime] Is Not Null";
formatConditionRuleExpression3.PredefinedName = "Strikeout Text";
gridFormatRule3.Rule = formatConditionRuleExpression3;
this.DgvCheckCost2.FormatRules.Add(gridFormatRule3);
this.DgvCheckCost2.GridControl = this.DgcCheckCost2;
this.DgvCheckCost2.GroupFormat = "{0}";
this.DgvCheckCost2.IndicatorWidth = 40;
@ -3449,15 +3449,15 @@
this.gridColumn101,
this.gridColumn102});
this.DgvCheckCost.FixedLineWidth = 1;
gridFormatRule2.ApplyToRow = true;
gridFormatRule2.Column = this.gridColumn102;
gridFormatRule2.Name = "Format0";
formatConditionRuleExpression2.Appearance.ForeColor = System.Drawing.Color.Gray;
formatConditionRuleExpression2.Appearance.Options.UseForeColor = true;
formatConditionRuleExpression2.Expression = "[CancelTime] Is Not Null";
formatConditionRuleExpression2.PredefinedName = "Strikeout Text";
gridFormatRule2.Rule = formatConditionRuleExpression2;
this.DgvCheckCost.FormatRules.Add(gridFormatRule2);
gridFormatRule1.ApplyToRow = true;
gridFormatRule1.Column = this.gridColumn102;
gridFormatRule1.Name = "Format0";
formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Gray;
formatConditionRuleExpression1.Appearance.Options.UseForeColor = true;
formatConditionRuleExpression1.Expression = "[CancelTime] Is Not Null";
formatConditionRuleExpression1.PredefinedName = "Strikeout Text";
gridFormatRule1.Rule = formatConditionRuleExpression1;
this.DgvCheckCost.FormatRules.Add(gridFormatRule1);
this.DgvCheckCost.GridControl = this.DgcCheckCost;
this.DgvCheckCost.GroupCount = 1;
this.DgvCheckCost.GroupFormat = "";
@ -4228,7 +4228,7 @@
this.tabPage2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.tabPage2.Size = new System.Drawing.Size(372, 362);
this.tabPage2.Size = new System.Drawing.Size(484, 362);
this.tabPage2.TabIndex = 0;
this.tabPage2.Text = "收费项目";
this.tabPage2.UseVisualStyleBackColor = true;
@ -4241,7 +4241,7 @@
this.DgcFeeItem2.Name = "DgcFeeItem2";
this.DgcFeeItem2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemCheckEdit2});
this.DgcFeeItem2.Size = new System.Drawing.Size(368, 334);
this.DgcFeeItem2.Size = new System.Drawing.Size(480, 334);
this.DgcFeeItem2.TabIndex = 138;
this.DgcFeeItem2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvFeeItem2,
@ -4422,7 +4422,7 @@
this.FeeItemSearch2.Location = new System.Drawing.Point(2, 3);
this.FeeItemSearch2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.FeeItemSearch2.Name = "FeeItemSearch2";
this.FeeItemSearch2.Size = new System.Drawing.Size(368, 22);
this.FeeItemSearch2.Size = new System.Drawing.Size(480, 22);
this.FeeItemSearch2.TabIndex = 137;
//
// CopyItemTab
@ -4433,7 +4433,7 @@
this.CopyItemTab.Location = new System.Drawing.Point(4, 23);
this.CopyItemTab.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.CopyItemTab.Name = "CopyItemTab";
this.CopyItemTab.Size = new System.Drawing.Size(372, 362);
this.CopyItemTab.Size = new System.Drawing.Size(484, 362);
this.CopyItemTab.TabIndex = 3;
this.CopyItemTab.Text = "从体检者复制项目";
this.CopyItemTab.UseVisualStyleBackColor = true;
@ -4446,7 +4446,7 @@
this.DgcCopyItem.MainView = this.DgvCopyItem;
this.DgcCopyItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.DgcCopyItem.Name = "DgcCopyItem";
this.DgcCopyItem.Size = new System.Drawing.Size(232, 334);
this.DgcCopyItem.Size = new System.Drawing.Size(344, 334);
this.DgcCopyItem.TabIndex = 32;
this.DgcCopyItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvCopyItem});
@ -4709,7 +4709,7 @@
this.CopyMenu.Location = new System.Drawing.Point(0, 0);
this.CopyMenu.Name = "CopyMenu";
this.CopyMenu.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2);
this.CopyMenu.Size = new System.Drawing.Size(372, 28);
this.CopyMenu.Size = new System.Drawing.Size(484, 28);
this.CopyMenu.TabIndex = 24;
this.CopyMenu.Text = "menuStrip1";
//
@ -5009,11 +5009,6 @@
this.gridColumn90,
this.gridColumn108,
this.gridColumn91,
this.gridColumn93,
this.gridColumn94,
this.gridColumn95,
this.gridColumn96,
this.gridColumn105,
this.gridColumn104,
this.gridColumn92});
this.DgvEnrollment.GridControl = this.DgcEnrollment;
@ -5166,107 +5161,6 @@
this.gridColumn91.Visible = true;
this.gridColumn91.VisibleIndex = 4;
//
// gridColumn93
//
this.gridColumn93.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn93.AppearanceCell.Options.UseFont = true;
this.gridColumn93.AppearanceHeader.Options.UseTextOptions = true;
this.gridColumn93.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.gridColumn93.Caption = "婚况";
this.gridColumn93.FieldName = "Marriage";
this.gridColumn93.Name = "gridColumn93";
this.gridColumn93.OptionsColumn.AllowEdit = false;
this.gridColumn93.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn93.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn93.OptionsColumn.AllowMove = false;
this.gridColumn93.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn93.OptionsColumn.ReadOnly = true;
this.gridColumn93.OptionsFilter.AllowFilter = false;
this.gridColumn93.Visible = true;
this.gridColumn93.VisibleIndex = 5;
this.gridColumn93.Width = 60;
//
// gridColumn94
//
this.gridColumn94.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn94.AppearanceCell.Options.UseFont = true;
this.gridColumn94.AppearanceHeader.Options.UseTextOptions = true;
this.gridColumn94.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.gridColumn94.Caption = "出生年月";
this.gridColumn94.FieldName = "Birthday";
this.gridColumn94.Name = "gridColumn94";
this.gridColumn94.OptionsColumn.AllowEdit = false;
this.gridColumn94.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn94.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn94.OptionsColumn.AllowMove = false;
this.gridColumn94.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn94.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn94.OptionsColumn.ReadOnly = true;
this.gridColumn94.OptionsFilter.AllowFilter = false;
this.gridColumn94.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Count, "BloodCode", "合计：{0} 个血袋")});
this.gridColumn94.Visible = true;
this.gridColumn94.VisibleIndex = 6;
this.gridColumn94.Width = 100;
//
// gridColumn95
//
this.gridColumn95.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn95.AppearanceCell.Options.UseFont = true;
this.gridColumn95.AppearanceHeader.Options.UseTextOptions = true;
this.gridColumn95.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.gridColumn95.Caption = "证件类型";
this.gridColumn95.FieldName = "CardType";
this.gridColumn95.Name = "gridColumn95";
this.gridColumn95.OptionsColumn.AllowEdit = false;
this.gridColumn95.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn95.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn95.OptionsColumn.AllowMove = false;
this.gridColumn95.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn95.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn95.OptionsColumn.ReadOnly = true;
this.gridColumn95.OptionsFilter.AllowFilter = false;
this.gridColumn95.Visible = true;
this.gridColumn95.VisibleIndex = 7;
this.gridColumn95.Width = 80;
//
// gridColumn96
//
this.gridColumn96.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn96.AppearanceCell.Options.UseFont = true;
this.gridColumn96.AppearanceHeader.Options.UseTextOptions = true;
this.gridColumn96.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.gridColumn96.Caption = "证件号码";
this.gridColumn96.FieldName = "CardNo";
this.gridColumn96.Name = "gridColumn96";
this.gridColumn96.OptionsColumn.AllowEdit = false;
this.gridColumn96.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn96.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn96.OptionsColumn.AllowMove = false;
this.gridColumn96.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn96.OptionsColumn.ReadOnly = true;
this.gridColumn96.OptionsFilter.AllowFilter = false;
this.gridColumn96.Visible = true;
this.gridColumn96.VisibleIndex = 8;
this.gridColumn96.Width = 160;
//
// gridColumn105
//
this.gridColumn105.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn105.AppearanceCell.Options.UseFont = true;
this.gridColumn105.Caption = "联系方式";
this.gridColumn105.FieldName = "Tel1";
this.gridColumn105.Name = "gridColumn105";
this.gridColumn105.OptionsColumn.AllowEdit = false;
this.gridColumn105.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn105.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn105.OptionsColumn.AllowMove = false;
this.gridColumn105.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn105.OptionsColumn.ReadOnly = true;
this.gridColumn105.OptionsFilter.AllowFilter = false;
this.gridColumn105.Visible = true;
this.gridColumn105.VisibleIndex = 10;
//
// gridColumn104
//
this.gridColumn104.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
@ -5523,11 +5417,6 @@
//
this.gridView8.Name = "gridView8";
//
// gridView9
//
this.gridView9.GridControl = this.DgcGroupFeeItem;
this.gridView9.Name = "gridView9";
//
// EnrollmentOrgForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@ -5578,6 +5467,7 @@
((System.ComponentModel.ISupportInitialize)(this.DgcGroupFeeItem)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.DgvGroupFeeItem)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView9)).EndInit();
this.panel9.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.TpPack.ResumeLayout(false);
@ -5653,7 +5543,6 @@
((System.ComponentModel.ISupportInitialize)(this.gridView5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView9)).EndInit();
this.ResumeLayout(false);
}
@ -5725,10 +5614,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView DgvEnrollment;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn89;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn90;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn93;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn94;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn95;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn96;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn103;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn108;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn109;
@ -5962,7 +5847,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn102;
private System.Windows.Forms.ToolStripMenuItem FastExportTime;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn104;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn105;
private System.Windows.Forms.Splitter splitter8;
private System.Windows.Forms.Panel panel5;
private DevExpress.XtraGrid.GridControl DgcGroupFeeItem;

18
PEIS/View/Enrollment/EnrollmentOrgForm.cs
Unescape View File

@ -239,7 +239,6 @@ namespace PEIS.View.Enrollment
EmptyDataSource();
return;
}
OnGetEnrollmentOrgGroup(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()));
}
private void TsmiOrgAdd_Click(object sender, EventArgs e) // 新增团体登记
@ -261,7 +260,12 @@ namespace PEIS.View.Enrollment
OnGetEnrollmentOrgGroup(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()));
OnGetOrgPatient();
OnGetEnrollmentPatient(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()));
// tab页选中成员收费时，再加载人员
if (TcOrg.SelectedTabPage.Text == "团体成员收费")
{
OnGetEnrollmentPatient(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()));
}
}
private void DgvGroup_SelectionChanged(object sender, DevExpress.Data.SelectionChangedEventArgs e) // 分组列表切换
@ -409,9 +413,6 @@ namespace PEIS.View.Enrollment
if (!DgvGroup2.GetSelectedRows().Any()) return;
// 获取分组收费项目
OnGetEnrollmentOrgFeeItem(Convert.ToInt64(DgvGroup2.GetRowCellValue(DgvGroup2.GetSelectedRows()[0], "ID").ToString()));
// 获取分组人员
OnGetGroupPatient(Convert.ToInt64(DgvGroup.GetRowCellValue(DgvGroup.GetSelectedRows()[0], "ID").ToString()), Convert.ToInt64(DgvGroup.GetRowCellValue(DgvGroup.GetSelectedRows()[0], "OID").ToString()));
DgcPack.DataSource = _lstPack.Where(w => w.Sex.Equals("所有") || w.Sex.Equals(DgvGroup2.GetRowCellValue(DgvGroup2.GetSelectedRows()[0], "Sex").ToString()));
}
@ -665,6 +666,7 @@ namespace PEIS.View.Enrollment
if (Global.Msg("warn", "确定要发送吗？") == DialogResult.No) return;
OnSendToDept(eid);
}
private void TsmiPrintGuide_Click(object sender, EventArgs e) // 打印导检单
@ -1773,7 +1775,11 @@ namespace PEIS.View.Enrollment
protected virtual void OnGetOrgPatient()
{
GetOrgPatient?.Invoke(this, new Args<BaseOrgPatient> { BaseOID = Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "OID").ToString()), EnrollmentOID = Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()) });
GetOrgPatient?.Invoke(this, new Args<BaseOrgPatient> {
BaseOID = Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "OID").ToString()),
EnrollmentOID = Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()),
GroupID = Convert.ToInt64(DgvGroup.GetRowCellValue(DgvGroup.GetSelectedRows()[0], "ID").ToString())
});
}
protected virtual void OnGetEnrollmentOrgGroup(Int64 orgID)

23
PEIS/View/Enrollment/EnrollmentOrgForm.resx
Unescape View File

@ -120,6 +120,15 @@
<metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>510, 16</value>
</metadata>
<metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>510, 16</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1914, 17</value>
</metadata>
<metadata name="InfoFastMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1358, 18</value>
</metadata>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1597, 17</value>
</metadata>
@ -276,6 +285,9 @@
<metadata name="CopyMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>2034, 17</value>
</metadata>
<metadata name="CopyMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>2034, 17</value>
</metadata>
<data name="TsmiCopyFeeItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAOBJREFUSEvt
@ -317,7 +329,7 @@
frF0DeOou0VjfCumLZLL/QM6DnLkln25BAAAAABJRU5ErkJggg==
</value>
</data>
<data name="TsmiPrintPerson.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="TsmiPrintCost.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft
VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G
@ -329,7 +341,7 @@
E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg==
</value>
</data>
<data name="TsmiPrintTeam.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="TsmiPrintPerson.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft
VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G
@ -341,7 +353,7 @@
E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg==
</value>
</data>
<data name="TsmiPrintGroup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="TsmiPrintTeam.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft
VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G
@ -353,7 +365,7 @@
E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg==
</value>
</data>
<data name="TsmiPrintCost.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="TsmiPrintGroup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft
VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G
@ -438,9 +450,6 @@
mAjBS46PQpxtC8HWE5/4muCP01lHCF/A7hOfW+9fQwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="InfoFastMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1358, 18</value>
</metadata>
<data name="FastCamera.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAARhJREFUSEvt

Write Preview
Loading…
Cancel
Save