From 1e0ed9d181d1c877d635f8f9b2b5a25a6b6f078f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 10 Jul 2020 15:12:57 +0800
Subject: [PATCH] 修改上传 多上传图片的bug,修改h端获取医生列表的接口

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 dd955aa..8ccdc7a 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
@@ -922,9 +922,14 @@
      * @return
      */
     @Override
-    public ResultBody hospitalDoctorList(Long hospitalId, Long departmentId) {
+    public ResultBody hospitalDoctorList(Long hospitalId, Long departmentId,Boolean isIncluddel) {
         if (hospitalId > 0 && departmentId > 0) {
-            List<HospitalDoctorListVo> listVoList = baseMapper.hospitalDoctorList(hospitalId, departmentId,CommonConstant.HOSPITAL_DOCTOR_ID,CommonConstant.HOSPITAL_ADMIN_ID);
+            List<HospitalDoctorListVo> listVoList;
+            if(isIncluddel){
+                listVoList= baseMapper.hospitalDoctorListAndDel(hospitalId, departmentId,CommonConstant.HOSPITAL_DOCTOR_ID,CommonConstant.HOSPITAL_ADMIN_ID);
+            }else {
+                listVoList=baseMapper.hospitalDoctorList(hospitalId, departmentId,CommonConstant.HOSPITAL_DOCTOR_ID,CommonConstant.HOSPITAL_ADMIN_ID);
+            }
             return ResultBody.ok().data(listVoList);
         } else {
             return ResultBody.failed("医院数据有误");
@@ -940,6 +945,7 @@
     public boolean phoneIsUsed(String phone) {
         Map<String, Object> selectMap = new HashMap<>();
         selectMap.put("mobile", phone);
+        selectMap.put("is_del", 0);
         List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
         return (sysUsers.size() > 0);
     }
@@ -950,7 +956,7 @@
      * @param depatmentId
      * @return
      */
-    private Integer departmetAccountsCount(Long depatmentId) {
+    public Integer departmetAccountsCount(Long depatmentId) {
         SysDepartment sysDepartment = departmentService.getById(depatmentId);
         if (sysDepartment == null) {
             return 0;

--
Gitblit v1.8.0