代码修改

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

@@ -203,4 +203,21 @@ ADD COLUMN `pricing_units_name` varchar(100) NULL COMMENT '计价单位名称' A
ALTER TABLE `base`.`base_service_item_config`
ADD COLUMN `frequency_code` varchar(100) NULL COMMENT '频次' AFTER `pricing_units_name`;
===========================结束=================================
===========================结束=================================
-- 2023-10-31 ysj 计算百分比函数
CREATE FUNCTION percentage(numerator FLOAT, denominator FLOAT) RETURNS VARCHAR(255)
    NO SQL
BEGIN
  DECLARE result VARCHAR(255);
	IF numerator IS NULL OR numerator=0 THEN
    SET result = '0%';
  ELSEIF (denominator = 0 OR denominator is null) AND numerator > 0 THEN
    SET result = '100%';
  ELSEIF denominator IS NULL OR denominator IS NULL THEN
    SET result = '0%';
ELSE
    SET result = CONCAT(ROUND((numerator / denominator) * 100, 2), '%');
END IF;
RETURN result;
END;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsResourceMetadata.java

@@ -17,6 +17,7 @@ public class RsResourceMetadata implements Serializable {
    private String groupType;
    private String groupData;
    private String description;
    private Integer sort;//排序 从小到大
    private String dictId;
    private String stdCode;
@@ -85,6 +86,15 @@ public class RsResourceMetadata implements Serializable {
        this.groupData = groupData;
    }
    @Column(name="sort")
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    @Transient
    public String getDictId() {
        return dictId;

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/dao/ResourceBrowseMetadataDao.java

@@ -51,7 +51,7 @@ public class ResourceBrowseMetadataDao {
                "FROM rs_resource_metadata a, rs_resource b, rs_metadata m " +
                "WHERE a.resources_id = b.id " +
                "AND a.metadata_id = m.ehr_id " +
                "AND b.code = '" + resourcesCode + "'";
                "AND b.code = '" + resourcesCode + "' ORDER BY a.sort";
        RowMapper rowMapper = BeanPropertyRowMapper.newInstance(DtoResourceMetadata.class);
        return jdbcTemplate.query(sql, rowMapper);
    }