From 81065b8fa819ee2653ee23a3574868784a9be412 Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Fri, 26 Feb 2021 16:10:34 +0800
Subject: [PATCH] 运营平台添加医生或H端添加医生密码为默认的

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |  308 ++++++++++++++++++++++++++------------------------
 1 files changed, 159 insertions(+), 149 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 26f5f57..744856f 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -4,7 +4,6 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kidgrow.common.constant.CommonConstant;
 import com.kidgrow.common.constant.DictionariesConstants;
@@ -19,6 +18,7 @@
 import com.kidgrow.common.utils.AesUtils;
 import com.kidgrow.common.utils.DateUtils;
 import com.kidgrow.common.utils.Pinyin4jUtil;
+import com.kidgrow.oprationcenter.feign.ProductOrderService;
 import com.kidgrow.redis.util.RedisUtils;
 import com.kidgrow.sms.feign.SmsChuangLanService;
 import com.kidgrow.sms.model.ConstantSMS;
@@ -90,17 +90,28 @@
     private SysUserRoleMapper sysUserRoleMapper;
     @Autowired
     private SysOrganizationMapper sysOrganizationMapper;
+    @Autowired
+    private ProductOrderService productOrderService;
+
 
     @Override
     public LoginAppUser findByUsername(String username) {
         SysUser sysUser = this.selectByUsername(username);
-        return getLoginAppUser(sysUser);
+        if (sysUser == null) {
+            return null;
+        } else {
+            return getLoginAppUser(sysUser);
+        }
     }
 
     @Override
     public LoginAppUser findByOpenId(String username) {
         SysUser sysUser = this.selectByOpenId(username);
-        return getLoginAppUser(sysUser);
+        if (sysUser == null) {
+            return null;
+        } else {
+            return getLoginAppUser(sysUser);
+        }
     }
 
     @Override
@@ -112,29 +123,26 @@
     /**
      * 获取登录用户的一系列信息 hrj 06-04修改
      *
-     * @param sysUser
+     * @param sysUserNew
      * @return
      */
     @Override
-    public LoginAppUser getLoginAppUser(SysUser sysUser) {
+    public LoginAppUser getLoginAppUser(SysUser sysUserNew) {
+        log.error(sysUserNew.toString());
         LoginAppUser loginAppUser = new LoginAppUser();
-        SysUser sysUserNew = this.baseMapper.selectById(sysUser);
+        SysUser sysUser = this.baseMapper.selectById(sysUserNew);
         if (sysUser != null) {
-            //返回的数据为什么要把密码也返回?清空!!
-            loginAppUser.setPassword("");
-            loginAppUser.setNewPassword("");
-            loginAppUser.setOldPassword("");
-
             BeanUtils.copyProperties(sysUser, loginAppUser);
             //获取用户所属组织机构列表
-            loginAppUser.setDefaultAuth(sysUserNew.getDefaultAuth());
+            loginAppUser.setDefaultAuth(sysUser.getDefaultAuth());
             List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId());
             //设置组织机构集合
-            loginAppUser.setOrganizations(sysOrganizations);
+            if (sysOrganizations != null) {
+                loginAppUser.setOrganizations(sysOrganizations);
+            }
             List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId());
             // 设置角色
             loginAppUser.setRoles(sysRoles);
-
             if (!CollectionUtils.isEmpty(sysRoles)) {
                 Set<Long> roleIds = sysRoles.parallelStream().map(SuperEntity::getId).collect(Collectors.toSet());
                 List<SysMenu> menus = roleMenuMapper.findMenusByRoleIds(roleIds, CommonConstant.PERMISSION);
@@ -145,15 +153,12 @@
                     loginAppUser.setPermissions(permissions);
                 }
             }
