diff --git a/PEIS/Model/Enrollment/EnrollmentCheckCostModel.cs b/PEIS/Model/Enrollment/EnrollmentCheckCostModel.cs index 6a3d712..8eceef7 100644 --- a/PEIS/Model/Enrollment/EnrollmentCheckCostModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentCheckCostModel.cs @@ -34,8 +34,8 @@ namespace PEIS.Model.Enrollment public List GetCheckCost(Int64 oeID, Int64 enrollmentID) { - var team = DAOHelp.GetDataBySQL($"Select a.*,b.Name from Enrollment_CheckCost a LEFT JOIN dbo.Enrollment_Patient b ON a.EID = b.ID Where a.OEID = {oeID} AND DeleteTime is null"); - var person = DAOHelp.GetDataBySQL($"Select a.*,b.Name from Enrollment_CheckCost a LEFT JOIN dbo.Enrollment_Patient b ON a.EID = b.ID Where EID = {enrollmentID} AND DeleteTime is null"); + var team = DAOHelp.GetDataBySQL($"Select a.*,b.Name from Enrollment_CheckCost a LEFT JOIN dbo.Enrollment_Patient b ON a.EID = b.ID Where a.OEID = {oeID} AND DeleteTime is null ORDER BY a.EID"); + var person = DAOHelp.GetDataBySQL($"Select a.*,b.Name from Enrollment_CheckCost a LEFT JOIN dbo.Enrollment_Patient b ON a.EID = b.ID Where EID = {enrollmentID} AND DeleteTime is null ORDER BY a.EID"); return team.Concat(person).GroupBy(g => g.ID).Select(s => s.First()).ToList(); } diff --git a/PEIS/ReportFiles/PReport.frx b/PEIS/ReportFiles/PReport.frx index 9e6bbaa..391a18f 100644 --- a/PEIS/ReportFiles/PReport.frx +++ b/PEIS/ReportFiles/PReport.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -164,18 +164,18 @@ namespace FastReport - - - - - - - - - - - - + + + + + + + + + + + + @@ -312,7 +312,7 @@ namespace FastReport - + @@ -526,7 +526,7 @@ namespace FastReport - + @@ -565,7 +565,7 @@ namespace FastReport - + diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index c5dd48c..244d334 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -1484,17 +1484,17 @@ namespace PEIS.View.Enrollment if (!DgvEnrollmentFeeItem.GetSelectedRows().Any()) return; if (DgvEnrollment.GetRowCellValue(DgvEnrollment.GetSelectedRows()[0], "ID") == null && _chooseRegItem == null) return; - //if (_lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count() == 0) - //{ - // Global.Msg("info", "没有要处理的收费项目！"); - // return; - //} + if (_lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count() == 0) + { + Global.Msg("info", "没有要处理的收费项目！"); + return; + } - //if (_lstEnrollmentFeeItem.Where(w => w.OEID == null && w.OrderNo == null).Count() == _lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count()) - //{ - // Global.Msg("info", "未处理体检项目无团体项目，请选择个人收费！"); - // return; - //} + if (_lstEnrollmentFeeItem.Where(w => w.OEID == null && w.OrderNo == null).Count() == _lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count()) + { + Global.Msg("info", "未处理体检项目无团体项目，请选择个人收费！"); + return; + } if (Global.Msg("warn", "确定生成缴费订单吗？") == System.Windows.Forms.DialogResult.No) return; CheckCostForm checkCostForm = new CheckCostForm(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()), 0); @@ -1929,12 +1929,12 @@ namespace PEIS.View.Enrollment DgcEnrollment.DataSource = _lstEnrollmentPatient; PatientSearch_TextChanged(new object(), new EventArgs()); DgvEnrollment.ExpandAllGroups(); - if (topRowIndex != -1) - { - int rowHandle = DgvEnrollment.LocateByValue("ID", topRowIndex); - DgvEnrollment.FocusedRowHandle = rowHandle; - DgvEnrollment.SelectRow(rowHandle); - } + //if (topRowIndex != -1) + //{ + // int rowHandle = DgvEnrollment.LocateByValue("ID", topRowIndex); + // DgvEnrollment.FocusedRowHandle = rowHandle; + // DgvEnrollment.SelectRow(rowHandle); + //} })); DgvEnrollment.BestFitColumns(); } diff --git a/PEIS/View/UControl/StepViewer.cs b/PEIS/View/UControl/StepViewer.cs index 71f8b82..26dd999 100644 --- a/PEIS/View/UControl/StepViewer.cs +++ b/PEIS/View/UControl/StepViewer.cs @@ -199,6 +199,7 @@ namespace PEIS.View.UControl list.Add(new StepModel("科室分检")); list.Add(new StepModel("总检")); list.Add(new StepModel("打印")); + list.Add(new StepModel("当前操作人员", Global.currentUser.Name)); return list; } list.Add(new StepModel("签到", $"{data.SignTime:yyyy-MM-dd HH:mm}", $"体检者：{eid}，{data.PatientName}")); @@ -208,6 +209,7 @@ namespace PEIS.View.UControl list.Add(new StepModel("科室分检", $"{examTime:yyyy-MM-dd HH:mm}", $"已完成")); list.Add(new StepModel("总检", $"{data.FinishTime:yyyy-MM-dd HH:mm}", $"已完成")); list.Add(new StepModel("打印", $"{data.PrintTime:yyyy-MM-dd HH:mm}", "已打印", true)); + list.Add(new StepModel("当前操作人员", Global.currentUser.Name)); return list; } if (data.FinishTime != null) @@ -216,6 +218,7 @@ namespace PEIS.View.UControl list.Add(new StepModel("科室分检", $"{examTime:yyyy-MM-dd HH:mm}", $"已完成")); list.Add(new StepModel("总检", $"{data.FinishTime:yyyy-MM-dd HH:mm}", $"已完成")); list.Add(new StepModel("打印", "未打印", "", true)); + list.Add(new StepModel("当前操作人员", Global.currentUser.Name)); return list; } @@ -240,6 +243,7 @@ WHERE A.EID = {Eid} AND c.VerifyTime IS NULL AND B.IsHide=0 AND A.GiveUpTime IS list.Add(new StepModel("总检", $"", "", true)); } list.Add(new StepModel("打印")); + list.Add(new StepModel("当前操作人员", Global.currentUser.Name)); return list; } @@ -251,6 +255,7 @@ WHERE A.EID = {Eid} AND c.VerifyTime IS NULL AND B.IsHide=0 AND A.GiveUpTime IS new StepModel("科室分检" ), new StepModel("总检"), new StepModel("打印"), + new StepModel("当前操作人员", Global.currentUser.Name), }; } @@ -283,10 +288,20 @@ WHERE A.EID = {Eid} AND c.VerifyTime IS NULL AND B.IsHide=0 AND A.GiveUpTime IS // 4..填充⚪，未完成填充序号，已完成的填充图片 if (i >= currentIndex) { - var sizeIndex = graphics.MeasureString($"{i}", nameFont); // 测量字符串 - var point = new Point(rec.X + 15 - (int)(sizeIndex.Width / 2), - ((int)(mid - sizeIndex.Height / 2))); // 垂直居中对齐 - graphics.DrawString($"{i}", nameFont, new SolidBrush(i > currentIndex ? mainColor : white), point); + if(i == data.Count - 1) + { + var sizeIndex = graphics.MeasureString($"◆", nameFont); // 测量字符串 + var point = new Point(rec.X + 15 - (int)(sizeIndex.Width / 2), + ((int)(mid - sizeIndex.Height / 2))); // 垂直居中对齐 + graphics.DrawString($"◆", nameFont, new SolidBrush(i > currentIndex ? mainColor : white), point); + } + else + { + var sizeIndex = graphics.MeasureString($"{i}", nameFont); // 测量字符串 + var point = new Point(rec.X + 15 - (int)(sizeIndex.Width / 2), + ((int)(mid - sizeIndex.Height / 2))); // 垂直居中对齐 + graphics.DrawString($"{i}", nameFont, new SolidBrush(i > currentIndex ? mainColor : white), point); + } } else { @@ -316,12 +331,19 @@ WHERE A.EID = {Eid} AND c.VerifyTime IS NULL AND B.IsHide=0 AND A.GiveUpTime IS : 0); // x右移 --- initX += (int)nameSize.Width + margin; - // 最后一个节点无需分割线 - if (i >= data.Count - 1) continue; - // 10.在画布中画一条线 - graphics.DrawLine(new Pen(mainColor), new Point(initX, mid), - new Point(initX + LineLength + lineAddWidth, mid)); - initX += (LineLength + lineAddWidth); + // 操作人员节点画白色分割线 + if (i >= data.Count - 2) { + graphics.DrawLine(new Pen(Color.White), new Point(initX, mid), + new Point(initX + LineLength + lineAddWidth, mid)); + initX += (LineLength + lineAddWidth); + } + else{ + // 10.在画布中画一条线 + graphics.DrawLine(new Pen(mainColor), new Point(initX, mid), + new Point(initX + LineLength + lineAddWidth, mid)); + initX += (LineLength + lineAddWidth); + } + } Console.WriteLine();