PC端长者信息、长者信息变更界面展示医保类型、失能等级、缴费状态内容

This commit is contained in:
1378012178@qq.com 2026-01-07 14:08:49 +08:00
parent 03f13cf862
commit 72eaf31a96
11 changed files with 136 additions and 14 deletions

View File

@ -62,7 +62,7 @@ public class ElderInfoController extends JeecgController<ElderInfo, IElderInfoSe
HttpServletRequest req) {
QueryWrapper<ElderInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuBizCustomerInfo, req.getParameterMap());
Page<ElderInfo> page = new Page<ElderInfo>(pageNo, pageSize);
IPage<ElderInfo> pageList = nuBizCustomerInfoService.page(page, queryWrapper);
IPage<ElderInfo> pageList = nuBizCustomerInfoService.pageList(page, queryWrapper);
return Result.OK(pageList);
}

View File

@ -110,7 +110,7 @@ public class ElderInfo implements Serializable {
/**
* 长者缴费状态 字典elder_payment_status
*/
@Excel(name = "医保类型", width = 15, dicCode = "elder_payment_status")
@Excel(name = "长者缴费状态", width = 15, dicCode = "elder_payment_status")
@Dict(dicCode = "elder_payment_status")
@ApiModelProperty(value = "长者缴费状态")
private String paymentStatus;
@ -385,4 +385,20 @@ 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;
}

View File

