Skip to content

P
performance
Commit ee3a94d1 by ruyun.zhang@suvalue.com
Options

人员标签BUG

parent 9683e3fa
Showing with 21 additions and 1 deletions
performance/Performance.Services/ReportGlobalService.cs
...@@ -569,6 +569,16 @@ select new ...@@ -569,6 +569,16 @@ select new
ReservedRatio = t1.ReservedRatio, ReservedRatio = t1.ReservedRatio,
BankCard = t1.BankCard, BankCard = t1.BankCard,
Remark = t1.Remark, Remark = t1.Remark,
Reserve01 = t1.Reserve01,
Reserve02 = t1.Reserve02,
Reserve03 = t1.Reserve03,
Reserve04 = t1.Reserve04,
Reserve05 = t1.Reserve05,
Reserve06 = t1.Reserve06,
Reserve07 = t1.Reserve07,
Reserve08 = t1.Reserve08,
Reserve09 = t1.Reserve09,
Reserve10 = t1.Reserve10,
Tag1 = t?.Tag1, Tag1 = t?.Tag1,
Tag2 = t?.Tag2, Tag2 = t?.Tag2,
Tag3 = t?.Tag3, Tag3 = t?.Tag3,
...@@ -594,7 +604,7 @@ select new ...@@ -594,7 +604,7 @@ select new
var json = JsonHelper.Serialize(item); var json = JsonHelper.Serialize(item);
var firstDic = JsonHelper.Deserialize<Dictionary<string, string>>(json); var firstDic = JsonHelper.Deserialize<Dictionary<string, string>>(json);
var cells = (from conf in ComputeConfig.GetAllPersonnelTags(hos?.IsOwnerQuery == 1) var cells = (from conf in columnHeaders
join fst in firstDic on conf.Name.ToUpper() equals fst.Key.ToUpper() join fst in firstDic on conf.Name.ToUpper() equals fst.Key.ToUpper()
select new HandsonCellData(conf.Alias, fst.Value)).ToList(); select new HandsonCellData(conf.Alias, fst.Value)).ToList();
if (hos?.IsOwnerQuery == 1) if (hos?.IsOwnerQuery == 1)
...@@ -695,6 +705,16 @@ public ApiResponse SaveReportPersonTag(int hospitalId, int allotId, int userId, ...@@ -695,6 +705,16 @@ public ApiResponse SaveReportPersonTag(int hospitalId, int allotId, int userId,
employee.ReservedRatio = pdata.ReservedRatio; employee.ReservedRatio = pdata.ReservedRatio;
employee.BankCard = pdata.BankCard; employee.BankCard = pdata.BankCard;
employee.Remark = pdata.Remark; employee.Remark = pdata.Remark;
employee.Reserve01 = pdata.Reserve01;
employee.Reserve02 = pdata.Reserve02;
employee.Reserve03 = pdata.Reserve03;
employee.Reserve04 = pdata.Reserve04;
employee.Reserve05 = pdata.Reserve05;
employee.Reserve06 = pdata.Reserve06;
employee.Reserve07 = pdata.Reserve07;
employee.Reserve08 = pdata.Reserve08;
employee.Reserve09 = pdata.Reserve09;
employee.Reserve10 = pdata.Reserve10;
upEmployees.Add(employee); upEmployees.Add(employee);
#endregion #endregion
......
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