diff --git a/Src/Dlhis.Basic/Organization/Controllers/OldGainfosController.cs b/Src/Dlhis.Basic/Organization/Controllers/OldDeviceGainfosController.cs similarity index 100% rename from Src/Dlhis.Basic/Organization/Controllers/OldGainfosController.cs rename to Src/Dlhis.Basic/Organization/Controllers/OldDeviceGainfosController.cs diff --git a/Src/Dlhis.Basic/Organization/Request/OldGainfoUploadRequest.cs b/Src/Dlhis.Basic/Organization/Request/OldGainfoUploadRequest.cs index 55a92e0d..9e06ee58 100644 --- a/Src/Dlhis.Basic/Organization/Request/OldGainfoUploadRequest.cs +++ b/Src/Dlhis.Basic/Organization/Request/OldGainfoUploadRequest.cs @@ -8,7 +8,7 @@ public class OldDeviceGainfoUploadRequest public string Factory { get; set; } [Required] - public string UniqueNo { get; set; } + public string DeviceUniqueNo { get; set; } /// /// 档案号 diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/OldGainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/OldGainfoService.cs index c05640bd..efe70ca2 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/OldGainfoService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/OldGainfoService.cs @@ -21,7 +21,7 @@ public class OldGainfoService : IOldDeviceGainfoService foreach (var entity in entities) { - if (!await _dbContext.Queryable().AnyAsync(x => x.No == entity.No && x.Code == entity.Code && x.UniqueNo == entity.UniqueNo)) + if (!await _dbContext.Queryable().AnyAsync(x => x.No == entity.No && x.Code == entity.Code && x.DeviceUniqueNo == entity.DeviceUniqueNo)) { await _dbContext.InsertAsync(entity); } diff --git a/Src/Dlhis.Entity/Basic/Entity/OldDeviceGainfoEntity.cs b/Src/Dlhis.Entity/Basic/Entity/OldDeviceGainfoEntity.cs index f7f17476..82c6a570 100644 --- a/Src/Dlhis.Entity/Basic/Entity/OldDeviceGainfoEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/OldDeviceGainfoEntity.cs @@ -29,7 +29,7 @@ public class OldDeviceGainfoEntity /// 设备唯一号 /// [SugarColumn(IsNullable = false, ColumnDescription = "设备唯一号", IndexGroupNameList = new[] { "unique_OldGainfos_no_code_unique" })] - public string UniqueNo { get; set; } + public string DeviceUniqueNo { get; set; } /// /// 处理状态