Commit afbdbe8f by 李承祥

微调

parent 513ba520
...@@ -96,7 +96,7 @@ public bool Discern(PerExcel excel, per_allot allot) ...@@ -96,7 +96,7 @@ public bool Discern(PerExcel excel, per_allot allot)
if ((int)sheet.SheetType == 4) if ((int)sheet.SheetType == 4)
{ {
string str = sheet.SheetName.Contains("医生组") ? "医生组" : "护理组"; string str = sheet.SheetName.Contains("医生组") ? "医生组" : "护理组";
var filter = new List<string>() { "核算单元(医生组)", "核算单元(护理组)" }; var filter = new List<string>() { $"核算单元({str})", "科室名称" };
var list = cellValue.Intersect(filter).ToList(); //求交集 var list = cellValue.Intersect(filter).ToList(); //求交集
if (list == null) if (list == null)
...@@ -104,7 +104,7 @@ public bool Discern(PerExcel excel, per_allot allot) ...@@ -104,7 +104,7 @@ public bool Discern(PerExcel excel, per_allot allot)
message = $"{sheet.SheetName} -- 列头不规范,缺少列头或命名不规范:“核算单元({str})、科室名称”不存在;"; message = $"{sheet.SheetName} -- 列头不规范,缺少列头或命名不规范:“核算单元({str})、科室名称”不存在;";
flag = false; flag = false;
} }
else if (!filter.Contains(list.FirstOrDefault())) else if (!cellValue.Contains($"核算单元({str})"))
{ {
message = $"{sheet.SheetName} -- 列头不规范,缺少列头或命名不规范:“核算单元({str})”不存在;"; message = $"{sheet.SheetName} -- 列头不规范,缺少列头或命名不规范:“核算单元({str})”不存在;";
flag = false; flag = false;
......
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