Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -1454,6 +1454,9 @@ public class ConsultTeamService extends ConsultService {
        // 生成提问日志，并推送相关消息
        ConsultTeamLog infoLog = new ConsultTeamLog();
        infoLog.setConsult(ct.getConsult());
        if(content.length()>2500){
            content = content.substring(0,2500);
        }
        infoLog.setContent(content);
        infoLog.setDel("1");
        infoLog.setType(0);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/scheduling/DoctorWorkTimeService.java

@@ -11,6 +11,7 @@ import com.yihu.wlyy.repository.doctor.DoctorWorkWeekDao;
import com.yihu.wlyy.repository.doctor.FamousDoctorTimesRemainDao;
import com.yihu.wlyy.repository.message.MessageNoticeSettingDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.app.message.MessageService;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.eval.StringValueEval;
import org.json.JSONArray;
@@ -43,6 +44,8 @@ public class DoctorWorkTimeService extends BaseService {
    private FamousDoctorTimesRemainDao timesRemainDao;
    @Autowired
    private MessageNoticeSettingDao messageNoticeSettingDao;
    @Autowired
    private MessageService messageService;
    @Transactional
    public void updateDoctorWorkTime(String doctorCode) {
@@ -744,10 +747,12 @@ public class DoctorWorkTimeService extends BaseService {
        }
        //判断居民签约的全科医生是否关闭了"健康咨询在健管师邀请后参与"设置
        MessageNoticeSetting messageNoticeSetting = messageNoticeSettingDao.findByUserAndType(doctor,"1");
        if (messageNoticeSetting!=null){
        //MessageNoticeSetting messageNoticeSetting = messageNoticeSettingDao.findByUserAndType(doctor,"1");
        com.alibaba.fastjson.JSONObject re = messageService.getMessageNoticSetting(doctor,"1");
        if (re!=null){
            //健管师推荐开启,只判断健管师的时间
            if (messageNoticeSetting.getFamilyTopicSwitch()==1){
            if ("1".equals(re.getString("familyTopicSwitch"))){
                json = doctorWork(doctorHealth,week,calendar);
            }else {//健管师推荐关闭，则两个都要判断
                JSONObject doctorJson = doctorWork(doctor,week,calendar);

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) {