diff --git a/PEIS.Api/appsettings.json b/PEIS.Api/appsettings.json
index d087a84..0f13086 100644
--- a/PEIS.Api/appsettings.json
+++ b/PEIS.Api/appsettings.json
@@ -1,5 +1,5 @@
{
- "urls": "http://192.168.1.37:5200",
+ "urls": "http://192.168.0.188:5200",
"Logging": {
"LogLevel": {
"Default": "Information",
diff --git a/PEIS/App.config b/PEIS/App.config
index fe5a6bf..0d304ad 100644
--- a/PEIS/App.config
+++ b/PEIS/App.config
@@ -9,9 +9,11 @@
-
-
-
+
+
+
+
+
diff --git a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs
index e0fb8a3..d4a134a 100644
--- a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs
+++ b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs
@@ -51,7 +51,11 @@ namespace PEIS.Model.Enrollment
var enrollmentPatient = $@"UPDATE Enrollment_Patient SET ExamDate = GETDATE(), SignTime = GETDATE(), SignerCode = '{Global.currentUser.Code}', Signer = '{Global.currentUser.Name}' WHERE ID = {eID} AND SignTime is null";
var enrollmentFeeItem = $@"UPDATE a SET a.IsSend = 1 FROM Enrollment_FeeItem a LEFT JOIN Enrollment_CheckCost b ON a.OrderNO = b.ID AND a.EID = b.EID WHERE b.SendTime IS NOT NULL AND a.EID = {eID};";
- var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01012',DeptName = '妇科' WHERE FID = 889 AND EID = {eID}";
+ var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01016',DeptName = '内科' WHERE FID = 844 AND EID = {eID};
+ UPDATE Enrollment_FeeItem SET DeptCode = '01017',DeptName = '外科' WHERE FID = 845 AND EID = {eID};
+ UPDATE Enrollment_FeeItem SET DeptCode = '01014',DeptName = '口腔科' WHERE FID = 846 AND EID = {eID};
+ UPDATE Enrollment_FeeItem SET DeptCode = '01015',DeptName = '五官科' WHERE FID = 847 AND EID = {eID};
+ UPDATE Enrollment_FeeItem SET DeptCode = '01012',DeptName = '心电图室' WHERE FID = 216 AND EID = {eID};";
// 插入分检步骤
var part = $@"EXEC sp_SyncExamPart {eID}";
diff --git a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs
index fb91c5e..b8ce477 100644
--- a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs
+++ b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs
@@ -115,7 +115,11 @@ namespace PEIS.Model.Enrollment
var enrollmentFeeItem = $@"UPDATE a SET a.IsSend = 1 FROM Enrollment_FeeItem a LEFT JOIN Enrollment_CheckCost b ON a.OrderNO = b.ID AND a.EID = b.EID WHERE b.SendTime IS NOT NULL AND a.EID = {EId}; ";
- var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01012',DeptName = '妇科' WHERE FID = 889 AND EID = {EId}";
+ var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01016',DeptName = '内科' WHERE FID = 844 AND EID = {EId};
+ UPDATE Enrollment_FeeItem SET DeptCode = '01017',DeptName = '外科' WHERE FID = 845 AND EID = {EId};
+ UPDATE Enrollment_FeeItem SET DeptCode = '01014',DeptName = '口腔科' WHERE FID = 846 AND EID = {EId};
+ UPDATE Enrollment_FeeItem SET DeptCode = '01015',DeptName = '五官科' WHERE FID = 847 AND EID = {EId};
+ UPDATE Enrollment_FeeItem SET DeptCode = '01012',DeptName = '心电图室' WHERE FID = 216 AND EID = {EId};";
// 插入分检步骤
var part = $@"EXEC sp_SyncExamPart {EId}";
@@ -264,7 +268,7 @@ namespace PEIS.Model.Enrollment
LEFT JOIN Dict_FeeItem b ON a.KeyNo = b.KeyNo
LEFT JOIN Dict_Dept c ON a.DeptCode = c.HISCode AND a.DeptName = c.Name
WHERE
- a.EID = {EId}");
+ a.EID = {EId} ORDER BY OrderNo");
}
public EnrollmentPatient GetEnrollmentPatient(Int64 EId) // 获取个人体检人员信息
diff --git a/PEIS/Model/EnrollmentFeeItemModel.cs b/PEIS/Model/EnrollmentFeeItemModel.cs
index aacdf38..b817f01 100644
--- a/PEIS/Model/EnrollmentFeeItemModel.cs
+++ b/PEIS/Model/EnrollmentFeeItemModel.cs
@@ -33,7 +33,7 @@ namespace PEIS.Model
public List GetItemsByEnrollmentID(Int64 enrollmentID)
{
- return DAOHelp.GetDataBySQL($"Select a.*, b.Address, c.IsHide From Enrollment_FeeItem a LEFT JOIN Dict_Dept b ON a.DeptCode = b.HISCode LEFT JOIN Dict_FeeItem c ON a.KeyNo = c.KeyNo Where a.EID = {enrollmentID} Order by a.PackName DESC, a.OrderNo, a.DeptName");
+ return DAOHelp.GetDataBySQL($"Select a.*, b.Address, c.IsHide From Enrollment_FeeItem a LEFT JOIN Dict_Dept b ON a.DeptCode = b.HISCode LEFT JOIN Dict_FeeItem c ON a.KeyNo = c.KeyNo Where a.EID = {enrollmentID} Order by a.OrderNo");
}
public List GetItems4CheckCost(Int64 oeID, Int64 enrollmentID)
diff --git a/PEIS/ReportFiles/Guide.frx b/PEIS/ReportFiles/Guide.frx
index 7062285..af91b1b 100644
--- a/PEIS/ReportFiles/Guide.frx
+++ b/PEIS/ReportFiles/Guide.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -123,7 +123,7 @@ namespace FastReport
-
+
@@ -148,7 +148,7 @@ namespace FastReport
-
+
diff --git a/PEIS/ReportFiles/Logo.jpg b/PEIS/ReportFiles/Logo.jpg
index 7942834..8723cd0 100644
Binary files a/PEIS/ReportFiles/Logo.jpg and b/PEIS/ReportFiles/Logo.jpg differ
diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs
index c9bf2c7..6a1dc24 100644
--- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs
+++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs
@@ -871,6 +871,7 @@ namespace PEIS.View.Enrollment
rpt.SetParameterValue("No", _lstExcelEPatient.Where(w => w.SignTime == null).ToList().Count());
rpt.SetParameterValue("Yes", _lstExcelEPatient.Where(w => w.SignTime != null).ToList().Count());
rpt.SetParameterValue("OrgName", DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "Name").ToString());
+ rpt.SetParameterValue("TotalFee", _lstExcelEPatient.Sum(s => s.Fee));
// 人员数据
rpt.RegisterData(_lstExcelEPatient, "O");
@@ -930,13 +931,16 @@ namespace PEIS.View.Enrollment
var reportFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", "OrgExcel.frx");
rpt.Load(reportFile);
- rpt.SetParameterValue("TotalCount", _lstExcelEPatient.Count());
- rpt.SetParameterValue("No", _lstExcelEPatient.Where(w => w.SignTime == null).ToList().Count());
- rpt.SetParameterValue("Yes", _lstExcelEPatient.Where(w => w.SignTime != null).ToList().Count());
+ var list = _lstExcelEPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date);
+
+ rpt.SetParameterValue("TotalCount", list.Count());
+ rpt.SetParameterValue("No", list.Where(w => w.SignTime == null).ToList().Count());
+ rpt.SetParameterValue("Yes", list.Where(w => w.SignTime != null).ToList().Count());
rpt.SetParameterValue("OrgName", DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "Name").ToString());
+ rpt.SetParameterValue("TotalFee", list.Sum(s => s.Fee));
// 人员数据
- rpt.RegisterData(_lstExcelEPatient, "O");
+ rpt.RegisterData(list, "O");
DataBand checkCost = rpt.Report.FindObject("OrgExcel") as DataBand;
checkCost.DataSource = rpt.Report.GetDataSource("O");
rpt.GetDataSource("O").Enabled = true;