-            //是否医院管理员
-            com.kidgrow.usercenter.model.SysDoctor sysDoctor = findDoctorByUserId(sysUser.getId());
-            if (sysDoctor.getIsAdminUser() != null) {
-                loginAppUser.setHAdminUser(sysDoctor.getIsAdminUser());
-            }
-            //医院信息 只有H端要返回的信息
-            if (sysUser.getTenantId().toLowerCase().equals(CommonConstant.H_TENANT.toLowerCase())) {
-                DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId());
+            //医院信息
+            DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId());
+            if (doctorUserAllVo != null) {
                 loginAppUser.setDoctorUserAllVO(doctorUserAllVo);
+                //是否医院管理员
+                loginAppUser.setHAdminUser(doctorUserAllVo.getIsAdminUser());
             }
         }
         return loginAppUser;
@@ -270,7 +275,7 @@
         String oldTel = MapUtils.getString(params, "oldTel");
         String newTel = AesUtils.desEncrypt(MapUtils.getString(params, "newTel")).trim();
         String authCode = AesUtils.desEncrypt(MapUtils.getString(params, "authCode")).trim();
-        String userPassword = AesUtils.desEncrypt(MapUtils.getString(params, "userPassword")).trim();
+        String userPassword =MapUtils.getString(params, "userPassword");
 
         if (id > 0 && StringUtils.isNotBlank(oldTel) && StringUtils.isNotBlank(newTel) && StringUtils.isNotBlank(authCode) && StringUtils.isNotBlank(userPassword)) {
             //检查验证码
@@ -296,8 +301,8 @@
                         com.kidgrow.usercenter.model.SysDoctor newsysDoctorModel = new com.kidgrow.usercenter.model.SysDoctor();
                         if (sysDoctorModel != null) {
                             //理论上只有一个,如果有多个 只取第一个
-                            newsysDoctorModel.setId(sysDoctorModel.getId());
-                            newsysDoctorModel.setDoctorTel(newTel);
+                            sysDoctorModel.setId(sysDoctorModel.getId());
+                            sysDoctorModel.setDoctorTel(newTel);
                             sysDoctorMapper.updateById(newsysDoctorModel);
                         }
                         if (baseMapper.updateById(user) > 0) {
@@ -324,15 +329,13 @@
         Page<SysUser> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
         List<SysUser> list = baseMapper.findList(page, params);
         long total = page.getTotal();
-        if (total > 0) {
+        if (total > 0&&list.size()>0) {
             List<Long> userIds = list.stream().map(SysUser::getId).collect(Collectors.toList());
-
-            List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds);
-
-//            Map<String, Object> map = new HashMap<String, Object>();
-//            List<SysOrganization> sysOrganizationList=organizationService.fin();
-            list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId()))
-                    .collect(Collectors.toList())));
+            if (userIds.size()>0) {
+                List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds);
+                list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId()))
+                        .collect(Collectors.toList())));
+            }
         }
         return PageResult.<SysUser>builder().data(list).code(0).count(total).build();
     }
@@ -464,8 +467,8 @@
 
     @Override
     public ResultBody findCountByMap(Map<String, Object> map) {
-        map.put("enable",1);
-        map.put("is_del",0);
+        map.put("enable", 1);
+        map.put("isDel", 0);
         Integer integer = baseMapper.selectCountByMap(map);
         return ResultBody.ok().data(integer);
     }
@@ -670,6 +673,10 @@
         Long createUserId = CommonConstant.CREATE_USER_ID;
         //创建人名称
         String createUserName = CommonConstant.CREATE_USER_NAME;
+        //销售服务人员
+        SysUser sysUserSale = baseMapper.selectById(CommonConstant.SALE_USER_ID);
+        //运营服务人员
+        SysUser sysUserOpration = baseMapper.selectById(CommonConstant.OPRATION_USER_ID);
         //是否注册用户
         Boolean isReg = false;
         //业务成功
@@ -677,8 +684,8 @@
         //业务失败提示信息
         String expMsg = "";
         //系统内置的注册医院和科室的组织数据
-        Long organizationHos = CommonConstant.HOSPITAL_ORG_ID;
-        Long organizationDep = CommonConstant.DEPARTMENT_ORG_ID;
+        Long organizationHos = 0L;
+        Long organizationDep = 0L;
         //检查判断是注册 还是添加用户,注册用户先走基本数据建设 医院/科室
         SysUserOrg sysUserOrgH = new SysUserOrg();
         SysUserOrg sysUserOrgD = new SysUserOrg();
