src/main/java/com/syjiaer/clinic/server/common/api/request/SocialRequest.java

@@ -243,9 +243,4 @@ public class SocialRequest {
         return om2208;
 
     }
-
-    public JSONObject call5102(Map<String,Object> map) {
-        JSONObject jsonObject = httpUtil.callBackMsgId("5102", "data", map, 10000);
-        return jsonObject;
-    }
 }

src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java

@@ -60,27 +60,4 @@ public class ManagerUserService extends BaseService {
         return managerUserMapper.selectList(queryWrapper);
 
     }
-
-    public ManagerUser addManager(ManagerUser user){
-        QueryWrapper<ManagerUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("username", user.getUsername());
-        queryWrapper.last("limit 1");
-        if(managerUserMapper.selectOne(queryWrapper) != null){
-            throw new MessageException("用户名已存在");
-        }
-        managerUserMapper.insert(user);
-        return user;
-    }
-
-    public ManagerUser updateManager(ManagerUser user){
-        ManagerUser dbUser = managerUserMapper.selectById(user.getId());
-        if(dbUser == null){
-            throw new MessageException("用户不存在");
-        }
-        if (!dbUser.getOrganizationMemberId().equals(user.getOrganizationMemberId())){
-            throw new MessageException("当前账号已经绑定了其他成员");
-        }
-        managerUserMapper.updateById(user);
-        return user;
-    }
 }

src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java

@@ -1,9 +1,7 @@
 package com.syjiaer.clinic.server.service.organization;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.syjiaer.clinic.server.common.api.request.SocialRequest;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.util.FileUtil;
 import com.syjiaer.clinic.server.common.vo.Page;
@@ -18,14 +16,14 @@ import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper;
 import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberSectionMapper;
 import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper;
 import com.syjiaer.clinic.server.service.BaseService;
-import com.syjiaer.clinic.server.service.common.ManagerUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 组织成员
@@ -42,11 +40,7 @@ public class OrganizationMemberService extends BaseService {
     @Autowired
     private FileUtil fileUtil;
     @Autowired
-    private ManagerUserService managerUserService;
-    @Autowired
     private ManagerUserMapper managerUserMapper;
-    @Autowired
-    private SocialRequest socialRequest;
 
     /*
      * 获取成员列表
@@ -131,11 +125,7 @@ public class OrganizationMemberService extends BaseService {
         ManagerUser user = dto.getUserInfo();
         user.setOrganizationMemberId(organizationMember.getId());
         user.setName(organizationMember.getName());
-        if (user.getId() == null) {
-            managerUserService.addManager(user);
-        }else {
-            managerUserService.updateManager(user);
-        }
+        managerUserMapper.insertOrUpdate(user);
 
     }
 
@@ -226,16 +216,4 @@ public class OrganizationMemberService extends BaseService {
         return organizationMemberMapper.selectList(memberWrapper);
 
     }
-
-
-    /**
-     * 获取医执人员信息
-     */
-    public List<Map> getMedicalProfessionals(Integer roleType){
-        Map<String,Object> map = new HashMap<>();
-        map.put("prac_psn_type",roleType);
-        JSONObject jsonObject = socialRequest.call5102(map);
-        List<Map> list = jsonObject.getJSONArray("feedetail").toJavaList(Map.class);
-        return list;
-    }
 }