增加注释

src/main/java/com/yihu/wlyy/repository/doctor/DoctorAdminTeamMemberDao.java

@@ -41,4 +41,8 @@ public interface DoctorAdminTeamMemberDao extends
                                         @Param(value = "doctorName") String doctorName,
                                         @Param(value = "teamId") long teamId,
                                         Pageable pageable);
    @Query("SELECT d FROM AdminTeamMember m, AdminTeam t, Doctor d WHERE t.id = :teamId AND t.id = m" +
            ".teamId AND m.doctorCode = d.code and  d.code != :doctorCode and d.level != 1 ")
    List<Doctor> findAllHeathExcludeThis(long teamId, String doctorCode);
}

src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -637,21 +637,34 @@ public class DoctorInfoService extends BaseService {
    }
    public void updateTeamHealthDoctor(String newDoctorCode, String oldDoctorCode, String patient)throws Exception {
        ConsultTeam consultTeam= consultTeamDao.findByParientCodeAndSignTypeAndDoctor(patient,oldDoctorCode,2);
        if(consultTeam!=null){
            throw new Exception("存在没有关闭的健康咨询");
        //得到患者的签约信息
        SignFamily signFamily= signFamilyDao.findByPatient(patient);
        String groupCode="";
        if(StringUtils.isNoneBlank(oldDoctorCode)){
            ConsultTeam consultTeam= consultTeamDao.findByParientCodeAndSignTypeAndDoctor(patient,oldDoctorCode,2);
            if(consultTeam!=null){
                throw new Exception("存在没有关闭的健康咨询");
            }
            //修改医生服务团队 删除旧的健康管理师
            DoctorTeamMember doctorTeamMember=  doctorTeamDoctor.findMemberByTeamAndCode(signFamily.getTeamCode(),oldDoctorCode);
            doctorTeamMember.setDel("0");
            //把患者移除旧的健康管理师的患者表
            List<DoctorPatientGroupInfo>  oldDoctorPatientGroupInfos=doctorPatientGroupInfoDao.findByPatientAndDoctor(patient,oldDoctorCode);
            for(DoctorPatientGroupInfo doctorPatientGroupInfo:oldDoctorPatientGroupInfos){
                doctorPatientGroupInfo.setCzrq(new Date());
                doctorPatientGroupInfo.setStatus(0);//设置为无效
                //保存原来旧的分组
                if(Integer.valueOf(doctorPatientGroupInfo.getGroup())<4){
                    groupCode=doctorPatientGroupInfo.getGroup()+"";
                }
            }
        }
        Patient patientObj=patientDao.findByCode(patient);
        Doctor newD=doctorDao.findByCode(newDoctorCode);
        //得到患者的签约信息
        SignFamily signFamily= signFamilyDao.findByPatient(patient);
        //修改签约中的健康管理师
        signFamily.setDoctorHealth(newD.getCode());
        signFamily.setDoctorHealthName(newD.getName());
        //修改医生服务团队 删除旧的健康管理师
        DoctorTeamMember doctorTeamMember=  doctorTeamDoctor.findMemberByTeamAndCode(signFamily.getTeamCode(),oldDoctorCode);
        doctorTeamMember.setDel("0");
        //添加新的健康管理师到服务团队里
        DoctorTeamMember  newDoctorTeamMember=new DoctorTeamMember();
        newDoctorTeamMember.setTeam(signFamily.getTeamCode());
@@ -663,17 +676,7 @@ public class DoctorInfoService extends BaseService {
        newDoctorTeamMember.setDel("1");
        newDoctorTeamMember.setCode(UUID.randomUUID().toString().replace("-",""));
        doctorTeamDoctor.save(newDoctorTeamMember);
        String groupCode="";
        //把患者移除旧的健康管理师的患者表
        List<DoctorPatientGroupInfo>  oldDoctorPatientGroupInfos=doctorPatientGroupInfoDao.findByPatientAndDoctor(patient,oldDoctorCode);
        for(DoctorPatientGroupInfo doctorPatientGroupInfo:oldDoctorPatientGroupInfos){
            doctorPatientGroupInfo.setCzrq(new Date());
            doctorPatientGroupInfo.setStatus(0);//设置为无效
            //保存原来旧的分组
            if(Integer.valueOf(doctorPatientGroupInfo.getGroup())<4){
                groupCode=doctorPatientGroupInfo.getGroup()+"";
            }
        }
        //把患者加到新的健康管理师的患者表
        DoctorPatientGroupInfo doctorPatientGroupInfo = new DoctorPatientGroupInfo();
        doctorPatientGroupInfo.setCzrq(new Date());

src/main/java/com/yihu/wlyy/service/app/team/AdminTeamService.java

@@ -199,6 +199,9 @@ public class AdminTeamService extends BaseService {
    public List<Doctor> getMembers(long teamId) {
        return memberDao.findAllMembers(teamId);
    }
    public List<Doctor> getMembers(long teamId,String doctorCode) {
        return memberDao.findAllHeathExcludeThis(teamId,doctorCode);
    }
    /**
     * 获取不在当前团队内的机构成员。

src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java

@@ -1434,7 +1434,9 @@ public class DoctorController extends BaseController {
     */
    @RequestMapping(value = "/updateTeamHealthDoctors")
    @ResponseBody
    public String updateTeamHealthDoctors(String newDoctorCode,String oldDoctorCode,String patients) {
    public String updateTeamHealthDoctors(String newDoctorCode,
                                          @RequestParam(required = false)String oldDoctorCode,
                                          String patients) {
        try {
            doctorInfoService.updateTeamHealthDoctors(newDoctorCode,oldDoctorCode,patients);
            return write(200, "更新成功");

src/main/java/com/yihu/wlyy/web/doctor/team/AdminTeamController.java

@@ -34,7 +34,6 @@ public class AdminTeamController extends BaseController {
    @Autowired
    private AdminTeamService teamService;
    @Autowired
    private AdminTeamService memberService;
@@ -132,7 +131,7 @@ public class AdminTeamController extends BaseController {
    @ApiOperation(value = "获取团队成员")
    public String getTeamMembers(@PathVariable("team_id") long teamId) {
        try {
            List<Doctor> members = memberService.getMembers(teamId);
            List<Doctor> members = memberService.getMembers(teamId,getUID());
            return write(200, "OK", "data", new JSONArray(copyBeans(members, "id", "code", "name", "hospital",
                    "jobName", "level", "sex", "photo")));