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

1、需求更新

Browse Source
mzzyy
lsm 8 months ago
parent 7a25d67cc2
commit 7c57c065ce
4 changed files with 66 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      PEIS/Model/Enrollment/EnrollmentCheckCostModel.cs
  2. 32
      PEIS/ReportFiles/PReport.frx
  3. 32
      PEIS/View/Enrollment/EnrollmentOrgForm.cs
  4. 42
      PEIS/View/UControl/StepViewer.cs

4
PEIS/Model/Enrollment/EnrollmentCheckCostModel.cs
Unescape View File

@ -34,8 +34,8 @@ namespace PEIS.Model.Enrollment
public List<EnrollmentCheckCost> GetCheckCost(Int64 oeID, Int64 enrollmentID) public List<EnrollmentCheckCost> GetCheckCost(Int64 oeID, Int64 enrollmentID)
{ {
var team = DAOHelp.GetDataBySQL<EnrollmentCheckCost>($"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 team = DAOHelp.GetDataBySQL<EnrollmentCheckCost>($"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<EnrollmentCheckCost>($"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 person = DAOHelp.GetDataBySQL<EnrollmentCheckCost>($"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(); return team.Concat(person).GroupBy(g => g.ID).Select(s => s.First()).ToList();
} }

32
PEIS/ReportFiles/PReport.frx
View File

File diff suppressed because one or more lines are too long

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

@ -1484,17 +1484,17 @@ namespace PEIS.View.Enrollment
if (!DgvEnrollmentFeeItem.GetSelectedRows().Any()) return; if (!DgvEnrollmentFeeItem.GetSelectedRows().Any()) return;
if (DgvEnrollment.GetRowCellValue(DgvEnrollment.GetSelectedRows()[0], "ID") == null && _chooseRegItem == null) return; if (DgvEnrollment.GetRowCellValue(DgvEnrollment.GetSelectedRows()[0], "ID") == null && _chooseRegItem == null) return;
//if (_lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count() == 0) if (_lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count() == 0)
//{ {
// Global.Msg("info", "没有要处理的收费项目！"); Global.Msg("info", "没有要处理的收费项目！");
// return; return;
//} }
//if (_lstEnrollmentFeeItem.Where(w => w.OEID == null && w.OrderNo == null).Count() == _lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count()) if (_lstEnrollmentFeeItem.Where(w => w.OEID == null && w.OrderNo == null).Count() == _lstEnrollmentFeeItem.Where(w => w.OrderNo == null).Count())
//{ {
// Global.Msg("info", "未处理体检项目无团体项目，请选择个人收费！"); Global.Msg("info", "未处理体检项目无团体项目，请选择个人收费！");
// return; return;
//} }
if (Global.Msg("warn", "确定生成缴费订单吗？") == System.Windows.Forms.DialogResult.No) 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); 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; DgcEnrollment.DataSource = _lstEnrollmentPatient;
PatientSearch_TextChanged(new object(), new EventArgs()); PatientSearch_TextChanged(new object(), new EventArgs());
DgvEnrollment.ExpandAllGroups(); DgvEnrollment.ExpandAllGroups();
if (topRowIndex != -1) //if (topRowIndex != -1)
{ //{
int rowHandle = DgvEnrollment.LocateByValue("ID", topRowIndex); // int rowHandle = DgvEnrollment.LocateByValue("ID", topRowIndex);
DgvEnrollment.FocusedRowHandle = rowHandle; // DgvEnrollment.FocusedRowHandle = rowHandle;
DgvEnrollment.SelectRow(rowHandle); // DgvEnrollment.SelectRow(rowHandle);
} //}
})); }));
DgvEnrollment.BestFitColumns(); DgvEnrollment.BestFitColumns();
} }

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

@ -199,6 +199,7 @@ namespace PEIS.View.UControl
list.Add(new StepModel("科室分检")); list.Add(new StepModel("科室分检"));
list.Add(new StepModel("总检")); list.Add(new StepModel("总检"));
list.Add(new StepModel("打印")); list.Add(new StepModel("打印"));
list.Add(new StepModel("当前操作人员", Global.currentUser.Name));
return list; return list;
} }
list.Add(new StepModel("签到", $"{data.SignTime:yyyy-MM-dd HH:mm}", $"体检者：{eid}，{data.PatientName}")); 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("科室分检", $"{examTime:yyyy-MM-dd HH:mm}", $"已完成"));
list.Add(new StepModel("总检", $"{data.FinishTime: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("打印", $"{data.PrintTime:yyyy-MM-dd HH:mm}", "已打印", true));
list.Add(new StepModel("当前操作人员", Global.currentUser.Name));
return list; return list;
} }
if (data.FinishTime != null) 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("科室分检", $"{examTime:yyyy-MM-dd HH:mm}", $"已完成"));
list.Add(new StepModel("总检", $"{data.FinishTime: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("打印", "未打印", "", true));
list.Add(new StepModel("当前操作人员", Global.currentUser.Name));
return list; 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("总检", $"", "", true));
} }
list.Add(new StepModel("打印")); list.Add(new StepModel("打印"));
list.Add(new StepModel("当前操作人员", Global.currentUser.Name));
return list; 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("总检"),
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..填充⚪，未完成填充序号，已完成的填充图片 // 4..填充⚪，未完成填充序号，已完成的填充图片
if (i >= currentIndex) if (i >= currentIndex)
{ {
var sizeIndex = graphics.MeasureString($"{i}", nameFont); // 测量字符串 if(i == data.Count - 1)
var point = new Point(rec.X + 15 - (int)(sizeIndex.Width / 2), {
((int)(mid - sizeIndex.Height / 2))); // 垂直居中对齐 var sizeIndex = graphics.MeasureString($"◆", nameFont); // 测量字符串
graphics.DrawString($"{i}", nameFont, new SolidBrush(i > currentIndex ? mainColor : white), point); 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 else
{ {
@ -316,12 +331,19 @@ WHERE A.EID = {Eid} AND c.VerifyTime IS NULL AND B.IsHide=0 AND A.GiveUpTime IS
: 0); : 0);
// x右移 --- // x右移 ---
initX += (int)nameSize.Width + margin; initX += (int)nameSize.Width + margin;
// 最后一个节点无需分割线 // 操作人员节点画白色分割线
if (i >= data.Count - 1) continue; if (i >= data.Count - 2) {
// 10.在画布中画一条线 graphics.DrawLine(new Pen(Color.White), new Point(initX, mid),
graphics.DrawLine(new Pen(mainColor), new Point(initX, mid), new Point(initX + LineLength + lineAddWidth, mid));
new Point(initX + LineLength + lineAddWidth, mid)); initX += (LineLength + lineAddWidth);
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(); Console.WriteLine();

Write Preview
Loading…
Cancel
Save