增加数量修改功能和一些其他BUG修复

1.个人登记和团体登记增加项目数量修改功能
2.德宏中医院的分检界面的检验科显示数据逻辑BUG修复
3.职业报告增加显示其他报告
dhzzyy
LiJiaWen 3 weeks ago
parent 0ae6913f3c
commit 9e192567f2
  1. 4
      PEIS/Model/Enrollment/EnrollmentCheckCostModel.cs
  2. 6
      PEIS/Model/EnrollmentFeeItemModel.cs
  3. 1
      PEIS/Model/Exam/PartModel.cs
  4. 5
      PEIS/Utils/ReportHelper.cs
  5. 19
      PEIS/View/Enrollment/CheckCostForm.Designer.cs
  6. 61
      PEIS/View/Enrollment/CheckCostForm.resx
  7. 84
      PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
  8. 44
      PEIS/View/Enrollment/EnrollmentOrgForm.cs
  9. 23
      PEIS/View/Enrollment/EnrollmentOrgForm.resx
  10. 13
      PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs
  11. 23
      PEIS/View/Enrollment/EnrollmentPersonForm.cs
  12. 6
      PEIS/View/Exam/PartForm.resx

@ -63,13 +63,13 @@ namespace PEIS.Model.Enrollment
}
else
{
DAOHelp.ExecuteSql($"INSERT INTO dbo.Enrollment_CheckCost(EID, OEID, Sum, Discount, Fee, CreateTime, CreatorCode, Creator, OrderNo) SELECT EID,OEID,SUM(Price), {discount}, Round(SUM(Price)*{discount / 10},2), GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}', '{orderNo}' FROM dbo.Enrollment_FeeItem WHERE OEID = {oeID} AND OrderNo IS NULL GROUP BY OEID, EID", false);
DAOHelp.ExecuteSql($"INSERT INTO dbo.Enrollment_CheckCost(EID, OEID, Sum, Discount, Fee, CreateTime, CreatorCode, Creator, OrderNo) SELECT EID,OEID,SUM(Price*Quantity), {discount}, Round(SUM(Price*Quantity)*{discount / 10},2), GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}', '{orderNo}' FROM dbo.Enrollment_FeeItem WHERE OEID = {oeID} AND OrderNo IS NULL GROUP BY OEID, EID", false);
DAOHelp.ExecuteSql($"UPDATE a SET a.OrderNo = b.ID From dbo.Enrollment_FeeItem a LEFT JOIN dbo.Enrollment_CheckCost b ON a.EID = b.EID AND a.OEID = b.OEID Where a.OEID = {oeID} AND a.OrderNo IS NULL AND b.DeleteTime IS NULL AND b.CancelTime IS NULL", false);
}
}
else
{
DAOHelp.ExecuteSql($"INSERT INTO dbo.Enrollment_CheckCost(EID, OEID, Sum, Discount, Fee, CreateTime, CreatorCode, Creator, OrderNo) SELECT EID,OEID,SUM(Price), {discount}, {fee}, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}', '{orderNo}' FROM dbo.Enrollment_FeeItem WHERE EID = {enrollmentID} AND OrderNo is null AND OEID is null GROUP BY OEID, EID", false);
DAOHelp.ExecuteSql($"INSERT INTO dbo.Enrollment_CheckCost(EID, OEID, Sum, Discount, Fee, CreateTime, CreatorCode, Creator, OrderNo) SELECT EID,OEID,SUM(Price*Quantity), {discount}, {fee}, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}', '{orderNo}' FROM dbo.Enrollment_FeeItem WHERE EID = {enrollmentID} AND OrderNo is null AND OEID is null GROUP BY OEID, EID", false);
DAOHelp.ExecuteSql($"UPDATE a SET a.OrderNo = b.ID FROM Enrollment_FeeItem a LEFT JOIN Enrollment_CheckCost b ON b.EID = a.EID WHERE a.OEID IS NULL AND b.EID = {enrollmentID} AND a.OrderNo IS NULL AND b.OEID IS NULL AND b.DeleteTime IS NULL AND b.CancelTime IS NULL AND b.ID NOT IN (SELECT OrderNo FROM Enrollment_FeeItem WHERE EID = {enrollmentID} AND OrderNo IS NOT NULL GROUP BY OrderNo )", false);
//DAOHelp.ExecuteSql($"UPDATE a SET a.OrderNo = b.ID From dbo.Enrollment_FeeItem a LEFT JOIN dbo.Enrollment_CheckCost b ON a.EID = b.EID Where a.EID = {enrollmentID} AND a.OEID IS NULL AND a.OrderNo is null AND b.DeleteTime is NULL AND b.ID NOT IN ( SELECT OrderNo FROM Enrollment_FeeItem WHERE EID = 10072 AND OrderNo is not NULL) ", false);
}

@ -43,16 +43,16 @@ namespace PEIS.Model
var item = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($"SELECT * FROM Enrollment_FeeItem WHERE OEID = {oeID} AND OrderNo IS NULL AND EID != -1");
if (item.Count == 0)
{
return DAOHelp.GetDataBySQL<EnrollmentFeeItem>($"SELECT Seq, PackID, PackName,ItemClass,DeptName, FeeItemCode, FeeItemName, Price, SettlePrice,Unit, COUNT(*) AS Quantity, SUM(Price) AS Fee, SUM(SettlePrice) AS SettleFee FROM dbo.Enrollment_FeeItem WHERE OEID = {oeID} AND EID != -1 GROUP BY FeeItemCode, FeeItemName, PackID, PackName, Unit, Price, SettlePrice, Seq, ItemClass, DeptName ORDER BY PackID, FeeItemCode");
return DAOHelp.GetDataBySQL<EnrollmentFeeItem>($"SELECT Seq, PackID, PackName,ItemClass,DeptName, FeeItemCode, FeeItemName, Price, SettlePrice,Unit, SUM(Quantity) AS Quantity, SUM(Price*Quantity) AS Fee, SUM(SettlePrice) AS SettleFee FROM dbo.Enrollment_FeeItem WHERE OEID = {oeID} AND EID != -1 GROUP BY FeeItemCode, FeeItemName, PackID, PackName, Unit, Price, SettlePrice, Seq, ItemClass, DeptName ORDER BY PackID, FeeItemCode");
}
else
{
return DAOHelp.GetDataBySQL<EnrollmentFeeItem>($"SELECT Seq, PackID, PackName,ItemClass,DeptName, FeeItemCode, FeeItemName, Price, SettlePrice,Unit, COUNT(*) AS Quantity, SUM(Price) AS Fee, SUM(SettlePrice) AS SettleFee FROM dbo.Enrollment_FeeItem WHERE OEID = {oeID} AND OrderNo IS NULL AND EID != -1 GROUP BY FeeItemCode, FeeItemName, PackID, PackName, Unit, Price, SettlePrice, Seq, ItemClass, DeptName ORDER BY PackID, FeeItemCode");
return DAOHelp.GetDataBySQL<EnrollmentFeeItem>($"SELECT Seq, PackID, PackName,ItemClass,DeptName, FeeItemCode, FeeItemName, Price, SettlePrice,Unit, SUM(Quantity) AS Quantity, SUM(Price*Quantity) AS Fee, SUM(SettlePrice) AS SettleFee FROM dbo.Enrollment_FeeItem WHERE OEID = {oeID} AND OrderNo IS NULL AND EID != -1 GROUP BY FeeItemCode, FeeItemName, PackID, PackName, Unit, Price, SettlePrice, Seq, ItemClass, DeptName ORDER BY PackID, FeeItemCode");
}
}
else
{
return DAOHelp.GetDataBySQL<EnrollmentFeeItem>($"SELECT Seq, PackID, PackName,ItemClass,DeptName, FeeItemCode, FeeItemName, Price, SettlePrice,Unit, COUNT(*) AS Quantity, SUM(Price) AS Fee, SUM(SettlePrice) AS SettleFee FROM dbo.Enrollment_FeeItem WHERE EID = {enrollmentID} AND OEID IS NULL AND OrderNo IS NULL GROUP BY FeeItemCode, FeeItemName, PackID, PackName, Unit, Price, SettlePrice, Seq, ItemClass, DeptName ORDER BY PackID, FeeItemCode");
return DAOHelp.GetDataBySQL<EnrollmentFeeItem>($"SELECT Seq, PackID, PackName,ItemClass,DeptName, FeeItemCode, FeeItemName, Price, SettlePrice,Unit, SUM(Quantity) AS Quantity, SUM(Price*Quantity) AS Fee, SUM(SettlePrice) AS SettleFee FROM dbo.Enrollment_FeeItem WHERE EID = {enrollmentID} AND OEID IS NULL AND OrderNo IS NULL GROUP BY FeeItemCode, FeeItemName, PackID, PackName, Unit, Price, SettlePrice, Seq, ItemClass, DeptName ORDER BY PackID, FeeItemCode");
}
}

