wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix: 修复DrgAnalysisController bean冲突+添加缺失菜单

Browse Source
This commit is contained in:
chenqi
2026-06-18 18:41:06 +08:00
parent 1a7092d2d8
commit 9cfb7fcf78
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/DrgAnalysisController.java → healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/mrhomepage/controller/MrHomepageDrgController.java
View File

@@ -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<MrDrgGrouping> 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<String, Object> result = new HashMap<>();
result.put("avgCost", count > 0 ? totalCost.divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO);

7
healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V76__add_missing_menus.sql Normal file
View File

@@ -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);