From 1abab3ed63e5648b8d88c412dce70aad0736b98a Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 25 三月 2025 15:13:30 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/StaticsController.java | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/StaticsController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/StaticsController.java
index a5055cf..4586b82 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/StaticsController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/StaticsController.java
@@ -1,8 +1,6 @@
package com.sinata.web.controller.backend;
import com.sinata.common.core.domain.R;
-import com.sinata.system.domain.MedicalWasteStaticsVO;
-import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.query.DisposalReportQuery;
import com.sinata.system.domain.query.HospitalReportQuery;
import com.sinata.system.domain.query.TransformQuery;
@@ -10,10 +8,7 @@
import com.sinata.system.service.biz.StaticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,7 +16,6 @@
import javax.validation.Valid;
import java.io.IOException;
-import java.util.List;
/**
* @author mitao
@@ -30,27 +24,10 @@
@RestController
@Api(tags = {"统计分析相关接口"})
@RequiredArgsConstructor
-@RequestMapping("/statics")
+@RequestMapping("/backend/statics")
public class StaticsController {
private final StaticsService staticsService;
- /**
- * 机构分布-获取机构列表
- *
- * @param type 1：全部 2：医院 3：处置单位
- * @return
- */
- //@ApiOperation("机构分布-获取机构列表 1：全部 2：医院 3：处置单位")
- @GetMapping(value = "/departmentList/{type}")
- public R<List<SysDepartment>> departmentList(@ApiParam(name = "type", value = "机构类型", required = true) @PathVariable(value = "type") Integer type) {
- return R.ok(staticsService.departmentList(type));
- }
-
- //@ApiOperation("医疗监管-医废统计")
- @GetMapping("/medicalWaste")
- public R<MedicalWasteStaticsVO> medicalWaste() {
- return R.ok(staticsService.medicalWaste());
- }
/**
* 医院报表
@@ -134,9 +111,30 @@
}
}
+ /**
+ * 监管报表
+ *
+ * @param query
+ * @return
+ */
@ApiOperation("监管报表")
@PostMapping("/regulationReport")
public R<DepartmentReportVO> regulationReport(@Valid @RequestBody DisposalReportQuery query) {
return R.ok(staticsService.regulationReport(query));
}
+
+ /**
+ * 监管报表导出
+ *
+ * @param query
+ */
+ @ApiOperation("监管报表导出")
+ @PostMapping("/regulationReportExport")
+ public void regulationReportExport(@Valid @RequestBody DisposalReportQuery query) {
+ try {
+ staticsService.regulationReportExport(query);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
--
Gitblit v1.7.1