diff --git a/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs index 3121a1f..d01c0b2 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs @@ -50,8 +50,8 @@ namespace PEIS.Model.Enrollment { // 个人登记信息 DAOHelp.ExecuteSql($"Insert into Enrollment_Patient " + - $"(Name, Sex, Nation, Age, AgeClass, CardType, CardNo, Tel1, Tel2, Contactor1,Contactor2,Address1, Address2, Marriage, Education, Occupation, Company, ExamDate, Type, PID, OID, OEID, OrgName, GroupID, GroupName, CreateTime, CreatorCode, Creator)" + - $" SELECT a.Name, a.Sex, a.Nation, DATEDIFF(YEAR, a.Birthday, GETDATE()) + CASE WHEN DATEDIFF(DAY,DATEADD(YEAR,DATEDIFF(YEAR, a.Birthday,GETDATE()), a.Birthday),GETDATE()) < 0 THEN -1 ELSE 0 END, '岁', CardType, CardNo, a.Tel1, a.Tel2, a.Contactor1, a.Contactor2, Address1, Address2, a.Marriage, Education, Occupation, Company, c.ExamDate, d.Type, a.ID, c.OID, c.ID, c.Name, d.ID, d.Name, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}' " + + $"(Name, Sex, Nation, Age, AgeClass, CardType, CardNo, Tel1, Tel2, Contactor1,Contactor2,Address1, Address2, Marriage, Education, Occupation, Company, ExamDate, Type, PID, OID, OEID, OrgName, GroupID, GroupName, Description, CreateTime, CreatorCode, Creator)" + + $" SELECT a.Name, a.Sex, a.Nation, DATEDIFF(YEAR, a.Birthday, GETDATE()) + CASE WHEN DATEDIFF(DAY,DATEADD(YEAR,DATEDIFF(YEAR, a.Birthday,GETDATE()), a.Birthday),GETDATE()) < 0 THEN -1 ELSE 0 END, '岁', CardType, CardNo, a.Tel1, a.Tel2, a.Contactor1, a.Contactor2, Address1, Address2, a.Marriage, Education, Occupation, Company, c.ExamDate, d.Type, a.ID, c.OID, c.ID, c.Name, d.ID, d.Name, a.Description, GETDATE(), '{Global.currentUser.Code}', '{Global.currentUser.Name}' " + $"FROM dbo.Base_Patient a " + $"LEFT JOIN dbo.Enrollment_OrgPatient b ON a.ID = b.PID " + $"LEFT JOIN dbo.Enrollment_Org c ON b.OID = c.ID " + diff --git a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs index 380b770..b052bf1 100644 --- a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs @@ -59,7 +59,7 @@ namespace PEIS.Model.Enrollment SpellCode = '{item.SpellCode}' WHERE ID = {item.ID}"; - var baseStr = $@"update base_patient set name = '{item.Name}', Sex = '{item.Sex}', Birthday = '{item.Birthday}', CardType = '{item.CardType}', CardNo = '{item.CardNo}', SpellCode = '{item.SpellCode}', Marriage = '{item.Marriage}' where ID = {item.PID}"; + var baseStr = $@"update base_patient set name = '{item.Name}', Sex = '{item.Sex}', Birthday = '{item.Birthday}', CardType = '{item.CardType}', CardNo = '{item.CardNo}', SpellCode = '{item.SpellCode}', Marriage = '{item.Marriage}', Description = '{item.Description}' where ID = {item.PID}"; DAOHelp.ExecuteSql(baseStr, false); return DAOHelp.ExecuteSql(sql, false) > 0; diff --git a/PEIS/ReportFiles/Guide.frx b/PEIS/ReportFiles/Guide.frx index dc55722..215b6af 100644 --- a/PEIS/ReportFiles/Guide.frx +++ b/PEIS/ReportFiles/Guide.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -74,6 +74,7 @@ namespace FastReport + @@ -141,7 +142,7 @@ namespace FastReport - + diff --git a/PEIS/Utils/ReportHelper.cs b/PEIS/Utils/ReportHelper.cs index be0c5a4..970ccb4 100644 --- a/PEIS/Utils/ReportHelper.cs +++ b/PEIS/Utils/ReportHelper.cs @@ -532,6 +532,7 @@ namespace PEIS.Utils rpt.SetParameterValue("Nation", regInfo.Nation); rpt.SetParameterValue("CardNo", regInfo.CardNo); rpt.SetParameterValue("HospitalName", Global._hospital?.Name); + rpt.SetParameterValue("Remark", regInfo.Description); if (string.IsNullOrEmpty(regInfo.Photo)) {