代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/NatService.java

@@ -14,6 +14,8 @@ import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
 * Created by yeshijie on 2023/12/28.
@@ -77,6 +79,16 @@ public class NatService {
        }
        String orderBy = " order by create_time desc limit "+(page-1)*size+","+size;
        List<BaseNatItemDO> list = jdbcTemplate.query(sql+filter+orderBy,new BeanPropertyRowMapper<>(BaseNatItemDO.class));
        List<WlyyHospitalSysDictDO> dictDOList =  wlyyHospitalSysDictDao.findByDictName("isEffect");
        Map<String,String> isEffectMap = dictDOList.stream().collect(Collectors.toMap(WlyyHospitalSysDictDO::getDictCode,WlyyHospitalSysDictDO::getDictValue));
        List<WlyyHospitalSysDictDO> time_type =  wlyyHospitalSysDictDao.findByDictName("time_type");
        Map<String,String> timeTypeMap = time_type.stream().collect(Collectors.toMap(WlyyHospitalSysDictDO::getDictCode,WlyyHospitalSysDictDO::getDictValue));
        list.stream().forEach(one->{
            one.setStatusName(isEffectMap.get(one.getStatus()));
            one.setTimeTypeName(timeTypeMap.get(one.getTimeType()));
        });
        Long count = jdbcTemplate.queryForObject(countSql+filter,Long.class);
        return PageEnvelop.getSuccessListWithPage("查询成功",list,page,size,count);
    }

common/common-entity/src/db/2023.sql

@@ -654,3 +654,7 @@ CREATE TABLE `base_nat_item` (
    PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='医技预约项目配置表';
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('time_type1', NULL, 'time_type', '1', '每天', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '时段设置');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('time_type2', NULL, 'time_type', '2', '每周', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '时段设置');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('time_type3', NULL, 'time_type', '3', '每月', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '时段设置');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('time_type4', NULL, 'time_type', '4', '每年', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '时段设置');

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/BaseNatItemDO.java

@@ -30,7 +30,8 @@ public class BaseNatItemDO extends UuidIdentityEntityWithCreateTime {
    private Integer frequency;//频率平次
    //非数据库字段
    private String statusName;
    private String statusName;//项目状态 1生效中 0失效
    private String timeTypeName;//时段设置 1每天 2每周 3每月 4每年
    @Column(name = "name")
    public String getName() {
@@ -145,4 +146,13 @@ public class BaseNatItemDO extends UuidIdentityEntityWithCreateTime {
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
    @Transient
    public String getTimeTypeName() {
        return timeTypeName;
    }
    public void setTimeTypeName(String timeTypeName) {
        this.timeTypeName = timeTypeName;
    }
}