1.增加最后一次扣费后,将诊断id写入redis 2.注册的时候,职称转换后超过50位长度自动截断

houruijun

2020-08-28 f0c2d7252b960e5224de90d554b0f5a8d2ee50bb

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java

@@ -12,6 +12,7 @@
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderRecordService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
import com.kidgrow.oprationcenter.vo.OrderChartVo;
import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail;
import com.kidgrow.oprationcenter.vo.UserProductData;
import com.kidgrow.usercenter.feign.SysUserService;
@@ -91,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);
    }

    /**
     * 列表
@@ -140,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);
    }

    /**
@@ -155,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());
    }

    /**
@@ -361,4 +378,50 @@
    public ResultBody getTypeByUser(@LoginUser SysUser sysUser) {
        return productOrderDetailService.getTypeByUser(sysUser);
    }

    /**
     * 统计获取数据量
     * @param datatype
     * 0 试用审核量
     * 1 套餐总量
     * 2 未处理用户反馈
     * 3 未处理数据需求
     * @return
     */
    @ApiOperation(value = "统计获取数据量")
    @GetMapping("/oprationChart")
    public ResultBody oprationChart(int datatype) {
        int counts=productOrderDetailService.oprationChart(datatype);
        return ResultBody.ok().data(counts).msg("数据获取成功!") ;
    }

    /**
     * 按指定类型统计合同数量
     * @param params
     *    datatype     1 按年
     *                 2 按月
     *                 3 按天
     *                 4 按周
     *    beginTime 查询时间段的开始时间
     *    endTime   结束时间
     * @return
     */
    @ApiOperation(value = "按指定类型统计合同数量")
    @GetMapping("/productOrderChart")
    public ResultBody productOrderChart(@RequestParam  Map<String, Object> params) {
        List<OrderChartVo> orderChartVo=productOrderDetailService.productOrderChart(params);
        return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ;
    }

    /**
     * 统计产品的使用数量
     * @return  ccount 是数量
     *          units 是产品名称
     */
    @ApiOperation(value = "统计产品的使用数量")
    @GetMapping("/proCountChart")
    public ResultBody proCountChart() {
        List<OrderChartVo> orderChartVo=productOrderDetailService.proCountChart();
        return ResultBody.ok().data(orderChartVo).msg("数据获取成功!") ;
    }
}