feat(信息录入): 体检信息

luoyb

2021-02-20 d0295276c2161f6e4d0b43c5f55e256952116992

feat(信息录入): 体检信息

1.增加了体检类型和心电图状态字典项
2.返回数据增加了体检类型名称和心电图状态名称

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java

@@ -33,4 +33,15 @@
     * 籍贯
     */
    public final static String NATIVEPLACE = "NATIVEPLACE";

    /**
     * 体检类型
     */
    public final static String PHYSICALEXAMTYPE = "PHYSICALEXAMTYPE";

    /**
     * 心电图结果
     */
    public final static String ECG = "ECG";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpPhysicalExam.java

@@ -2,6 +2,7 @@

import java.io.Serializable;
import java.util.Date;

import cc.mrbird.febs.common.core.annotation.FieldInfo;
import cc.mrbird.febs.common.core.utils.DateDeSerializer;
import cc.mrbird.febs.common.core.utils.DateSerializer;
@@ -17,7 +18,6 @@
import org.springframework.format.annotation.DateTimeFormat;

/**
*
* name:EmpPhysicalExam
* package:cc.mrbird.febs.server.hr.controller
* description:员工体检信息数据表映射实体
@@ -147,4 +147,12 @@
            @TableField(exist = false)
            private String physicalExamDateStr= "";

    @FieldInfo(name = "physicalExamTypeName", type = "varchar", explain = "体检类型")
    @TableField(exist = false)
    private String physicalExamTypeName = "";

    @FieldInfo(name = "ecgName", type = "varchar", explain = "心电图")
    @TableField(exist = false)
    private String ecgName = "";

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java

@@ -6,6 +6,11 @@
import java.util.List;
import java.util.Optional;

import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -39,6 +44,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
class EmpPhysicalExamServiceImpl extends ServiceImpl<EmpPhysicalExamMapper, EmpPhysicalExam> implements IEmpPhysicalExamService {

    private final RedisService redisService;
    private final EmpPhysicalExamMapper empPhysicalexamMapper;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
@@ -76,7 +82,24 @@
            queryWrapper.eq(EmpPhysicalExam::getEmpStatus, empPhysicalexam.getEmpStatus());
        }
        Page<EmpPhysicalExam> page = new Page<>(request.getPageNum(), request.getPageSize());
        return this.page(page, queryWrapper);
        IPage<EmpPhysicalExam> iPage = this.page(page, queryWrapper);
        List<EmpPhysicalExam> list = iPage.getRecords();
        //设置字典数据
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
        list.forEach(p -> {
            p.setPhysicalExamTypeName(dicItems.stream()
                    .filter(k -> DicCode.PHYSICALEXAMTYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getPhysicalExamType()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("普通体检"));
            p.setEcgName(dicItems.stream()
                    .filter(k -> DicCode.ECG.equals(k.getDicCode()) && k.getDicItemCode().equals(p.getPhysicalExamType()))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("正常"));
        });
        iPage.setRecords(list);
        return iPage;
    }

    @Override