Merge branch 'dev' of liuwenbin/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/LoginController.java

@@ -179,6 +179,7 @@ public class LoginController extends BaseController {
                    List<Map<String, String>> roleMap = roleService.getUserRoleAndArea(doctor.getCode());
                    map.put("userRole", roleMap);
                    //医生当前登录的角色
                    List<Map<String, Object>> list = doctorInfoService.getDoctorManagerRole(doctor.getCode(),"Manage_Article_Authentication");
                    if(roleMap.size()>0){
                        for(Map<String, String> one:roleMap){
@@ -187,6 +188,12 @@ public class LoginController extends BaseController {
                                continue;
                            }
                        }
                        if(list.size()>0&&!org.springframework.util.StringUtils.isEmpty(list.get(0).get("code"))){
                            map.put("doctorAuthOperate", "1");
                        }else{
                            map.put("doctorAuthOperate", "0");
                        }
                    }else{
                        Map<String, String> one = new HashMap<>();
                        one.put("isManage","0");
@@ -194,7 +201,7 @@ public class LoginController extends BaseController {
                        one.put("name", doctor.getHospitalName());
                        one.put("areas", "");
                        one.put("level","4");
                        List<Map<String, Object>> list = doctorInfoService.getDoctorManagerRole(doctor.getCode(),"Manage_Article_Authentication");
                        if(list.size()>0&&!org.springframework.util.StringUtils.isEmpty(list.get(0).get("code"))){
                            one.put("authOperate", "1");
                        }else{
@@ -282,9 +289,10 @@ public class LoginController extends BaseController {
                    map.put("userRole", roleMap);
                    //医生当前登录的角色
                     if(roleMap.size()>0){
                    List<Map<String, Object>> list = doctorInfoService.getDoctorManagerRole(doctor.getCode(),"Manage_Article_Authentication");
                    if(roleMap.size()>0){
                        for(Map<String, String> one:roleMap){
                         for(Map<String, String> one:roleMap){
                            if("1".equals(one.get("high"))){
                                one.remove("high");
                                map.put("currentUserRole", one);
@@ -292,14 +300,18 @@ public class LoginController extends BaseController {
                            }
                            one.remove("high");
                        }
                    }else{
                        Map<String, String> one = new HashMap<>();
                        one.put("isManage","0");
                        one.put("code", doctor.getHospital());
                        one.put("name", doctor.getHospitalName());
                        one.put("areas", "");
                        one.put("level","4");
                        List<Map<String, Object>> list = doctorInfoService.getDoctorManagerRole(doctor.getCode(),"Manage_Article_Authentication");
                         if(list.size()>0&&!org.springframework.util.StringUtils.isEmpty(list.get(0).get("code"))){
                             map.put("doctorAuthOperate", "1");
                         }else{
                             map.put("doctorAuthOperate", "0");
                         }
                     }else{
                         Map<String, String> one = new HashMap<>();
                         one.put("isManage","0");
                         one.put("code", doctor.getHospital());
                         one.put("name", doctor.getHospitalName());
                         one.put("areas", "");
                         one.put("level","4");
                        if(list.size()>0&&!org.springframework.util.StringUtils.isEmpty(list.get(0).get("code"))){
                            one.put("authOperate", "1");
                        }else{

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

@@ -117,6 +117,7 @@ public class DoctorController extends BaseController {
            List<Map<String, String>> roleMap = roleService.getUserRoleAndArea(doctor.getCode());
            map.put("userRole", roleMap);
            //医生当前登录的角色
            List<Map<String, Object>> list = doctorInfoService.getDoctorManagerRole(doctor.getCode(),"Manage_Article_Authentication");
            if(roleMap.size()>0){
                for(Map<String, String> one:roleMap){
@@ -125,14 +126,33 @@ public class DoctorController extends BaseController {
                        continue;
                    }
                }
                if(list.size()>0&&!org.springframework.util.StringUtils.isEmpty(list.get(0).get("code"))){
                    map.put("doctorAuthOperate", "1");
                }else{
                    map.put("doctorAuthOperate", "0");
                }
            }else{
//                Map<String, String> one = new HashMap<>();
//                one.put("isManage","0");
//                one.put("code", doctor.getHospital());
//                one.put("name", doctor.getHospitalName());
//                one.put("areas", "");
//                one.put("level","4");
//                one.put("authOperate", "0");
//                map.put("currentUserRole", one);
                Map<String, String> one = new HashMap<>();
                one.put("isManage","0");
                one.put("code", doctor.getHospital());
                one.put("name", doctor.getHospitalName());
                one.put("areas", "");
                one.put("level","4");
                one.put("authOperate", "0");
                if(list.size()>0&&!org.springframework.util.StringUtils.isEmpty(list.get(0).get("code"))){
                    one.put("authOperate", "1");
                }else{
                    one.put("authOperate", "0");
                }
                map.put("currentUserRole", one);
            }
            if ("10" .equals(doctor.getLevel()) && roleMap.size() == 0) {