Commit 0656f781 by 李承祥

科室详情收入支出添加类型

parent 0033c1fc
...@@ -20,28 +20,40 @@ public class DeptDetail ...@@ -20,28 +20,40 @@ public class DeptDetail
public class DeptDataDetails public class DeptDataDetails
{ {
/// <summary> 概览</summary>
public PerDataAccountBaisc Pandect { get; set; } public PerDataAccountBaisc Pandect { get; set; }
/// <summary> 收入明细 </summary>
public List<DetailDtos> Detail { get; set; } public List<DetailDtos> Detail { get; set; }
} }
public class DetailDtos public class DetailDtos
{ {
/// <summary> 收入项名称 </summary>
public string ItemName { get; set; } public string ItemName { get; set; }
/// <summary> 1、收入 2、支出 3、工作量 </summary>
public int IncomeType { get; set; }
/// <summary> 金额 </summary>
public decimal Amount { get; set; } public decimal Amount { get; set; }
/// <summary> 详情 </summary>
public List<DetailModule> Items { get; set; } public List<DetailModule> Items { get; set; }
} }
public class DetailModule public class DetailModule
{ {
/// <summary> 明细项 </summary>
public string ItemName { get; set; } public string ItemName { get; set; }
/// <summary> 原始值 </summary>
public decimal? CellValue { get; set; } public decimal? CellValue { get; set; }
/// <summary> 系数 </summary>
public decimal? Factor { get; set; } public decimal? Factor { get; set; }
/// <summary> 结算值 </summary>
public decimal? ItemValue { get; set; } public decimal? ItemValue { get; set; }
} }
} }
...@@ -323,6 +323,7 @@ public DeptDataDetails DeptDetail(int allotId, int accountId, int type) ...@@ -323,6 +323,7 @@ public DeptDataDetails DeptDetail(int allotId, int accountId, int type)
var item = new DetailDtos var item = new DetailDtos
{ {
ItemName = sheetName, ItemName = sheetName,
IncomeType = sheet.SheetType == (int)SheetType.Expend ? 2 : sheet.SheetType == (int)SheetType.Workload ? 3 : 1,
Amount = (sheetName.Contains("工作量") ? doctor.WorkloadFee : economic.FirstOrDefault(t => t.ItemName.Contains(sheetName))?.ItemValue) ?? 0m, Amount = (sheetName.Contains("工作量") ? doctor.WorkloadFee : economic.FirstOrDefault(t => t.ItemName.Contains(sheetName))?.ItemValue) ?? 0m,
Items = sheetData?.Select(t => new DetailModule Items = sheetData?.Select(t => new DetailModule
{ {
......
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