From a36681bc705c7c3e89c7441be6043a69bd35e3ba Mon Sep 17 00:00:00 2001 From: cheche <717840555@qq.com> Date: Wed, 28 Feb 2024 15:52:59 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=B7=BB=E5=8A=A0=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E8=AF=A6=E6=83=85idclassname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Organization/Response/GainfoDetailResponse.cs | 5 +++++ .../Organization/Services/Implements/GainfoService.cs | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs index ac6e89ef..7753e699 100644 --- a/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs +++ b/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs @@ -34,6 +34,11 @@ public class GainfoDetailResponse /// public string IdClass { get; set; } + /// + /// 证件类型名称 + /// + public string ClassName { get; set; } + /// /// 身份证号 /// diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs index de768d1d..05530061 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs @@ -368,8 +368,9 @@ public class GainfoService : IGainfoService .LeftJoin((ga, de, type, posi) => ga.Position == posi.Name) .LeftJoin((ga, de, type, posi, type2) => ga.CountryNo == type2.Code && type2.Type == "country") .LeftJoin((ga, de, type, posi, type2, type3) => ga.Nation == type3.Code && type3.Type == "nation") + .LeftJoin((ga, de, type, posi, type2, type3,type4) => ga.IdClass == type4.Code && type4.Type == "cls") .Where(ga => ga.No == request.No) - .Select((ga, de, type, posi, type2, type3) => new GainfoDetailResponse + .Select((ga, de, type, posi, type2, type3,type4) => new GainfoDetailResponse { No = ga.No, SapNo = ga.SapNo, @@ -391,6 +392,7 @@ public class GainfoService : IGainfoService Marital = ga.Marital, CountryName = type2.Display, NationName = type3.Display, + ClassName = type4.Display, }) .FirstAsync();