diff --git a/src/Shentun.Peis.Application/BeiJingMZAKExportDatas/BeiJingMZAKExportDataAppService.cs b/src/Shentun.Peis.Application/BeiJingMZAKExportDatas/BeiJingMZAKExportDataAppService.cs index 5a34f6d..cf6ea7d 100644 --- a/src/Shentun.Peis.Application/BeiJingMZAKExportDatas/BeiJingMZAKExportDataAppService.cs +++ b/src/Shentun.Peis.Application/BeiJingMZAKExportDatas/BeiJingMZAKExportDataAppService.cs @@ -2419,7 +2419,15 @@ namespace Shentun.Peis.BeiJingMZAKExportDatas string nationId = null; if (!string.IsNullOrWhiteSpace(row["nation_id"].ToString())) { - nationId = (await _fieldComparisonRepository.GetQueryableAsync()).Where(m => m.TableName == "nation" && m.OldKeyValue == row["nation_id"].ToString()).FirstOrDefault().NewKeyValue; + var nationEnt = (await _fieldComparisonRepository.GetQueryableAsync()).Where(m => m.TableName == "nation" && m.OldKeyValue == row["nation_id"].ToString()).FirstOrDefault(); + if (nationEnt == null) + { + nationId = row["nation_id"].ToString(); + } + else + { + nationId = nationEnt.NewKeyValue; + } } Guid autoPatientId = GuidGenerator.Create(); //档案ID @@ -2986,7 +2994,15 @@ namespace Shentun.Peis.BeiJingMZAKExportDatas string nationId = null; if (!string.IsNullOrWhiteSpace(row["nation_id"].ToString())) { - nationId = (await _fieldComparisonRepository.GetQueryableAsync()).Where(m => m.TableName == "nation" && m.OldKeyValue == row["nation_id"].ToString()).FirstOrDefault().NewKeyValue; + var nationEnt = (await _fieldComparisonRepository.GetQueryableAsync()).Where(m => m.TableName == "nation" && m.OldKeyValue == row["nation_id"].ToString()).FirstOrDefault(); + if (nationEnt == null) + { + nationId = row["nation_id"].ToString(); + } + else + { + nationId = nationEnt.NewKeyValue; + } } Guid autoPatientId = GuidGenerator.Create(); //档案ID