diff --git a/PEIS/Utils/Global.cs b/PEIS/Utils/Global.cs index 8ebe260..c882b69 100644 --- a/PEIS/Utils/Global.cs +++ b/PEIS/Utils/Global.cs @@ -89,7 +89,7 @@ namespace PEIS.Utils switch (kind) { case "warn": - dr = MessageBox.Show(content, "警告", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2); + dr = MessageBox.Show(content, "警告", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1); break; case "err": diff --git a/PEIS/View/Exam/PartForm.cs b/PEIS/View/Exam/PartForm.cs index 7c2a734..b3b7756 100644 --- a/PEIS/View/Exam/PartForm.cs +++ b/PEIS/View/Exam/PartForm.cs @@ -1180,17 +1180,41 @@ namespace PEIS.View.Exam // 检验科判断项目是否完全出结果 if(_examPart.DeptCode == "3001") { - //var resultFeeItem = DAOHelp.GetDataBySQL($@"SELECT FeeItemName FROM Exam_Result WHERE PID = {_examPart.ID} AND DeptName LIKE '%医学检验科%' GROUP BY FeeItemName"); - //var examFeeItem = DAOHelp.GetDataBySQL($@"SELECT FeeItemName FROM Enrollment_FeeItem WHERE EID = {_patient.ID} and DeptCode = '3001'"); - - //if(resultFeeItem.Count != examFeeItem.Count) - //{ - // Msg("info", "请核对检验项目是否齐全后重试!"); - // return; - //} + var feeItem = new List(); + + var examFeeItem = DAOHelp.GetDataBySQL($@"SELECT FeeItemName FROM Enrollment_FeeItem WHERE EID = {_patient.ID} and DeptCode = '3001'"); + + var resultFeeItem = DAOHelp.GetDataBySQL($@"SELECT FeeItemName FROM Exam_Result WHERE PID = {_examPart.ID} GROUP BY FeeItemName"); + foreach (var item in resultFeeItem) + { + 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 { ID = _examPart.ID,