diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/DrgAnalysisController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/MrHomepageDrgController.java similarity index 63% rename from healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/DrgAnalysisController.java rename to healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/MrHomepageDrgController.java index 1d7bb0969..3dc26e910 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/DrgAnalysisController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/MrHomepageDrgController.java @@ -1,19 +1,33 @@ package com.healthlink.his.web.mrhomepage.controller; + import com.core.common.core.domain.R; import com.healthlink.his.mrhomepage.domain.MrDrgGrouping; import com.healthlink.his.mrhomepage.service.IMrDrgGroupingService; -import lombok.AllArgsConstructor;import lombok.extern.slf4j.Slf4j; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import java.math.BigDecimal;import java.util.*; -@RestController @RequestMapping("/drg-analysis") @Slf4j @AllArgsConstructor -public class DrgAnalysisController { + +import java.math.BigDecimal; +import java.util.*; + +@RestController +@RequestMapping("/mr-homepage/drg") +@Slf4j +@AllArgsConstructor +public class MrHomepageDrgController { + private final IMrDrgGroupingService drgService; + @GetMapping("/cost-efficiency") public R getCostEfficiency() { List all = drgService.list(); - BigDecimal totalCost = BigDecimal.ZERO; int count = 0; + BigDecimal totalCost = BigDecimal.ZERO; + int count = 0; for (MrDrgGrouping g : all) { - if (g.getTotalCost() != null) { totalCost = totalCost.add(g.getTotalCost()); count++; } + if (g.getTotalCost() != null) { + totalCost = totalCost.add(g.getTotalCost()); + count++; + } } Map result = new HashMap<>(); result.put("avgCost", count > 0 ? totalCost.divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO); diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V76__add_missing_menus.sql b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V76__add_missing_menus.sql new file mode 100644 index 000000000..47d3a16ca --- /dev/null +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V76__add_missing_menus.sql @@ -0,0 +1,7 @@ +INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark, delete_flag) +VALUES +('CDSS', 10001, 10, 'cdss', 'cdss/cdssAlerts/index', NULL, 1, 0, 'C', '0', '0', 'infection:cdss:list', 'fa:', 'admin', CURRENT_TIMESTAMP, NULL, NULL, '临床决策支持', 0), +('区域共享', 20081, 10, 'regionalshare', 'esbmanage/regionalshare/index', NULL, 1, 0, 'C', '0', '0', 'infection:regional:list', 'fa:', 'admin', CURRENT_TIMESTAMP, NULL, NULL, '区域医疗信息共享', 0), +('EMR数据仓库', 20201, 10, 'data-warehouse', 'emr/data-warehouse/index', NULL, 1, 0, 'C', '0', '0', 'infection:emr:list', 'fa:', 'admin', CURRENT_TIMESTAMP, NULL, NULL, '病历数据仓库', 0), +('病案统计明细', 20051, 10, 'statistics-detail', 'mrhomepage/statistics-detail/index', NULL, 1, 0, 'C', '0', '0', 'infection:mrhomepage:list', 'fa:', 'admin', CURRENT_TIMESTAMP, NULL, NULL, '病案统计明细', 0), +('报表维度', 360, 10, 'ReportDimension', 'reportmanage/ReportDimension', NULL, 1, 0, 'C', '0', '0', 'infection:report:list', 'fa:', 'admin', CURRENT_TIMESTAMP, NULL, NULL, '报表维度', 0);