bug修复

parent 90d98c16
...@@ -2020,7 +2020,7 @@ public List<cof_alias> CustomColumnHeaders(int hospitalId, string route) ...@@ -2020,7 +2020,7 @@ public List<cof_alias> CustomColumnHeaders(int hospitalId, string route)
{ {
foreach (var item in alias) foreach (var item in alias)
{ {
var x = init.FirstOrDefault(w => w.Name == item.Name); var x = init.FirstOrDefault(w => w.Name.Equals(item.Name, StringComparison.OrdinalIgnoreCase));
if (x == null) if (x == null)
{ {
init.Add(item); init.Add(item);
......
...@@ -183,7 +183,7 @@ public string AllComputerViewReport(int allotId, List<dynamic> dynamics, string ...@@ -183,7 +183,7 @@ public string AllComputerViewReport(int allotId, List<dynamic> dynamics, string
var hospital = perforHospital.GetEntity(t => t.ID == allot.HospitalId); var hospital = perforHospital.GetEntity(t => t.ID == allot.HospitalId);
var alias = perforCofalias.GetEntities(t => t.HospitalId == hospital.ID); var alias = perforCofalias.GetEntities(t => t.HospitalId == hospital.ID);
var headList = _computeService.CustomColumnHeaders(hospital.ID, route); var headList = _computeService.CustomColumnHeaders(hospital.ID, route).Where(w => w.States == 1).ToList();
var dpath = Path.Combine(evn.ContentRootPath, "Files", "PerformanceRelease", $"{allot.HospitalId}"); var dpath = Path.Combine(evn.ContentRootPath, "Files", "PerformanceRelease", $"{allot.HospitalId}");
FileHelper.CreateDirectory(dpath); FileHelper.CreateDirectory(dpath);
...@@ -288,7 +288,7 @@ public string AllComputerViewReport(int allotId, List<dynamic> dynamics, string ...@@ -288,7 +288,7 @@ public string AllComputerViewReport(int allotId, List<dynamic> dynamics, string
("实发绩效",t=>t.RealGiveFee,(t) => Math.Round(t.Sum(item => item.RealGiveFee ?? 0), 2, MidpointRounding.AwayFromZero)) ("实发绩效",t=>t.RealGiveFee,(t) => Math.Round(t.Sum(item => item.RealGiveFee ?? 0), 2, MidpointRounding.AwayFromZero))
}; };
#endregion #endregion
#region 全院绩效核算 #region 全院绩效核算
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment