Commit 5c22da86 by lcx

去除基础数据合计值

parent 427345f1
...@@ -634,7 +634,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId) ...@@ -634,7 +634,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
single = sheet.SheetName.Substring(0, 3); single = sheet.SheetName.Substring(0, 3);
var sheetName = reg.Replace(sheet.SheetName, "", 5).Replace(".", "").Replace(" ", ""); var sheetName = reg.Replace(sheet.SheetName, "", 5).Replace(".", "").Replace(" ", "");
var sheetData = basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == type).ToList(); var sheetData = basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == type && t.IsTotal != 1).ToList();
if (sheetData == null || !sheetData.Any()) continue; if (sheetData == null || !sheetData.Any()) continue;
var headerData = headers?.Where(t => t.SheetID == sheet.ID); var headerData = headers?.Where(t => t.SheetID == sheet.ID);
...@@ -900,7 +900,7 @@ public ag_secondallot GetAccountId(int secondId, out int accountId) ...@@ -900,7 +900,7 @@ public ag_secondallot GetAccountId(int secondId, out int accountId)
if (second != null) if (second != null)
{ {
var unitType = EnumHelper.GetItems<UnitType>().FirstOrDefault(t => t.Name == second.UnitType); var unitType = EnumHelper.GetItems<UnitType>().FirstOrDefault(t => t.Name == second.UnitType);
var account = perforResaccountRepository.GetEntity(t => t.AllotID == second.AllotId && t.UnitType == unitType.Value && t.Department == second.Department); var account = perforResaccountRepository.GetEntity(t => t.AllotID == second.AllotId && t.UnitType == unitType.Value && t.AccountingUnit == second.Department);
if (account == null && second.UnitType != UnitType.特殊核算组.ToString()) if (account == null && second.UnitType != UnitType.特殊核算组.ToString())
throw new PerformanceException("科室信息错误"); throw new PerformanceException("科室信息错误");
accountId = account?.ID ?? 0; accountId = account?.ID ?? 0;
......
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