@ -244,6 +244,7 @@ FROM StatusData;";
OR ( A.result_ref LIKE '%%' AND A.result_str LIKE '%+%' )
OR ( A.result_str LIKE '%%' ) )
AND C.FID IS NOT NULL
AND C.DeptCode='3001'
ORDER BY reportid";
}
else

@ -261,6 +261,9 @@ namespace PEIS.Utils
var examCareerConclusions = new TotalModel().GetExamCareerConclusion(eid);
// 第三方报告
var lstExts = new ReportModel().GetReportExt(eid);
if (!lstSymptom.Any() || examCareerHisInq == null)
{
throw new Exception("未查询到该人员问诊数据!");
@ -481,7 +484,7 @@ namespace PEIS.Utils
//LIS
SetDataSource(ref rpt, lstLis, "L", "LIS");
// PacsImage
SetDataSource(ref rpt, lstPacsPhotos, "I", "PACSImage");
SetDataSource(ref rpt, lstPacsPhotos.Concat(lstExts.Where(w => w.ReportImg != null).Select(s => new Entity.Report { ReportImage = s.ReportImg })), "I", "PACSImage");
// 职业史
SetDataSource(ref rpt, examEmployments, "CAH", "CAItems");
//问诊

@ -89,7 +89,7 @@
this.label5.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(332, 135);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(47, 39);
this.label5.Size = new System.Drawing.Size(38, 31);
this.label5.TabIndex = 38;
this.label5.Text = "折";
//
@ -101,7 +101,7 @@
this.LblFeeCn.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(117)))), ((int)(((byte)(230)))));
this.LblFeeCn.Location = new System.Drawing.Point(30, 312);
this.LblFeeCn.Name = "LblFeeCn";
this.LblFeeCn.Size = new System.Drawing.Size(79, 41);
this.LblFeeCn.Size = new System.Drawing.Size(64, 33);
this.LblFeeCn.TabIndex = 37;
this.LblFeeCn.Text = "中文";
//
@ -145,7 +145,7 @@
this.label4.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(332, 231);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(47, 39);
this.label4.Size = new System.Drawing.Size(38, 31);
this.label4.TabIndex = 6;
this.label4.Text = "元";
//
@ -166,7 +166,7 @@
0,
0});
this.NudDiscount.Name = "NudDiscount";
this.NudDiscount.Size = new System.Drawing.Size(197, 47);
this.NudDiscount.Size = new System.Drawing.Size(197, 39);
this.NudDiscount.TabIndex = 5;
this.NudDiscount.Value = new decimal(new int[] {
1,
@ -179,7 +179,7 @@
this.TxtFee.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.TxtFee.Location = new System.Drawing.Point(117, 228);
this.TxtFee.Name = "TxtFee";
this.TxtFee.Size = new System.Drawing.Size(197, 47);
this.TxtFee.Size = new System.Drawing.Size(197, 39);
this.TxtFee.TabIndex = 4;
//
// LblFee
@ -188,7 +188,7 @@
this.LblFee.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LblFee.Location = new System.Drawing.Point(113, 45);
this.LblFee.Name = "LblFee";
this.LblFee.Size = new System.Drawing.Size(67, 39);
this.LblFee.Size = new System.Drawing.Size(55, 31);
this.LblFee.TabIndex = 3;
this.LblFee.Text = "Fee";
//
@ -198,7 +198,7 @@
this.label3.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Location = new System.Drawing.Point(23, 231);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(107, 39);
this.label3.Size = new System.Drawing.Size(86, 31);
this.label3.TabIndex = 2;
this.label3.Text = "实收:";
//
@ -208,7 +208,7 @@
this.label2.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(23, 133);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(107, 39);
this.label2.Size = new System.Drawing.Size(86, 31);
this.label2.TabIndex = 1;
this.label2.Text = "折扣:";
//
@ -218,7 +218,7 @@
this.label1.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(23, 45);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(107, 39);
this.label1.Size = new System.Drawing.Size(86, 31);
this.label1.TabIndex = 0;
this.label1.Text = "原价:";
//
@ -486,6 +486,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn4.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn4.OptionsColumn.AllowMove = false;
this.gridColumn4.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn4.OptionsColumn.ReadOnly = true;

@ -120,41 +120,40 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="BtnCancel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAAU9JREFUWEft
mDGOwjAQRX0wQklOQLXkHLSchCOQNlfyYglRbA3+MUZRGCHPjIW9ESM9pRjb82TFzTex1j92s965fdO5
vunOF8/tw/iZrocDXB5aoVbd75bYUBQ4jXJNZ1tqQR3Y1qx29kA3ywM3f4NuoJp14AYveL6+NqrhCkGq
UQ1fQS3LETye/m4ofKl+CpIzkgWnJZGMcrGoNRTsG4zFkdTsZf2DkkEaOcB+JJyBWjnAFgQpg3PIAZEg
eCeQSw6IBQElklMOqATBXGhaWjmgFgSUZA45sHxBSi5WDsnlPpJ3IjklRYIpArkk2YKcwTkkWYKSgVrJ
ZEHNIM3eZMFpcW8BzCWpNRTsG5TIRSRnsB/Jp/kKavkXgiXS1FQuXnCMfKlmBbjehFyaapYHbmN4TjVr
4BmmVx2ix0JgHfLqMRIukbr6mW4IDrYNVsbcAcPzXNWujnzjAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAAVdJREFUWEft
mE1ugzAQhX2wOMtygq4an6PbnqRHaLa5kgsSYtF1qgd1hSYGzU8UJlFG+oTEs3nfhs2E8Df7t/yyP3Tv
MXXHmNo+pvZ8Y3p0wwEuxWucXfp+rVzYFDiNcjHlhoZ+yE3YHfLHZeADuIWYuhMN/NCdQkztcBm4YYAg
femKp6CVxxH8/Po5Y/CkGRfNN9iC85EUFIpcGZovwRakBRJJy122INAUae7MEQkCSaHk7BJiQcAp5pzh
oBIEawJrmRS1IKiJ1N7RexJMgoAKzccqB8yCoCZ5DTnw+II1uTLXkDQJUjlXP8mayFomRSXIEeCc4SAW
lBRLzi4hEtQUau7MYQtaiix32YLaggKVpPkSbMFSoJGzfIMtuBVPQSt3IbjFNpVLj/UbVr40cEJ3DNNe
mgY+gNu4PKeBF/6X6a6X6GWwsJ721eNKeIut64DuySE3xesXw/Nc1Xvf9y4AAAAASUVORK5CYII=
</value>
</data>
<data name="BtnOK.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
</root>

@ -30,10 +30,10 @@
{
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.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemMemoEdit21 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
@ -325,11 +325,11 @@
this.gridColumn170 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn171 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panel14 = new System.Windows.Forms.Panel();
this.NameSearch2 = new System.Windows.Forms.TextBox();
this.DgcRegItem2 = new DevExpress.XtraGrid.GridControl();
this.DgvRegItem2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn172 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn173 = new DevExpress.XtraGrid.Columns.GridColumn();
this.NameSearch2 = new System.Windows.Forms.TextBox();
this.CopyMenu = new System.Windows.Forms.MenuStrip();
this.TsmiCopyFeeItem = new System.Windows.Forms.ToolStripMenuItem();
this.panel7 = new System.Windows.Forms.Panel();
@ -413,6 +413,7 @@
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.gridColumn174 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit();
@ -2055,6 +2056,7 @@
this.gridColumn77,
this.gridColumn106,
this.gridColumn79,
this.gridColumn174,
this.gridColumn78,
this.gridColumn80,
this.gridColumn81});
@ -3149,15 +3151,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 = 65;
@ -3595,15 +3597,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 = "";
@ -3982,7 +3984,6 @@
this.DgvEnrollmentFeeItem.GroupCount = 1;
this.DgvEnrollmentFeeItem.GroupFormat = "";
this.DgvEnrollmentFeeItem.Name = "DgvEnrollmentFeeItem";
this.DgvEnrollmentFeeItem.OptionsBehavior.Editable = false;
this.DgvEnrollmentFeeItem.OptionsMenu.EnableColumnMenu = false;
this.DgvEnrollmentFeeItem.OptionsView.AllowCellMerge = true;
this.DgvEnrollmentFeeItem.OptionsView.ColumnAutoWidth = false;
@ -4109,12 +4110,10 @@
this.gridColumn116.Caption = "数量";
this.gridColumn116.FieldName = "Quantity";
this.gridColumn116.Name = "gridColumn116";
this.gridColumn116.OptionsColumn.AllowEdit = false;
this.gridColumn116.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn116.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn116.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn116.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn116.OptionsColumn.ReadOnly = true;
this.gridColumn116.OptionsFilter.AllowFilter = false;
this.gridColumn116.Visible = true;
this.gridColumn116.VisibleIndex = 6;
@ -4803,17 +4802,6 @@
this.panel14.Size = new System.Drawing.Size(140, 328);
this.panel14.TabIndex = 32;
//
// NameSearch2
//
this.NameSearch2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.NameSearch2.Dock = System.Windows.Forms.DockStyle.Top;
this.NameSearch2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.NameSearch2.Location = new System.Drawing.Point(0, 0);
this.NameSearch2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.NameSearch2.Name = "NameSearch2";
this.NameSearch2.Size = new System.Drawing.Size(140, 23);
this.NameSearch2.TabIndex = 32;
//
// DgcRegItem2
//
this.DgcRegItem2.Dock = System.Windows.Forms.DockStyle.Fill;
@ -4875,6 +4863,17 @@
this.gridColumn173.VisibleIndex = 1;
this.gridColumn173.Width = 52;
//
// NameSearch2
//
this.NameSearch2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.NameSearch2.Dock = System.Windows.Forms.DockStyle.Top;
this.NameSearch2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.NameSearch2.Location = new System.Drawing.Point(0, 0);
this.NameSearch2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.NameSearch2.Name = "NameSearch2";
this.NameSearch2.Size = new System.Drawing.Size(140, 23);
this.NameSearch2.TabIndex = 32;
//
// CopyMenu
//
this.CopyMenu.BackColor = System.Drawing.Color.White;
@ -5729,6 +5728,20 @@
//
this.gridView8.Name = "gridView8";
//
// gridColumn174
//
this.gridColumn174.Caption = "数量";
this.gridColumn174.FieldName = "Quantity";
this.gridColumn174.Name = "gridColumn174";
this.gridColumn174.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn174.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn174.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn174.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn174.OptionsFilter.AllowFilter = false;
this.gridColumn174.Visible = true;
this.gridColumn174.VisibleIndex = 6;
this.gridColumn174.Width = 55;
//
// EnrollmentOrgForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@ -6244,5 +6257,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn173;
private System.Windows.Forms.MenuStrip CopyMenu;
private System.Windows.Forms.ToolStripMenuItem TsmiCopyFeeItem;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn174;
}
}

