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

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/SpecialistScreenResultController.java

@@ -35,7 +35,7 @@ public class SpecialistScreenResultController extends EnvelopRestEndpoint {
    public MixEnvelop<SurveyScreenResultVo, SurveyScreenResultVo> createSpecialistPatientRelation(@ApiParam(name = "doctor", value = "专科医生ID")@RequestParam(value = "doctor")String doctor,
                                                                            @ApiParam(value = "当前页")@RequestParam(value = "pageNo") int pageNo,
                                                                            @ApiParam(value = "显示记录数")@RequestParam(value = "pageSize") int pageSize,
                                                                            @ApiParam(value = "1已跟踪 2已预约")@RequestParam(value = "type",required = false) int type){
                                                                            @ApiParam(value = "1已跟踪 2已预约 3已接诊 4待处理")@RequestParam(value = "type",required = false) int type){
        try {
            return specialistScreenResultService.getScreenList(doctor,type,pageNo,pageSize);
        }catch (Exception e){