diff --git a/src/main/java/digital/laboratory/platform/imr/controller/DrugHandingOverStatisticController.java b/src/main/java/digital/laboratory/platform/imr/controller/DrugHandingOverStatisticController.java index 1c132c6..493fd69 100644 --- a/src/main/java/digital/laboratory/platform/imr/controller/DrugHandingOverStatisticController.java +++ b/src/main/java/digital/laboratory/platform/imr/controller/DrugHandingOverStatisticController.java @@ -5,6 +5,7 @@ import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.imr.query.DrugStatisticQuery; import digital.laboratory.platform.imr.service.DrugHandingOverStatisticService; import digital.laboratory.platform.imr.vo.DrugStatisticVO; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -15,6 +16,7 @@ import javax.annotation.Resource; @RestController @RequestMapping("/drugStatistic") +@Api(value = "DrugHandingOverStatisticController", tags = "毒品库送缴量统计相关接口") public class DrugHandingOverStatisticController { @Resource diff --git a/src/main/java/digital/laboratory/platform/imr/service/impl/DrugHandingOverStatisticServiceImpl.java b/src/main/java/digital/laboratory/platform/imr/service/impl/DrugHandingOverStatisticServiceImpl.java index d9bddff..24b9957 100644 --- a/src/main/java/digital/laboratory/platform/imr/service/impl/DrugHandingOverStatisticServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/imr/service/impl/DrugHandingOverStatisticServiceImpl.java @@ -52,10 +52,8 @@ public class DrugHandingOverStatisticServiceImpl implements DrugHandingOverStati @Override public DrugStatisticVO statistic(DrugStatisticQuery query) { DrugStatisticVO drugStatisticVO = new DrugStatisticVO(); - List> lineChartData = buildLineChartData(query, drugStatisticVO); - List> barChartData = buildBarChartData(query, drugStatisticVO); - drugStatisticVO.setBarChartDataList(barChartData); - drugStatisticVO.setLineChartDataList(lineChartData); + buildLineChartData(query, drugStatisticVO); + buildBarChartData(query, drugStatisticVO); return drugStatisticVO; }