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

1、空项目允许应用成员

Browse Source
mzzyy
lsm 8 months ago
parent 0c41202783
commit f5da844624
5 changed files with 45 additions and 32 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. 6
      PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs
  2. 49
      PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
  3. 2
      PEIS/View/Enrollment/EnrollmentOrgForm.cs
  4. 14
      PEIS/View/Enrollment/EnrollmentOrgForm.resx
  5. 2
      PEIS/View/UControl/StepViewer.cs

6
PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs
Unescape View File

@ -58,8 +58,14 @@ namespace PEIS.Model.Enrollment
$"LEFT JOIN dbo.Enrollment_OrgGroup d ON b.GroupID = d.ID " +
$"WHERE c.ID = {oeID} AND d.ID = {groupID}" +
$"AND a.ID NOT IN (SELECT PID FROM Enrollment_Patient WHERE OEID = {oeID})");
var groupFeeItem = DAOHelp.GetDataBySQL<EnrollmentOrgFeeItem>($@"SELECT * FROM Enrollment_OrgFeeItem WHERE GroupID = {groupID}");
if(groupFeeItem.Count != 0)
{
// 个人收费项目信息
DAOHelp.ExecuteSql($"INSERT INTO Enrollment_FeeItem(OEID, GroupID, EID, PackID, PackName, FID, FeeItemCode, FeeItemName, Quantity, Unit, Price, SettlePrice, ItemClass, CreateTime, CreatorCode, Creator, DeptCode, DeptName, Seq, KeyNo) SELECT a.OEID, a.GroupID, a.ID, b.PackID, b.PackName, b.FID, b.FeeItemCode, b.FeeItemName, b.Quantity, b.Unit, b.Price, b.SettlePrice, b.ItemClass, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}', b.DeptCode, b.DeptName, b.Seq, b.KeyNo FROM Enrollment_patient a LEFT JOIN dbo.Enrollment_OrgFeeItem b ON a.GroupID = b.GroupID WHERE a.GroupID = { groupID} AND a.OEID = {oeID} AND a.ID NOT IN ( SELECT EID FROM Enrollment_FeeItem )");
}
// 更新应用时间
DAOHelp.ExecuteSql($"UPDATE dbo.Enrollment_OrgGroup SET Checker = '{Global.currentUser.Name}', CheckerCode = '{Global.currentUser.Code}', CheckTime = GETDATE() WHERE OID = {oeID} AND ID = {groupID}");
}

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

@ -28,11 +28,12 @@
/// </summary>
private void InitializeComponent()
{
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();
@ -67,7 +68,7 @@
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.DgcGroupPatient = new DevExpress.XtraGrid.GridControl();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.FastGroupMove = new System.Windows.Forms.ToolStripMenuItem();
this.DgvGroupPatient = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
@ -201,7 +202,7 @@
this.xtraTabControl4 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
this.DgcCheckCost2 = new DevExpress.XtraGrid.GridControl();
this.PersonCostFastMenu = new System.Windows.Forms.ContextMenuStrip();
this.PersonCostFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.PFastCharge = new System.Windows.Forms.ToolStripMenuItem();
this.PFastAllCharge = new System.Windows.Forms.ToolStripMenuItem();
this.PFastDeleteCost = new System.Windows.Forms.ToolStripMenuItem();
@ -232,7 +233,7 @@
this.xtraTabControl3 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.DgcCheckCost = new DevExpress.XtraGrid.GridControl();
this.TeamCostFastMenu = new System.Windows.Forms.ContextMenuStrip();
this.TeamCostFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.TFastCharge = new System.Windows.Forms.ToolStripMenuItem();
this.TFastAllCharge = new System.Windows.Forms.ToolStripMenuItem();
this.TFastDeleteCost = new System.Windows.Forms.ToolStripMenuItem();
@ -323,7 +324,7 @@
this.splitterControl1 = new DevExpress.XtraEditors.SplitterControl();
this.panel11 = new System.Windows.Forms.Panel();
this.DgcEnrollment = new DevExpress.XtraGrid.GridControl();
this.InfoFastMenu = new System.Windows.Forms.ContextMenuStrip();
this.InfoFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.FastCamera = new System.Windows.Forms.ToolStripMenuItem();
this.FastDelete = new System.Windows.Forms.ToolStripMenuItem();
this.FastExport = new System.Windows.Forms.ToolStripMenuItem();
@ -2975,15 +2976,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;
@ -3421,15 +3422,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 = "";

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

@ -413,7 +413,7 @@ namespace PEIS.View.Enrollment
{
if (!DgvGroup2.GetSelectedRows().Any()) return;
if (!DgvGroupFeeItem.GetSelectedRows().Any()) return;
//if (!DgvGroupFeeItem.GetSelectedRows().Any()) return;
if (!DgvGroupPatient.GetSelectedRows().Any())
{

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

@ -120,6 +120,9 @@
<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="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1597, 17</value>
</metadata>
@ -276,6 +279,9 @@
<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="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1914, 17</value>
</metadata>
<data name="TsmiCheckOrg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAATVJREFUSEvd
@ -305,7 +311,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
@ -317,7 +323,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
@ -329,7 +335,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
@ -341,7 +347,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

2
PEIS/View/UControl/StepViewer.cs
Unescape View File

@ -193,7 +193,7 @@ namespace PEIS.View.UControl
SELECT DISTINCT A.ID AS EID,A.Name as PatientName,A.SignTime ,A.FinishTime ,a.PrintTime
FROM Enrollment_Patient A
WHERE A.ID={eid}").FirstOrDefault();
if (data.SignTime == null)
if (data?.SignTime == null)
{
list.Add(new StepModel("签到", $"进行中", $"体检者：{eid}，{data.PatientName}", true));
list.Add(new StepModel("科室分检"));

Write Preview
Loading…
Cancel
Save