From c45ba41f54c6424a20198617ff4df7433bf9e9a9 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 07 Aug 2020 18:39:59 +0800
Subject: [PATCH] 1.走查运营后台后,修改了页面所有显著错误和问题 2.修改运营后台  医院,充值,产品,套餐部分业务错误 3.增加首页数据接口

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
index 5c1eed2..ea83f82 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
@@ -9,10 +9,10 @@
 import com.kidgrow.common.utils.StringUtils;
 import com.kidgrow.redis.util.RedisConstant;
 import com.kidgrow.redis.util.RedisUtils;
-import com.kidgrow.usercenter.mapper.SysDoctorMapper;
-import com.kidgrow.usercenter.mapper.SysRoleMapper;
-import com.kidgrow.usercenter.mapper.SysUserRoleMapper;
+import com.kidgrow.usercenter.mapper.*;
+import com.kidgrow.usercenter.model.SysDepartment;
 import com.kidgrow.usercenter.model.SysDoctor;
+import com.kidgrow.usercenter.model.SysHospital;
 import com.kidgrow.usercenter.model.SysRoleUser;
 import com.kidgrow.usercenter.service.ISysDoctorService;
 import com.kidgrow.usercenter.service.ISysUserOrgService;
@@ -61,6 +61,10 @@
     private SysRoleOrganizationServiceImpl SysRoleOrganizationServiceImpl;
     @Autowired
     private SysRoleMapper sysRoleMapper;
+    @Autowired
+    private SysHospitalMapper sysHospitalMapper;
+    @Autowired
+    private SysDepartmentMapper sysDepartmentMapper;
     @Autowired
     private SysUserRoleMapper sysUserRoleMapper;
     @Autowired
@@ -125,6 +129,21 @@
         params.put("userId", userId);
         return baseMapper.deleteByMap(params);
     }
+    /**
+     * 统计医生的数量
+     * @param datatype 业务类型
+     *                 0 自注册医生
+     *                 1 签约医生
+     *                 2 医答医生
+     *                 3 C端医生
+     *                 4 H端医生
+     * @return
+     */
+    @Override
+    public int chartDoctor(int datatype) {
+        return baseMapper.chartDoctor(datatype);
+    }
+
     @Override
     public ResultBody enable(Map<String, Object> params) {
         Long aLong = MapUtils.getLong(params,"id");
@@ -193,7 +212,8 @@
          if(sysUserServiceImpl.departmetAccountsCount(sysDoctor.getDepartmentId())<=0){
              return ResultBody.failed("该部门创建人数已经达到上限");
          }
-            Long departmentId = sysDoctor.getDepartmentId();
+            SysHospital sysHospital= sysHospitalMapper.selectById(sysDoctor.getHospitalId());
+            SysDepartment sysDepartment= sysDepartmentMapper.selectById(sysDoctor.getDepartmentId());
             if (sysDoctor.getId()==null) {
                 //保存
                 SysUser sysUser=new SysUser();
@@ -239,12 +259,16 @@
                 //保存将sys_user_org 保存部门
                 SysUserOrg sysUserOrg=new SysUserOrg();
                 sysUserOrg.setUserId(sysUser.getId());
-                sysUserOrg.setOrgId(sysDoctor.getDepartmentId());
+                sysUserOrg.setFromId(sysDoctor.getDepartmentId());
+                sysUserOrg.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
+                sysUserOrg.setOrgId(sysDepartment.getOrgId());
                 //保存公司
                 sysUserOrgService.saveOrUpdate(sysUserOrg);
                 SysUserOrg sysGongsi=new SysUserOrg();
                 sysGongsi.setUserId(sysUser.getId());
-                sysGongsi.setOrgId(sysDoctor.getHospitalId());
+                sysGongsi.setOrgId(sysHospital.getOrgId());
+                sysGongsi.setFromId(sysDoctor.getHospitalId());
+                sysGongsi.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
                 sysUserOrgService.saveOrUpdate(sysGongsi);
                 //保存到Redis
                 boolean hset = redisUtils.hset(RedisConstant.USER_ORGANIZATION, sysUserOrg.getUserId().toString(), sysUserOrg);
@@ -258,12 +282,16 @@
                 SysUserOrg sysUserOrg=new SysUserOrg();
                 sysUserOrg.setUserId(getOne.getUserId());
                 sysUserOrg.setEnabled(false);
-                sysUserOrg.setOrgId(sysDoctor.getDepartmentId());
+                sysUserOrg.setFromId(sysDoctor.getDepartmentId());
+                sysUserOrg.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
+                sysUserOrg.setOrgId(sysDepartment.getOrgId());
                 sysUserOrg.setCreateTime(new Date());
                 sysUserOrgService.saveOrUpdate(sysUserOrg);
                 SysUserOrg sysGongsi=new SysUserOrg();
                 sysGongsi.setUserId(getOne.getId());
-                sysGongsi.setOrgId(sysDoctor.getHospitalId());
+                sysGongsi.setOrgId(sysHospital.getOrgId());
+                sysGongsi.setFromId(sysDoctor.getHospitalId());
+                sysGongsi.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
                 sysUserOrgService.saveOrUpdate(sysGongsi);
                 baseMapper.updateById(sysDoctor);
                 if(redisUtils.hHasKey(RedisConstant.USER_ORGANIZATION, getOne.getUserId().toString())){

--
Gitblit v1.8.0