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

houruijun

2020-08-28 f0c2d7252b960e5224de90d554b0f5a8d2ee50bb

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

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalInfo.java

@@ -6,4 +6,5 @@
public class HospitalInfo {
    private Long hospitalId;
    private Long departmentId;
    private String diagnosticId;
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java

@@ -68,7 +68,7 @@
    UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId);

    ResultBody biUserNowProduct(Long hospitalId,Long departmentId);
    ResultBody<UserProductData> UserProductDetailData(Long hospitalId, Long departmentId);
    ResultBody<UserProductData> UserProductDetailData(Long hospitalId, Long departmentId,String diagnosticId);

    /**
     * 试用审核的列表

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java

@@ -2,9 +2,11 @@

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.model.*;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.common.utils.DateUtils;
import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.oprationcenter.feign.DiagnosticService;
import com.kidgrow.oprationcenter.mapper.ConsumptionRecordMapper;
import com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper;
@@ -14,6 +16,7 @@
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
import com.kidgrow.oprationcenter.vo.*;
import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.usercenter.feign.SysDoctorService;
import com.kidgrow.usercenter.feign.SysHospitalService;
import com.kidgrow.usercenter.model.SysHospital;
@@ -48,6 +51,8 @@
    private ConsumptionRecordMapper consumptionRecordMapper;
    @Autowired
    private IProductOrderService iProductOrderService;
    @Autowired
    private RedisUtils redisUtils;
    /**
     * 列表
     * @param params
@@ -73,9 +78,10 @@
     * 判定医院科室的套餐是否到期 以及到期时间
     * @param hospitalId
     * @param departmentId
     * @param diagnosticId
     * @return
     */
    public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId)
    public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId,String diagnosticId)
    {
        UserProductData userProductData=new UserProductData();
        userProductData.setEnd(true);
@@ -91,6 +97,11 @@
                userProductData.setMaxEndTime(productOrderJoinDetailsNewList.get(0).getProEndtime());
            }
        }
        //是否已经结束
        if (userProductData.isEnd()&& StringUtils.isNotBlank(diagnosticId)) {
            //写入redis中,防止扣非后不能生成报告
            redisUtils.lSet(CommonConstant.SAAS_LAST_SERVER+diagnosticId,diagnosticId);
        }
        return ResultBody.ok().data(userProductData);
    }


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

@@ -157,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);
    }

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

    /**

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java

@@ -835,7 +835,11 @@
                            //创建字典数据
                            sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK);
                            //将名称汉字转为拼音
                            sysDictionaries.setDictionariesKey(Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true)));
                            String keyStr=Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true));
                            if (keyStr.length()>50) {
                                keyStr=keyStr.substring(0,49);
                            }
                            sysDictionaries.setDictionariesKey(keyStr);
                            sysDictionaries.setDictionariesName(userRegVo.getDoctorRank());
                            sysDictionaries.setCreateUserId(createUserId);
                            sysDictionaries.setCreateUserName(createUserName);

 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java

@@ -315,6 +315,10 @@
     * 销售主管角色code标识
     */
    public static final String SALE_MANAGER_ROLE_CODE="salemanager";
    /**
     * 用于标识存储最后一次诊断redis的key,用于防止最后一个读片后无法生成报告
     */
    public static final String SAAS_LAST_SERVER="saaslastserver";

    /**
     * 喜高PC高管角色code标识