From f091a26b18e8d79a0ee7bab176c739bb0e7ce139 Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Fri, 20 Nov 2020 16:11:47 +0800
Subject: [PATCH] C端--导出医院数据
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
index f7269a4..f02a54b 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
@@ -92,6 +92,22 @@
}
return productOrderDetailService.all(params);
}
+ /**
+ * 列表
+ */
+ @ApiOperation(value = "查询列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
+ })
+ @GetMapping("alldetail")
+ public PageResult alldetail(@RequestParam Map<String, Object> params) {
+ if (params.size() == 0) {
+ params.put("page", 1);
+ params.put("limit", 10);
+ }
+ return productOrderDetailService.departmentProductDetail(params);
+ }
/**
* 列表
@@ -128,7 +144,22 @@
}
return productOrderDetailService.groupList(params);
}
-
+ /**
+ * 查询到期列表
+ */
+ @ApiOperation(value = "查询到期列表")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
+ @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
+ })
+ @GetMapping("/productEnd")
+ public PageResult productEndList(@RequestParam Map<String, Object> params) {
+ if (params.size() == 0) {
+ params.put("page", 1);
+ params.put("limit", 10);
+ }
+ return productOrderDetailService.productEndList(params);
+ }
/**
* 获取医院套餐是否到期和到期时间
* data内 isend为true说明套餐到期
@@ -136,13 +167,14 @@
*
* @param hospitalId
* @param departmentId
+ * @param diagnosticId
* @return
*/
@ApiOperation(value = "获取医院套餐是否到期和到期时间")
@GetMapping("/UserProductDetailData")
- public ResultBody UserProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId) {
- return productOrderDetailService.UserProductDetailData(hospitalId, departmentId);
+ public ResultBody<UserProductData> serProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId,@RequestParam String diagnosticId) {
+ return productOrderDetailService.userProductDetailData(hospitalId, departmentId,diagnosticId);
}
/**
@@ -155,8 +187,8 @@
@ApiOperation(value = "获取医院套餐是否到期和到期时间")
@PostMapping("/serviceperiod")
- public ResultBody<UserProductData> ServicePeriod(@RequestBody HospitalInfo hospitalInfo) {
- return productOrderDetailService.UserProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId());
+ public ResultBody<UserProductData> servicePeriod(@RequestBody HospitalInfo hospitalInfo) {
+ return productOrderDetailService.userProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId(),hospitalInfo.getDiagnosticId());
}
/**
@@ -393,7 +425,7 @@
@ApiOperation(value = "按指定类型统计合同数量")
@GetMapping("/productOrderChart")
public ResultBody productOrderChart(@RequestParam Map<String, Object> params) {
- OrderChartVo orderChartVo=productOrderDetailService.productOrderChart(params);
+ List<OrderChartVo> orderChartVo=productOrderDetailService.productOrderChart(params);
return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ;
}
@@ -405,7 +437,7 @@
@ApiOperation(value = "统计产品的使用数量")
@GetMapping("/proCountChart")
public ResultBody proCountChart() {
- OrderChartVo orderChartVo=productOrderDetailService.proCountChart();
+ List<OrderChartVo> orderChartVo=productOrderDetailService.proCountChart();
return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ;
}
}
--
Gitblit v1.8.0