From f0ef865cb98ab0d629220fd7acf700ed5a4c539f Mon Sep 17 00:00:00 2001 From: lsm Date: Mon, 21 Oct 2024 11:37:08 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AF=BC=E5=87=BA=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Model/Enrollment/EnrollmentOrgModel.cs | 3 ++- PEIS/ReportFiles/OrgExcel.frx | 28 ++++++++++++--------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs index e57dd47..8a95e8f 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs @@ -113,7 +113,8 @@ namespace PEIS.Model.Enrollment a.Tel1, c.DeptName, a.SignTime, - (SELECT SUM(Fee) FROM Enrollment_CheckCost WHERE a.ID = EID AND a.OEID = OEID AND DeleteTime IS NULL) AS Fee + (SELECT SUM(Fee) FROM Enrollment_CheckCost WHERE a.ID = EID AND a.OEID = OEID AND DeleteTime IS NULL) AS Fee, + a.Description FROM Enrollment_Patient a LEFT JOIN Base_Patient b ON a.PID = b.ID diff --git a/PEIS/ReportFiles/OrgExcel.frx b/PEIS/ReportFiles/OrgExcel.frx index badbd3a..be9127e 100644 --- a/PEIS/ReportFiles/OrgExcel.frx +++ b/PEIS/ReportFiles/OrgExcel.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -22,7 +22,7 @@ namespace FastReport private void PeopleCount_AfterData(object sender, EventArgs e) { DataSourceBase rowData = Report.GetDataSource("O"); - Cell86.Text = rowData["SignTime"] == null ? "" : Convert.ToDateTime(rowData["SignTime"]).ToString("yyyy-MM-dd"); + Cell87.Text = rowData["SignTime"] == null ? "" : Convert.ToDateTime(rowData["SignTime"]).ToString("yyyy-MM-dd"); } } } @@ -46,11 +46,12 @@ namespace FastReport - - - + + + + @@ -61,8 +62,9 @@ namespace FastReport - - + + + @@ -73,11 +75,12 @@ namespace FastReport - - - + + + + @@ -88,8 +91,9 @@ namespace FastReport - - + + +