Commit 023776a2 by lcx

Merge branch '医护工作量' of http://192.168.18.110:8880/zry/performance into 医护工作量

parents b7146ee4 54f48ad3
...@@ -651,8 +651,8 @@ private DeptDataDetails<DetailModuleExtend> MergeDetails(DeptDataDetails details ...@@ -651,8 +651,8 @@ private DeptDataDetails<DetailModuleExtend> MergeDetails(DeptDataDetails details
var execute = data.FirstOrDefault(t => t.ItemName.IndexOf("执行") > -1); var execute = data.FirstOrDefault(t => t.ItemName.IndexOf("执行") > -1);
foreach (var dept in depts.Distinct().OrderBy(t => t)) foreach (var dept in depts.Distinct().OrderBy(t => t))
{ {
var item1 = billing.Items.FirstOrDefault(t => t.ItemName == dept); var item1 = billing?.Items.FirstOrDefault(t => t.ItemName == dept);
var item2 = execute.Items.FirstOrDefault(t => t.ItemName == dept); var item2 = execute?.Items.FirstOrDefault(t => t.ItemName == dept);
items.Add(new DetailModuleExtend items.Add(new DetailModuleExtend
{ {
......
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