From 63ae23f4b11d1d480328ddbc79fac2325f0140fa Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 9 Jan 2026 14:53:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=95=BF=E8=80=85=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9=EF=BC=9A=E5=8C=BB?= =?UTF-8?q?=E4=BF=9D=E7=B1=BB=E5=9E=8B=E3=80=81=E5=A4=B1=E8=83=BD=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E3=80=81=E7=BC=B4=E8=B4=B9=E7=8A=B6=E6=80=81=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E4=B8=AD=E6=96=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nu/entity/ElderInfoEntity.java | 14 ++++++++++ .../modules/elderinfo/entity/ElderInfo.java | 22 +++++++++++++--- .../elderinfo/mapper/ElderInfoMapper.java | 4 +++ .../elderinfo/mapper/xml/ElderInfoMapper.xml | 26 +++++++++++++++++++ .../service/impl/ElderInfoServiceImpl.java | 8 +----- 5 files changed, 63 insertions(+), 11 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java index 46077bd..d3cf289 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java @@ -1,5 +1,6 @@ package com.nu.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -281,4 +282,17 @@ public class ElderInfoEntity implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date checkinTime; + + /** + * 医保类型中文名 + */ + private String yblxName; + /** + * 失能等级中文名 + */ + private String sndjName; + /** + * 缴费状态中文名 + */ + private String jfztName; } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java index f5aaf24..604f23c 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java @@ -3,10 +3,7 @@ package com.nu.modules.elderinfo.entity; import java.io.Serializable; import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -372,4 +369,21 @@ public class ElderInfo implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd") private Date checkinTime; + + /** + * 医保类型中文名 + */ + @TableField(exist = false) + private String yblxName; + /** + * 失能等级中文名 + */ + @TableField(exist = false) + private String sndjName; + /** + * 缴费状态中文名 + */ + @TableField(exist = false) + private String jfztName; + } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/ElderInfoMapper.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/ElderInfoMapper.java index cdd9f9a..2cbbed7 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/ElderInfoMapper.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/ElderInfoMapper.java @@ -2,6 +2,9 @@ package com.nu.modules.elderinfo.mapper; import com.nu.modules.elderinfo.entity.ElderInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Description: 长者信息 @@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ElderInfoMapper extends BaseMapper { + List selectLists(@Param("openId") String openId,@Param("elderId") String elderId); } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml index 3cd1941..c1d58c1 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml @@ -2,4 +2,30 @@ + diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java index f45cbbd..2ebaa15 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java @@ -42,13 +42,7 @@ public class ElderInfoServiceImpl extends ServiceImpl queryElders(String openId, String elderId) { - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("guardian_open_id", openId); - if (StringUtils.isNotBlank(elderId)) { - qw.eq("id", elderId); - } - List elderInfos = baseMapper.selectList(qw); - return BeanUtil.copyToList(elderInfos, ElderInfoEntity.class); + return BeanUtil.copyToList(baseMapper.selectLists(openId, elderId), ElderInfoEntity.class); } @Override