|
|
@ -63,6 +63,9 @@ namespace PEIS.Utils |
|
|
|
if (!isBasePatient || SuccessList.Any(p => p.CardNo == readPatient.CardNo)) |
|
|
|
if (!isBasePatient || SuccessList.Any(p => p.CardNo == readPatient.CardNo)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
continuousEmpty++; |
|
|
|
continuousEmpty++; |
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(dataRow.GetCell(4)?.ToString())){ |
|
|
|
|
|
|
|
dataRow.GetCell(9).SetCellValue("身份证检验错误!"); |
|
|
|
|
|
|
|
} |
|
|
|
ErrorList.Add(new ExcelRowModel(row, dataRow)); |
|
|
|
ErrorList.Add(new ExcelRowModel(row, dataRow)); |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
@ -97,6 +100,8 @@ namespace PEIS.Utils |
|
|
|
Address1 = dataRow.GetCell(6)?.ToString(), |
|
|
|
Address1 = dataRow.GetCell(6)?.ToString(), |
|
|
|
Tel1 = dataRow.GetCell(7)?.ToString(), |
|
|
|
Tel1 = dataRow.GetCell(7)?.ToString(), |
|
|
|
DeptName = dataRow.GetCell(8)?.ToString(), |
|
|
|
DeptName = dataRow.GetCell(8)?.ToString(), |
|
|
|
|
|
|
|
Description = dataRow.GetCell(9)?.ToString(), |
|
|
|
|
|
|
|
SpellCode = PingYinHelper.GetTotalPingYin(dataRow.GetCell(1)?.ToString().Replace(" ", "")).FirstPingYin.Count == 0 ? null : PingYinHelper.GetTotalPingYin(dataRow.GetCell(1)?.ToString().Replace(" ", "")).FirstPingYin[0] |
|
|
|
}; |
|
|
|
}; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -144,6 +149,7 @@ namespace PEIS.Utils |
|
|
|
ColumnG = p.Address1; |
|
|
|
ColumnG = p.Address1; |
|
|
|
ColumnH = p.Tel1; |
|
|
|
ColumnH = p.Tel1; |
|
|
|
ColumnI = p.DeptName; |
|
|
|
ColumnI = p.DeptName; |
|
|
|
|
|
|
|
ColumnJ = p.Description; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |