Bug修复

parent eaefefc2
...@@ -722,7 +722,7 @@ public HandsonTable GetBatchAccountingStructrue(int AllotId) ...@@ -722,7 +722,7 @@ public HandsonTable GetBatchAccountingStructrue(int AllotId)
if (column.Data == "核算组别") if (column.Data == "核算组别")
{ {
column.Type = "autocomplete"; column.Type = "autocomplete";
column.Source = new[] { "医生组", "护理组", "医技组", "特殊核算组", "其他医生组", "其他护理组", "其他医技组", "行政高层", "行政中层", "行政后勤" }; column.Source = EnumHelper.GetItems<UnitType>().Select(w => w.Description.Replace("行政后勤", "行政工勤")).ToArray();
column.Strict = true; column.Strict = true;
} }
} }
...@@ -734,7 +734,7 @@ public bool BatchSaveAccounting(int allotId, SaveCollectData request) ...@@ -734,7 +734,7 @@ public bool BatchSaveAccounting(int allotId, SaveCollectData request)
{ {
var dicData = CreateDataRow(0, allotId, request, Accounting); var dicData = CreateDataRow(0, allotId, request, Accounting);
var getAccounts = cofaccountingRepository.GetEntities(); var getAccounts = cofaccountingRepository.GetEntities();
var unitType = new[] { "医生组", "护理组", "医技组", "特殊核算组", "其他医生组", "其他护理组", "其他医技组", "行政高层", "行政中层", "行政后勤" }; var unitType = EnumHelper.GetItems<UnitType>().Select(w => w.Description.Replace("行政后勤", "行政工勤")).ToArray();
List<cof_accounting> accounts = new List<cof_accounting>(); List<cof_accounting> accounts = new List<cof_accounting>();
foreach (var item in dicData) foreach (var item in dicData)
{ {
......
...@@ -611,9 +611,7 @@ public HandsonTable GetBatchPersonStructrue(int hospitalId) ...@@ -611,9 +611,7 @@ public HandsonTable GetBatchPersonStructrue(int hospitalId)
if (column.Data == "人员类别") if (column.Data == "人员类别")
{ {
column.Type = "autocomplete"; column.Type = "autocomplete";
column.Source = deptdics? column.Source = EnumHelper.GetItems<UnitType>().Select(w => w.Description.Replace("行政后勤", "行政工勤")).ToArray();
.Where(t => !new string[] { UnitType.专家组.ToString() }.Contains(t.UnitType))
.Select(t => t.UnitType).Distinct().ToArray();
column.Strict = true; column.Strict = true;
} }
else if (new[] { "出勤天数", "预留比例" }.Contains(column.Data)) else if (new[] { "出勤天数", "预留比例" }.Contains(column.Data))
......
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