111

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doctor/DoctorEndpoint.java

@@ -171,10 +171,11 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "getNotificationCount")
    @ApiOperation(value = "教师首页-上门辅导待完成工单、在线咨询未回复、消息列表未回复")
    public ObjEnvelop getNotificationCount(
            @ApiParam(name = "doctor", value = "doctor", defaultValue = "4028030c796376b801796380a2b50003") @RequestParam(value = "doctor",required = true) String doctor,
            @ApiParam(name = "type", value = "type", defaultValue = "0") @RequestParam(value = "type",required = false) Integer type){
            @ApiParam(name = "doctor", value = "doctor", defaultValue = "4028030c796376b801796380a2b50003") @RequestParam(value = "doctor",required = true) String doctor
//            ,@ApiParam(name = "type", value = "type", defaultValue = "0") @RequestParam(value = "type",required = false) Integer type
    ){
        try {
            return ObjEnvelop.getSuccess("查询成功",doctorService.getNotificationCount(doctor,type));
            return ObjEnvelop.getSuccess("查询成功",doctorService.getNotificationCount(doctor));//,type
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败");

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doctor/CareDoctorService.java

@@ -301,19 +301,21 @@ public class CareDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        return result;
    }
    public JSONObject getNotificationCount(String doctor,Integer type){
    public JSONObject getNotificationCount(String doctor){ //,Integer type
        JSONObject object = new JSONObject();
        // 上门辅导工单 待完成
        List<BaseDoorCoachOrderDO> coachOrderDOList = baseDoorCoachOrderDao.getUnFinishOrderByDoctor(doctor);
        if (type > 0){
            return object;
        }else {
//        if (type > 0){
//            return object;
//        }else {
            Integer unreadMessageCount = imService.SessionsUnreadMessageCountByUserId(doctor);
            object.put("unreadMessageCount",unreadMessageCount);
            object.put("unreadMessageCount",unreadMessageCount);//未读消息数量
            object.put("doorCoachOrder",coachOrderDOList.size());//上门辅导待完成数量
            Integer unConsultMsgCount = imService.SessionsUnreadMessageCount(doctor,"23");
            object.put("unConsultMsgCount",unConsultMsgCount);//咨询未读消息数量
            return object;
        }
//        }
    }
}