@ -1,5 +1,9 @@
package com.nu.modules.elderinfo.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.entity.ElderInfoEntity;
import com.nu.entity.ElderServerEntity;
import com.nu.modules.elderinfo.entity.ElderInfo;
@ -11,7 +15,7 @@ import java.util.List;
/**
* @Description: 长者信息
* @Author: jeecg-boot
* @Date: 2025-04-11
* @Date: 2025-04-11
* @Version: V1.0
*/
public interface ElderInfoMapper extends BaseMapper<ElderInfo> {
@ -19,4 +23,8 @@ public interface ElderInfoMapper extends BaseMapper<ElderInfo> {
List<ElderServerEntity> getElderServerList(@Param("params") ElderInfoEntity elderInfoEntity);
void changeOrderly(ElderInfo elderInfo);
ElderInfo selectInfoById(@Param("elderId") String elderId);
IPage<ElderInfo> pageList(Page<ElderInfo> page, @Param(Constants.WRAPPER) QueryWrapper<ElderInfo> queryWrapper);
}

View File

@ -19,4 +19,46 @@
where a.nu_id = #{params.nuId}
and a.elder_id = #{params.id}
</select>
<select id="selectInfoById" resultType="com.nu.modules.elderinfo.entity.ElderInfo">
select elder.*,
yblxDictItem.item_text as yblxName,
sndjDictItem.item_text as sndjName,
jfztDictItem.item_text as jfztName
from nu_biz_elder_info elder
LEFT JOIN sys_dict yblxDict on yblxDict.dict_code = 'medical_insurance_type'
LEFT JOIN sys_dict_item yblxDictItem on yblxDictItem.dict_id = yblxDict.id and
yblxDictItem.item_value = elder.medical_type
LEFT JOIN sys_dict sndjDict on sndjDict.dict_code = (case elder.medical_type
when 'syb' then 'syb_reimbursement_type'
when ' zgyb' then 'zgyb_reimbursement_type'
when 'jmyb' then 'jmyb_reimbursement_type'
else '' end)
LEFT JOIN sys_dict_item sndjDictItem on sndjDictItem.dict_id = sndjDict.id and
sndjDictItem.item_value = elder.disability_reimbursement_type
LEFT JOIN sys_dict jfztDict on jfztDict.dict_code = 'elder_payment_status'
LEFT JOIN sys_dict_item jfztDictItem on jfztDictItem.dict_id = jfztDict.id and
jfztDictItem.item_value = elder.payment_status
where elder.id = #{elderId}
</select>
<select id="pageList" resultType="com.nu.modules.elderinfo.entity.ElderInfo">
select elder.*,
yblxDictItem.item_text as yblxName,
sndjDictItem.item_text as sndjName,
jfztDictItem.item_text as jfztName
from nu_biz_elder_info elder
LEFT JOIN sys_dict yblxDict on yblxDict.dict_code = 'medical_insurance_type'
LEFT JOIN sys_dict_item yblxDictItem on yblxDictItem.dict_id = yblxDict.id and
yblxDictItem.item_value = elder.medical_type
LEFT JOIN sys_dict sndjDict on sndjDict.dict_code = (case elder.medical_type
when 'syb' then 'syb_reimbursement_type'
when ' zgyb' then 'zgyb_reimbursement_type'
when 'jmyb' then 'jmyb_reimbursement_type'
else '' end)
LEFT JOIN sys_dict_item sndjDictItem on sndjDictItem.dict_id = sndjDict.id and
sndjDictItem.item_value = elder.disability_reimbursement_type
LEFT JOIN sys_dict jfztDict on jfztDict.dict_code = 'elder_payment_status'
LEFT JOIN sys_dict_item jfztDictItem on jfztDictItem.dict_id = jfztDict.id and
jfztDictItem.item_value = elder.payment_status
${ew.customSqlSegment}
</select>
</mapper>

View File

@ -1,5 +1,8 @@
package com.nu.modules.elderinfo.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.modules.elderinfo.entity.ElderInfo;
import com.baomidou.mybatisplus.extension.service.IService;
@ -25,4 +28,6 @@ public interface IElderInfoService extends IService<ElderInfo> {
void elderAudit(ElderInfo elderInfo);
void changeOrderly(ElderInfo elderInfo);
IPage<ElderInfo> pageList(Page<ElderInfo> page, QueryWrapper<ElderInfo> queryWrapper);
}

View File

@ -5,6 +5,8 @@ import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.dto.ElderInfoMQDto;
import com.nu.entity.ElderInfoEntity;
@ -74,17 +76,18 @@ public class ElderInfoServiceImpl extends ServiceImpl<ElderInfoMapper, ElderInfo
@Override
public List<Map<String, Object>> getModifyInfo(ElderInfo elderInfo) {
// 1. 查询当前使用中数据
ElderInfo usingData = baseMapper.selectById(elderInfo.getId());
ElderInfo usingData = baseMapper.selectInfoById(elderInfo.getId());
// 2. 查询变更后数据
String modifyId = "";
QueryWrapper<ElderModifyInfo> nowUseQW = new QueryWrapper<>();
if ("gua".equals(elderInfo.getQueryModifyType())) {
nowUseQW.eq("id", usingData.getGuardianModifyId());
modifyId = usingData.getGuardianModifyId();
} else {
nowUseQW.eq("id", usingData.getElderModifyId());
modifyId = usingData.getElderModifyId();
}
ElderModifyInfo modifyData = elderModifyInfoService.getOne(nowUseQW);
ElderModifyInfo modifyData = elderModifyInfoService.getInfoId(modifyId);
// 3. 准备结果列表
List<Map<String, Object>> result = new ArrayList<>();
@ -102,7 +105,7 @@ public class ElderInfoServiceImpl extends ServiceImpl<ElderInfoMapper, ElderInfo
continue;
}
TableField tableField = elderInfoField.getAnnotation(TableField.class);
if (tableField != null && !tableField.exist()) {
if (tableField != null && !tableField.exist() && !"yblxName".equals(fieldName) && !"sndjName".equals(fieldName) && !"jfztName".equals(fieldName)) {
continue;
}
@ -256,6 +259,11 @@ public class ElderInfoServiceImpl extends ServiceImpl<ElderInfoMapper, ElderInfo
baseMapper.changeOrderly(elderInfo);
}
@Override
public IPage<ElderInfo> pageList(Page<ElderInfo> page, QueryWrapper<ElderInfo> queryWrapper) {
return baseMapper.pageList(page,queryWrapper);
}
@Override
public List<ElderInfoEntity> selectCurrentState3() {
List<ElderInfo> elderInfos = baseMapper.selectList(new QueryWrapper<ElderInfo>().lambda().ne(ElderInfo::getCurrentState, "3"));

View File

@ -4,10 +4,8 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
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 org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
@ -87,6 +85,7 @@ public class ElderModifyInfo implements Serializable {
/**医保类型*/
@Excel(name = "医保类型", width = 15)
@ApiModelProperty(value = "医保类型")
@Dict(dicCode = "medical_insurance_type")
private String medicalType;
/**
*长者失能等级报销类型
@ -99,7 +98,7 @@ public class ElderModifyInfo implements Serializable {
/**
* 长者缴费状态 字典elder_payment_status
*/
@Excel(name = "医保类型", width = 15, dicCode = "elder_payment_status")
@Excel(name = "长者缴费状态", width = 15, dicCode = "elder_payment_status")
@Dict(dicCode = "elder_payment_status")
@ApiModelProperty(value = "长者缴费状态")
private String paymentStatus;
@ -255,4 +254,21 @@ public class ElderModifyInfo implements Serializable {
@Excel(name = "兵役状况", width = 15)
@ApiModelProperty(value = "兵役状况")
private String militaryType;
/**
* 医保类型中文名
*/
@TableField(exist = false)
private String yblxName;
/**
* 失能等级中文名
*/
@TableField(exist = false)
private String sndjName;
/**
* 缴费状态中文名
*/
@TableField(exist = false)
private String jfztName;
}

View File

@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ElderModifyInfoMapper extends BaseMapper<ElderModifyInfo> {
ElderModifyInfo getInfoId(@Param("id") String id);
}

View File

@ -2,4 +2,25 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.eldermofifyinfo.mapper.ElderModifyInfoMapper">
<select id="getInfoId" resultType="com.nu.modules.eldermofifyinfo.entity.ElderModifyInfo">
select elder.*,
yblxDictItem.item_text as yblxName,
sndjDictItem.item_text as sndjName,
jfztDictItem.item_text as jfztName
from nu_biz_elder_modify_info elder
LEFT JOIN sys_dict yblxDict on yblxDict.dict_code = 'medical_insurance_type'
LEFT JOIN sys_dict_item yblxDictItem on yblxDictItem.dict_id = yblxDict.id and
yblxDictItem.item_value = elder.medical_type
LEFT JOIN sys_dict sndjDict on sndjDict.dict_code = (case elder.medical_type
when 'syb' then 'syb_reimbursement_type'
when ' zgyb' then 'zgyb_reimbursement_type'
when 'jmyb' then 'jmyb_reimbursement_type'
else '' end)
LEFT JOIN sys_dict_item sndjDictItem on sndjDictItem.dict_id = sndjDict.id and
sndjDictItem.item_value = elder.disability_reimbursement_type
LEFT JOIN sys_dict jfztDict on jfztDict.dict_code = 'elder_payment_status'
LEFT JOIN sys_dict_item jfztDictItem on jfztDictItem.dict_id = jfztDict.id and
jfztDictItem.item_value = elder.payment_status
where elder.id = #{id}
</select>
</mapper>

View File

@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IElderModifyInfoService extends IService<ElderModifyInfo> {
ElderModifyInfo getInfoId(String modifyId);
}

View File

@ -16,4 +16,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class ElderModifyInfoServiceImpl extends ServiceImpl<ElderModifyInfoMapper, ElderModifyInfo> implements IElderModifyInfoService {
@Override
public ElderModifyInfo getInfoId(String modifyId) {
return baseMapper.getInfoId(modifyId);
}
}