1、检验科审核时核对项目总数,2、确认按钮默认成"是"。

dhzzyy
lsm 7 months ago
parent 36455d060a
commit 2803d58198
  1. 2
      PEIS/Utils/Global.cs
  2. 42
      PEIS/View/Exam/PartForm.cs

@ -89,7 +89,7 @@ namespace PEIS.Utils
switch (kind) switch (kind)
{ {
case "warn": case "warn":
dr = MessageBox.Show(content, "警告", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2); dr = MessageBox.Show(content, "警告", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
break; break;
case "err": case "err":

@ -1180,16 +1180,40 @@ namespace PEIS.View.Exam
// 检验科判断项目是否完全出结果 // 检验科判断项目是否完全出结果
if(_examPart.DeptCode == "3001") if(_examPart.DeptCode == "3001")
{ {
//var resultFeeItem = DAOHelp.GetDataBySQL<ExamResult>($@"SELECT FeeItemName FROM Exam_Result WHERE PID = {_examPart.ID} AND DeptName LIKE '%医学检验科%' GROUP BY FeeItemName"); var feeItem = new List<EnrollmentFeeItem>();
//var examFeeItem = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"SELECT FeeItemName FROM Enrollment_FeeItem WHERE EID = {_patient.ID} and DeptCode = '3001'");
var examFeeItem = DAOHelp.GetDataBySQL<EnrollmentFeeItem>($@"SELECT FeeItemName FROM Enrollment_FeeItem WHERE EID = {_patient.ID} and DeptCode = '3001'");
//if(resultFeeItem.Count != examFeeItem.Count)
//{ var resultFeeItem = DAOHelp.GetDataBySQL<ExamResult>($@"SELECT FeeItemName FROM Exam_Result WHERE PID = {_examPart.ID} GROUP BY FeeItemName");
// Msg("info", "请核对检验项目是否齐全后重试!"); foreach (var item in resultFeeItem)
// return; {
//} if (item.FeeItemName.Contains(","))
} {
var one = item.FeeItemName.Split(',');
foreach (var o in one)
{
feeItem.Add(new EnrollmentFeeItem() { FeeItemName = o} );
}
}else if (item.FeeItemName.Contains(","))
{
var two = item.FeeItemName.Split(',');
foreach (var t in two)
{
feeItem.Add(new EnrollmentFeeItem() { FeeItemName = t });
}
}
else
{
feeItem.Add(new EnrollmentFeeItem() { FeeItemName = item.FeeItemName });
}
}
if (feeItem.Count != examFeeItem.Count)
{
Msg("info", "请核对检验项目是否齐全后重试!");
return;
}
}
Review?.Invoke(this, new Args<DateTime?> Review?.Invoke(this, new Args<DateTime?>
{ {

Loading…
Cancel
Save