@ -110,6 +110,7 @@ namespace PEIS.View.Enrollment
DgvGroupFeeItem.MouseDown += DgvGroupFeeItem_MouseDown;
DgvGroupFeeItem.DoubleClick += DgvGroupFeeItem_DoubleClick;
DgvGroupFeeItem.CustomColumnDisplayText += DgvGroupFeeItem_CustomColumnDisplayText;
DgvGroupFeeItem.CellValueChanged += DgvGroupFeeItem_CellValueChanged;
DgvPack.MouseDown += DgvPack_MouseDown;
DgvPack.DoubleClick += DgvPack_DoubleClick;
@ -133,6 +134,7 @@ namespace PEIS.View.Enrollment
DgvEnrollmentFeeItem.DoubleClick += DgvEnrollmentFeeItem_DoubleClick;
DgvEnrollmentFeeItem.CustomDrawRowIndicator += DgvOrg_CustomDrawRowIndicator;
DgvEnrollmentFeeItem.CustomDrawGroupRow += DgvEnrollmentFeeItem_CustomDrawGroupRow;
DgvEnrollmentFeeItem.CellValueChanged += DgvEnrollmentFeeItem_CellValueChanged;
DgvPack2.MouseDown += DgvPack2_MouseDown;
DgvPack2.DoubleClick += DgvPack2_DoubleClick;
@ -745,6 +747,28 @@ namespace PEIS.View.Enrollment
OnAddEnrollmentOrgFeeItem(Convert.ToInt64(DgvGroup2.GetRowCellValue(DgvGroup2.GetSelectedRows()[0], "ID").ToString()), Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()), Convert.ToInt64(DgvPack.GetRowCellValue(DgvPack.GetSelectedRows()[0], "ID").ToString()), Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "OID").ToString()), -1);
}
private void DgvGroupFeeItem_CellValueChanged(object sender, DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs e)
{
// 只处理"数量"列的修改
if (e.Column?.FieldName != "Quantity")
return;
EnrollmentOrgFeeItem item = DgvGroupFeeItem.GetRow(e.RowHandle) as EnrollmentOrgFeeItem;
if (item == null) return;
int? quantity = item.Quantity;
item.GetById();
if (DgvGroup2.GetRowCellValue(DgvGroup2.GetSelectedRows()[0], "CheckTime")?.ToString() != null)
{
Global.Msg("info", "该分组项目已经同步,不能修改,请刷新后重试!");
return;
}
item.Quantity = quantity;
item.Update();
MessageBox.Show("数量已更新!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private void DgvGroupFeeItem_DoubleClick(object sender, EventArgs e) // 双击删除分组项目
{
if (DgvGroupFeeItem.FocusedRowHandle < 0) return;
@ -1825,6 +1849,26 @@ namespace PEIS.View.Enrollment
grid.GroupText = Convert.ToBoolean(DgvCheckCost.GetRowCellValue(index, "GroupTag")) ? "分组缴费订单" : "未分组缴费订单";
}
private void DgvEnrollmentFeeItem_CellValueChanged(object sender, DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs e)
{
// 只处理"数量"列的修改
if (e.Column?.FieldName != "Quantity")
return;
EnrollmentFeeItem item = DgvEnrollmentFeeItem.GetRow(e.RowHandle) as EnrollmentFeeItem;
int? quantity = item.Quantity;
item.GetById();
if (item.OrderNo != null)
{
Global.Msg("info", "已生成订单不可修改!");
return;
}
item.Quantity = quantity;
item.Update();
MessageBox.Show("数量已更新!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private void DgvEnrollmentFeeItem_RowStyle(object sender, RowStyleEventArgs e)
{
if (DgvEnrollmentFeeItem.RowCount == 0) return;

@ -120,6 +120,9 @@
<metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>299, 17</value>
</metadata>
<metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>299, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="TsmiOrgUpdate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@ -131,6 +134,9 @@
r1DTM9FgcRKSF8VH1pkmGV/XE5H3rk2CugSYAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="GFeeItmeMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>897, 17</value>
</metadata>
@ -141,9 +147,6 @@
azgI0NwCEBi1hCQwDC2hRWEHAzQtrkcBzQAAtlLL7bkHJToAAAAASUVORK5CYII=
</value>
</data>
<metadata name="GFeeItmeMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="PersonCostFastMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>588, 17</value>
</metadata>
@ -288,6 +291,9 @@
<metadata name="CopyMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 55</value>
</metadata>
<metadata name="CopyMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 55</value>
</metadata>
<data name="TsmiCopyFeeItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAM9JREFUSEvt
@ -300,6 +306,9 @@
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1062, 17</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1062, 17</value>
</metadata>
<data name="TsmiCheckOrg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAT5JREFUSEvd
@ -329,7 +338,7 @@
KGtGXgAAAABJRU5ErkJggg==
</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/xhBQAAAXNJREFUWEft
VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2
@ -341,7 +350,7 @@
FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC
</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/xhBQAAAXNJREFUWEft
VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2
@ -353,7 +362,7 @@
FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC
</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/xhBQAAAXNJREFUWEft
VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2
@ -365,7 +374,7 @@
FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC
</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/xhBQAAAXNJREFUWEft
VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2

@ -1866,7 +1866,6 @@
this.gridColumn32});
this.DgvEFeeItem.GridControl = this.DgcEFeeItem;
this.DgvEFeeItem.Name = "DgvEFeeItem";
this.DgvEFeeItem.OptionsBehavior.Editable = false;
this.DgvEFeeItem.OptionsMenu.EnableColumnMenu = false;
this.DgvEFeeItem.OptionsView.AllowCellMerge = true;
this.DgvEFeeItem.OptionsView.ColumnAutoWidth = false;
@ -1991,12 +1990,10 @@
this.gridColumn30.Caption = "数量";
this.gridColumn30.FieldName = "Quantity";
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.OptionsColumn.AllowEdit = false;
this.gridColumn30.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn30.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn30.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn30.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn30.OptionsColumn.ReadOnly = true;
this.gridColumn30.OptionsFilter.AllowFilter = false;
this.gridColumn30.Visible = true;
this.gridColumn30.VisibleIndex = 6;
@ -2444,7 +2441,7 @@
this.CopyItemTab.Location = new System.Drawing.Point(4, 26);
this.CopyItemTab.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.CopyItemTab.Name = "CopyItemTab";
this.CopyItemTab.Size = new System.Drawing.Size(639, 246);
this.CopyItemTab.Size = new System.Drawing.Size(637, 242);
this.CopyItemTab.TabIndex = 2;
this.CopyItemTab.Text = "从体检者复制项目";
this.CopyItemTab.UseVisualStyleBackColor = true;
@ -2457,7 +2454,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(499, 218);
this.DgcCopyItem.Size = new System.Drawing.Size(497, 214);
this.DgcCopyItem.TabIndex = 32;
this.DgcCopyItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvCopyItem});
@ -2634,7 +2631,7 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Left;
this.panel2.Location = new System.Drawing.Point(0, 28);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(140, 218);
this.panel2.Size = new System.Drawing.Size(140, 214);
this.panel2.TabIndex = 31;
//
// DgcRegItem2
@ -2645,7 +2642,7 @@
this.DgcRegItem2.MainView = this.DgvRegItem2;
this.DgcRegItem2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.DgcRegItem2.Name = "DgcRegItem2";
this.DgcRegItem2.Size = new System.Drawing.Size(140, 195);
this.DgcRegItem2.Size = new System.Drawing.Size(140, 191);
this.DgcRegItem2.TabIndex = 29;
this.DgcRegItem2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvRegItem2});
@ -2720,7 +2717,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(639, 28);
this.CopyMenu.Size = new System.Drawing.Size(637, 28);
this.CopyMenu.TabIndex = 24;
this.CopyMenu.Text = "menuStrip1";
//

