diff --git a/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs index e96409a..e9f1c3a 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs @@ -64,7 +64,7 @@ namespace PEIS.Model.Enrollment 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($"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.SignTime IS NULL AND a.FinishTime IS NULL 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}"); diff --git a/PEIS/ReportFiles/PReport.frx b/PEIS/ReportFiles/PReport.frx index 391a18f..f43453e 100644 --- a/PEIS/ReportFiles/PReport.frx +++ b/PEIS/ReportFiles/PReport.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -162,9 +162,9 @@ namespace FastReport - + - + 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":