diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoCurrentResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoCurrentResponse.cs index 04cd105e..39d82616 100644 --- a/Src/Dlhis.Basic/Organization/Response/GainfoCurrentResponse.cs +++ b/Src/Dlhis.Basic/Organization/Response/GainfoCurrentResponse.cs @@ -45,8 +45,13 @@ public class GainfoCurrentResponse /// /// 出生日期/生日 /// - [JsonConverter(typeof(ToDateJsonConverter))] - public DateTime Birthday { get; set; } + public string Birthday + { + get { return OriginalBirthday.HasValue ? OriginalBirthday.Value.ToString("yyyy-MM-dd") : "0000-00-00"; } + } + + + public DateTime? OriginalBirthday { get; set; } /// /// 厂区编码 diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs index 227c86a9..bd3d30b8 100644 --- a/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs +++ b/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs @@ -67,15 +67,21 @@ public class GainfoDetailResponse /// 身份证地址 /// public string Address { get; set; } - + [JsonIgnore] - public DateTime OriginalBirthday { get; set; } + public DateTime? OriginalBirthday { get; set; } /// /// 出生日期 /// [JsonConverter(typeof(ObfuscateProviderJsonConverter), 0)] - public string Birthday => OriginalBirthday.ToString("yyyy-MM-dd"); + public string Birthday + { + get + { + return OriginalBirthday.HasValue ? OriginalBirthday.Value.ToString("yyyy-MM-dd") : "0000-00-00"; + } + } /// /// 手机号码 diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs index 04552c4a..c04f943a 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs @@ -217,7 +217,7 @@ public class GainfoService : IGainfoService .Select((ga, department, type) => new GainfoCurrentResponse { UserNo = ga.No, - Birthday = ga.Birthday, + OriginalBirthday = ga.Birthday, DepartmentNo = department.No, DepartmentName = department.Name, Gender = ga.Gender, diff --git a/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs index 7cfb4bb2..9dae17ee 100644 --- a/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs @@ -84,7 +84,7 @@ public class GainfoEntity : SugarBaseEntity /// 生日 /// [SugarColumn(IsNullable = true, ColumnDescription = "生日")] - public DateTime Birthday { get; set; } + public DateTime? Birthday { get; set; } /// /// 身份证地址 diff --git a/Src/Dlhis.Entity/Basic/Entity/GainfoSapEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoSapEntity.cs index 804f2958..c3a53461 100644 --- a/Src/Dlhis.Entity/Basic/Entity/GainfoSapEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/GainfoSapEntity.cs @@ -26,7 +26,7 @@ namespace Dlhis.Entity.Basic.Entity public string idno { get; set; } public string native { get; set; } public string sex { get; set; } - public DateTime birthday { get; set; } + public DateTime? birthday { get; set; } public string address { get; set; } public string postcode { get; set; } diff --git a/Src/Dlhis.Jip.Api/Dto/SapPersonItem.cs b/Src/Dlhis.Jip.Api/Dto/SapPersonItem.cs index e3b90f53..fec5fdf1 100644 --- a/Src/Dlhis.Jip.Api/Dto/SapPersonItem.cs +++ b/Src/Dlhis.Jip.Api/Dto/SapPersonItem.cs @@ -148,7 +148,7 @@ public class SapPersonItem /// /// /// - public DateTime GBDAT { get; set; } + public DateTime? GBDAT { get; set; } /// /// ///