Merge branch 'dev' of shikejing/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/course/PatientCourseEndpoint.java

@@ -179,10 +179,11 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
    @GetMapping("getOrgInfoById")
    @ApiOperation(value = "在线报名-获取机构详情")
    public ObjEnvelop getOrgInfoById(
            @ApiParam(name = "id", value = "机构id", defaultValue = "808080eb7861c327017861d18d070011") @RequestParam(value = "id", required = true) String id
            @ApiParam(name = "id", value = "机构id", defaultValue = "808080eb7861c327017861d18d070011") @RequestParam(value = "id", required = true) String id,
            @ApiParam(name = "patient", value = "居民code") @RequestParam(value = "patient", required = true) String patient
    ) {
        try {
            JSONObject json = courseService.getOrgInfoById(id);
            JSONObject json = courseService.getOrgInfoById(id,patient);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            e.printStackTrace();

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/course/CourseService.java

@@ -653,7 +653,7 @@ public class CourseService {
        return object;
    }
    public JSONObject getOrgInfoById(String id){
    public JSONObject getOrgInfoById(String id,String patient){
        JSONObject object = new JSONObject();
        String sql = "SELECT o.id,rs.id recruitId,o.`code`,o.`name`,o.mobile,o.photo,o.address,o.brief,rs.start_time startTime,rs.end_time endTime,rs.num,rs.fee,rs.id rsId \n" +
                "FROM base_org o,base_recruit_students rs\n" +
@@ -703,6 +703,17 @@ public class CourseService {
            }
            object.put("count",count);//已报名人数
            //判断用户是否已录取
            String statusSql = "SELECT rsr.`status` status FROM base_recruit_students rs , base_recruit_students_record rsr WHERE rs.id = rsr.recruit_students_id AND rs.del = 1 AND rsr.org_code = rs.org_code AND rsr.org_code = '"+mapList.get(0).get("code")+"' AND rsr.patient = '"+patient+"'";
            List<Map<String , Object>> status = jdbcTemplate.queryForList(statusSql);
            if (status.size() == 0){
                object.put("status",0); //未报名
            }else {
                object.put("status",status.get(0).get("status")); //未报名
            }
        }else {
            String sql1 = "SELECT o.id,o.`code`,o.`name`,o.mobile,o.photo,o.address,o.brief " +
                    "FROM base_org o " +
@@ -722,6 +733,7 @@ public class CourseService {
            }else {
                object.put("allDoctor","");//教师
            }
            object.put("num",-1);//招生名额(未开放报名)
        }
        return object;
    }

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;
        }
//        }
    }
}