From aafd6169d841a90061a2a96ad77149975be8103d Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Mon, 07 Sep 2020 15:07:38 +0800
Subject: [PATCH] 修改 IsEnd   为 end  的bug  还有修改方法名

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 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..2766441 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);
+    }
 
     /**
      * 列表
@@ -141,8 +157,8 @@
 
     @ApiOperation(value = "获取医院套餐是否到期和到期时间")
     @GetMapping("/UserProductDetailData")
-    public ResultBody UserProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId) {
-        return productOrderDetailService.UserProductDetailData(hospitalId, departmentId);
+    public ResultBody UserProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId,@RequestParam String diagnosticId) {
+        return productOrderDetailService.userProductDetailData(hospitalId, departmentId,diagnosticId);
     }
 
     /**
@@ -156,7 +172,7 @@
     @ApiOperation(value = "获取医院套餐是否到期和到期时间")
     @PostMapping("/serviceperiod")
     public ResultBody<UserProductData> ServicePeriod(@RequestBody HospitalInfo hospitalInfo) {
-        return productOrderDetailService.UserProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId());
+        return productOrderDetailService.userProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId(),hospitalInfo.getDiagnosticId());
     }
 
     /**
@@ -393,7 +409,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 +421,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