@ -119,6 +119,8 @@ namespace PEIS.View.Enrollment
DgvFeeItem.DoubleClick += DgvFeeItem_DoubleClick;
// 移除收费项目
DgvEFeeItem.DoubleClick += DgvEFeeItem_DoubleClick;
// 修改收费项目数量
DgvEFeeItem.CellValueChanged += DgvEFeeItem_CellValueChanged;
//选择部位
PartOption.Click += PartOption_Click;
@ -588,6 +590,27 @@ namespace PEIS.View.Enrollment
new Log($@"移除项目登记:体检号={item.EID},项目ID={item.FeeItemCode}, 项目名称={item.FeeItemName}", "3").Save();
}
private void DgvEFeeItem_CellValueChanged(object sender, DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs e)
{
// 只处理"数量"列的修改
if (e.Column?.FieldName != "Quantity")
return;
EnrollmentFeeItem item = DgvEFeeItem.GetRow(e.RowHandle) as EnrollmentFeeItem;
int? quantity = item.Quantity;
item.GetById();
if (item.OrderNo != null)
{
Global.Msg("info", "已生成订单不可修改!");
return;
}
item.Quantity = quantity;
item.Update();
MessageBox.Show("数量已更新!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private void TsmiProjectPrintGuide_Click(object sender, EventArgs e)
{
if (_lstCheckCost == null || _lstCheckCost.Count == 0)

@ -120,9 +120,6 @@
<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>
@ -135,9 +132,6 @@
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>340, 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>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="tsmiCancel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

Loading…
Cancel
Save