@@ -688,50 +695,83 @@
             isReg = true;
             if (CheckVerificationCode(ConstantSMS.REGISTER_SMS, userRegVo.getMobile(), userRegVo.getVerification())) {
                 userRegVo.setDoctorState(true);
-                //写医院数据
-                SysHospital sysHospital = new SysHospital();
-                sysHospital.setHospitalName(userRegVo.getHospitalName());
-                sysHospital.setOrgId(organizationHos);
-                //注册的用户所在医院默认是试用状态
-                sysHospital.setHospitalState(0);
-                sysHospital.setCreateUserId(createUserId);
-                sysHospital.setCreateUserName(createUserName);
-
-                boolean h = hospitalService.save(sysHospital);
-                if (h) {
-                    userRegVo.setHospitalId(sysHospital.getId());
-                    //保存科室数据
-                    SysDepartment sysDepartment = new SysDepartment();
-                    sysDepartment.setOrgId(organizationDep);
-                    sysDepartment.setDepartmentName(userRegVo.getDepartmentName());
-                    sysDepartment.setSaleUserId(createUserId);
-                    sysDepartment.setAccountsCount(1);
-                    sysDepartment.setSaleUserName(createUserName);
-                    sysDepartment.setSaleUserTel("0");
-                    sysDepartment.setServerUserId(createUserId);
-                    sysDepartment.setServerUserTel("0");
-                    sysDepartment.setServerUserName(createUserName);
-                    boolean d = departmentService.save(sysDepartment);
-                    if (!d) {
-                        isSuccess = false;
-                        expMsg = "科室数据写入失败";
+                //写医院组织数据
+                SysOrganization sysOrganizationH = new SysOrganization();
+                sysOrganizationH.setOrgLevel(1);
+                sysOrganizationH.setOrgAttr(1);
+                sysOrganizationH.setOrgParentId(CommonConstant.ORG_PARENT_ID);
+                sysOrganizationH.setOrgName(userRegVo.getHospitalName());
+                sysOrganizationH.setCreateUserId(createUserId);
+                sysOrganizationH.setCreateUserName(createUserName);
+                if (organizationService.save(sysOrganizationH)) {
+                    organizationHos=sysOrganizationH.getId();
+                    //写科室组织数据
+                    SysOrganization sysOrganizationD = new SysOrganization();
+                    sysOrganizationD.setOrgLevel(2);
+                    sysOrganizationD.setOrgAttr(2);
+                    sysOrganizationD.setOrgParentId(sysOrganizationH.getId());
+                    sysOrganizationD.setOrgName(userRegVo.getDepartmentName());
+                    sysOrganizationD.setCreateUserId(createUserId);
+                    sysOrganizationD.setCreateUserName(createUserName);
+                    if (organizationService.save(sysOrganizationD)) {
+                        organizationDep=sysOrganizationD.getId();
+                        //写医院组织数据
+                        SysHospital sysHospital = new SysHospital();
+                        sysHospital.setHospitalName(userRegVo.getHospitalName());
+                        sysHospital.setOrgId(sysOrganizationH.getId());
+                        //注册的用户所在医院默认是试用状态
+                        sysHospital.setHospitalState(0);
+                        sysHospital.setCreateUserId(createUserId);
+                        sysHospital.setCreateUserName(createUserName);
+                        if (hospitalService.save(sysHospital)) {
+                            userRegVo.setHospitalId(sysHospital.getId());
+                            //保存科室数据
+                            SysDepartment sysDepartment = new SysDepartment();
+                            sysDepartment.setOrgId(sysOrganizationD.getId());
+                            sysDepartment.setDepartmentName(userRegVo.getDepartmentName());
+                            sysDepartment.setSaleUserId(sysUserSale.getId());
+                            sysDepartment.setAccountsCount(1);
+                            sysDepartment.setSaleUserName(sysUserSale.getNickname());
+                            sysDepartment.setSaleUserTel(sysUserSale.getMobile());
+                            sysDepartment.setServerUserId(sysUserOpration.getId());
+                            sysDepartment.setServerUserTel(sysUserOpration.getMobile());
+                            sysDepartment.setServerUserName(sysUserOpration.getNickname());
+                            sysDepartment.setCreateUserId(createUserId);
+                            sysDepartment.setCreateUserName(createUserName);
+                            if (departmentService.save(sysDepartment)) {
+                                userRegVo.setDepartmentId(sysDepartment.getId());
+                                //自动充入系统指定的试用套餐
+                                if (!saveProductDetail(sysHospital.getId(),
+                                        sysDepartment.getId(),
+                                        sysHospital.getHospitalName(),
+                                        sysDepartment.getDepartmentName())) {
+                                    isSuccess = false;
+                                    expMsg = "试用套餐充值失败";
+                                }
+                            } else {
+                                isSuccess = false;
+                                expMsg = "科室数据写入失败";
+                            }
+                        } else {
+                            isSuccess = false;
+                            expMsg = "医院数据写入失败";
+                        }
                     } else {
-                        userRegVo.setDepartmentId(sysDepartment.getId());
+                        isSuccess = false;
+                        expMsg = "科室组织数据写入失败";
                     }
                 } else {
                     isSuccess = false;
-                    expMsg = "医院数据写入失败";
+                    expMsg = "医院组织数据写入失败";
                 }
             } else {
                 return ResultBody.failed("无效的验证码");
             }
         }
 
-        //业务执行中途出错  手动撤回数据
+        //业务执行中途出错
         if (isReg && !isSuccess) {
-            RollBackData(userRegVo.getHospitalId(),
-                    userRegVo.getDepartmentId(), 0L, 0L,
-                    0L, 0L, 0L);
+            //注册过程失败
             return ResultBody.failed(expMsg);
         }
         if (!isReg && departmetAccountsCount(userRegVo.getDepartmentId()) < 1) {
@@ -758,10 +798,14 @@
             sysUser.setType(UserType.DOCTOR.name());
         }
         sysUser.setHAdminUser(false);
-        sysUser.setDefaultAuth(false);
+        if(isReg){
+            sysUser.setDefaultAuth(false);
+        }else{
+            sysUser.setDefaultAuth(true);
+        }
         sysUser.setOpenId(userRegVo.getOpenId());
         sysUser.setDel(false);
-        sysUser.setTenantId("hospital");
+        sysUser.setTenantId(CommonConstant.H_TENANT);
         boolean u = this.save(sysUser);
         SysRoleUser sysRoleUser = new SysRoleUser();
         if (u) {
@@ -782,22 +826,27 @@
                     if (StringUtils.isNotBlank(userRegVo.getDoctorRank())) {
                         //检查医生职务是否存在
                         Map<String, Object> selectMap = new HashMap<>();
-                        selectMap.put("dictionariesName", userRegVo.getDoctorRank());
+                        selectMap.put("dictionariesNameAll", userRegVo.getDoctorRank().trim());
                         List<SysDictionaries> dictionariesList = sysDictionariesService.findAll(selectMap);
                         boolean dicBool = false;
                         if (dictionariesList.size() > 0) {
                             for (int i = dictionariesList.size() - 1; i >= 0; i--) {
-                                if (dictionariesList.get(i).getDictionariesName().equals(userRegVo.getDoctorRank())) {
+                                if (dictionariesList.get(i).getDictionariesName().trim().equals(userRegVo.getDoctorRank().trim())) {
                                     userRegVo.setDoctorRankId(dictionariesList.get(i).getId());
                                     dicBool = true;
                                     break;
                                 }
                             }
-                        } else {
+                        }
+                        else {
                             //创建字典数据
                             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);
@@ -809,6 +858,10 @@
 
                         if (dicBool) {
                             //写用户组织关系表
+                            SysHospital byId = hospitalService.getById(userRegVo.getHospitalId());
+                            if(byId!=null){
+                                organizationHos=byId.getOrgId();
+                            }
                             List<SysUserOrg> sysUserOrgList = new ArrayList<SysUserOrg>();
                             sysUserOrgH.setUserId(sysUser.getId());
                             sysUserOrgH.setOrgId(organizationHos);
@@ -817,7 +870,10 @@
                             sysUserOrgH.setCreateUserId(isReg ? createUserId : sysUserd.getId());
                             sysUserOrgH.setCreateUserName(isReg ? createUserName : sysUserd.getUsername());
                             sysUserOrgList.add(sysUserOrgH);
-
+                            SysDepartment department = departmentService.getById(userRegVo.getDepartmentId());
+                            if(department!=null){
+                                organizationDep=department.getOrgId();
+                            }
                             sysUserOrgD.setUserId(sysUser.getId());
                             sysUserOrgD.setOrgId(organizationDep);
                             sysUserOrgD.setFromId(userRegVo.getDepartmentId());
@@ -841,10 +897,11 @@
                                 sysDoctor.setDoctorState(!isReg);
                                 sysDoctor.setDoctorTel(userRegVo.getMobile());
                                 sysDoctor.setDoctorName(userRegVo.getNickname());
-                                sysDoctor.setServerUserId(isReg ? createUserId : sysUserd.getId());
-                                sysDoctor.setServerUserName(isReg ? createUserName : sysUserd.getUsername());
+                                sysDoctor.setServerUserId(isReg ? sysUserSale.getId() : sysUserd.getId());
+                                sysDoctor.setServerUserName(isReg ? sysUserSale.getNickname() : sysUserd.getUsername());
                                 sysDoctor.setIsAdminUser(false);
-                                sysDoctor.setEnabled(!isReg);
+                                sysDoctor.setDoctorCcie(userRegVo.getDoctorCcie());
+                                sysDoctor.setEnabled(true);
                                 if (sysDoctorMapper.insert(sysDoctor) == 1) {
                                     //非自主注册的 返回信息带密码
                                     if (!isReg) {
@@ -883,11 +940,6 @@
         }
         /***返回数据***/
         if (!isSuccess) {
-            //撤回数据
-            RollBackData(0L,
-                    0L, sysUser.getId(), sysUserOrgH.getId(),
-                    sysUserOrgH.getId(), sysDictionaries.getId(),
-                    sysDoctor.getId());
             return ResultBody.failed(expMsg);
         } else {
             return ResultBody.ok().data(sysUser);
@@ -895,41 +947,22 @@
     }
 
     /**
-     * 手动撤回数据,需要撤回那个,给那个id传值,不需要的传0
+     * feign客户端调用写入试用套餐
      *
      * @param hospitalId
      * @param departmentId
-     * @param userId
-     * @param userOrgIdH
-     * @param userOrgIdD
-     * @param dicId
-     * @param doctorId
+     * @param hospitalName
+     * @param departmentName
+     * @return
      */
-    private void RollBackData(Long hospitalId, Long departmentId,
-                              Long userId, Long userOrgIdH, Long userOrgIdD,
-                              Long dicId, Long doctorId) {
-        if (hospitalId > 0) {
-            hospitalService.removeById(hospitalId);
-        }
-        if (departmentId > 0) {
-            departmentService.removeById(departmentId);
-        }
-        if (userId > 0) {
-            baseMapper.deleteById(userId);
-            sysUserRoleMapper.deleteById(userId);
-        }
-        if (userOrgIdH > 0) {
-            sysUserRoleMapper.deleteById(userOrgIdH);
-        }
-        if (userOrgIdD > 0) {
-            sysUserRoleMapper.deleteById(userOrgIdD);
-        }
-        if (dicId > 0) {
-            sysDictionariesService.removeById(dicId);
-        }
-        if (doctorId > 0) {
-            sysDoctorMapper.deleteById(doctorId);
-        }
+    private boolean saveProductDetail(Long hospitalId, Long departmentId, String hospitalName, String departmentName) {
+        Map<String, Object> params = new HashMap<String, Object>();
+        params.put("hospitalId", hospitalId);
+        params.put("departmentId", departmentId);
+        params.put("hospitalName", hospitalName);
+        params.put("departmentName", departmentName);
+        ResultBody resultBody = productOrderService.saveProductDetail(params);
+        return (boolean) resultBody.getData();
     }
 
     /**
@@ -948,6 +981,9 @@
             } else {
                 listVoList = baseMapper.hospitalDoctorList(hospitalId, departmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID);
             }
+            listVoList.sort((e1,e2)->
+                e2.getUserId().compareTo(e1.getUserId())
+            );
             return ResultBody.ok().data(listVoList);
         } else {
             return ResultBody.failed("医院数据有误");
@@ -964,6 +1000,7 @@
         Map<String, Object> selectMap = new HashMap<>();
         selectMap.put("mobile", phone);
         selectMap.put("is_del", 0);
+        selectMap.put("tenant_id", "hospital");
         List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
         return (sysUsers.size() > 0);
     }
@@ -979,20 +1016,18 @@
         if (sysDepartment == null) {
             return 0;
         } else {
-            Long sysHospitalId=HospitalIdByDepartmentId(depatmentId);
-            if (sysHospitalId>0) {
+            Long sysHospitalId = HospitalIdByDepartmentId(depatmentId);
+            if (sysHospitalId > 0) {
                 List<HospitalDoctorListVo> hospitalDoctorListVos = baseMapper.hospitalDoctorList(sysHospitalId, depatmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID);
                 if (hospitalDoctorListVos != null) {
                     int doctorCount = hospitalDoctorListVos.size();
                     int accountCount = sysDepartment.getAccountsCount().intValue();
-                    int liveCount=accountCount - doctorCount;
+                    int liveCount = accountCount - doctorCount;
                     return liveCount;
                 } else {
                     return 0;
                 }
-            }
-            else
-            {
+            } else {
                 return 0;
             }
         }
@@ -1026,31 +1061,6 @@
         }
         return hospitalId;
     }
-    /**
-     * 根据部门的id获取所属医院id
-     *
-     * @return
-     */
-//    public List<Long> DepartmentIdListByhospitalId(Long hospitalId) {
-//        List<Long> hospitalIdList =new ArrayList<Long>();
-//        SysHospital sysHospital = hospitalService.getById(hospitalId);
-//        if (sysHospital != null) {
-//            //先获取医院的组织数据
-//            SysOrganization sysOrganization = sysOrganizationMapper.selectById(sysHospital.getOrgId());
-//            if (sysOrganization != null) {
-//                    //根据组织id获取下级科室组织id
-//                    Map<String, Object> selectMap = new HashMap<>();
-//                    selectMap.put("org_parent_id", sysOrganization.getId());
-//                    List<SysOrganization> sysDepartmentList = sysOrganizationMapper.selectByMap(selectMap);
-//                    if (sysDepartmentList != null && sysDepartmentList.size() > 0) {
-//                        //hospitalIdList=sysDepartmentList.stream().sorted(Comparator.comparing(SysOrganization::getCreateTime).reversed()).map(SysOrganization::getId).collect(Collectors.toList());
-//                        sysDepartmentList.stream().sorted(Comparator.comparing(SysOrganization::getCreateTime).reversed()).map(SysOrganization::getId).collect(Collectors.toList()).get(0);
-//                    }
-//            }
-//        }
-//        return hospitalIdList;
-//    }
-
 
     /**
      * 检查用户登录名是否已经注册 true存在  false不存在
@@ -1114,8 +1124,8 @@
         QueryWrapper<SysDoctor> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", id);
         List<SysDoctor> sysDoctors = sysDoctorMapper.selectList(queryWrapper);
-        if(!sysDoctors.isEmpty()){
-            sysDoctors.forEach(e->{
+        if (!sysDoctors.isEmpty()) {
+            sysDoctors.forEach(e -> {
                 e.setIsDel(true);
                 sysDoctorMapper.updateById(e);
             });

--
Gitblit v1.8.0