| 
					
				 | 
			
			
				@ -32,16 +32,17 @@ public class SpecialistScreenResultController extends EnvelopRestEndpoint { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @GetMapping(value = SpecialistMapping.screen.getScreenResult) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ApiOperation(value = "专科医生获取筛查记录列表") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public MixEnvelop<SurveyScreenResultVo, SurveyScreenResultVo> createSpecialistPatientRelation(@ApiParam(name = "doctor", value = "专科医生ID")@RequestParam(value = "doctor")String doctor, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public MixEnvelop<SurveyScreenResultVo, SurveyScreenResultVo> createSpecialistPatientRelation(@ApiParam(name = "doctor", value = "专科医生ID")@RequestParam(value = "doctor",required = false)String doctor, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                            @ApiParam(value = "当前页")@RequestParam(value = "pageNo") int pageNo, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                            @ApiParam(value = "显示记录数")@RequestParam(value = "pageSize") int pageSize, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                            @ApiParam(value = "搜索居民的姓名或身份证") @RequestParam(value = "patientName", required = false) String patientName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                            @ApiParam(value = "1已跟踪 2已预约 3已接诊 4待处理")@RequestParam(value = "type",required = false) Integer type, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                            @ApiParam(value = "是否高危预警(0否 1是)") @RequestParam(value = "isDanger", required = false) String isDanger, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                            @ApiParam(value = "疾病类型") @RequestParam(value = "diseaseType", required = false) String diseaseType, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                            @ApiParam(value = "传1则根据类型查一条数据")@RequestParam(value = "filterType",required = false,defaultValue = "0")Integer filterType){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                            @ApiParam(value = "传1则根据类型查一条数据")@RequestParam(value = "filterType",required = false,defaultValue = "0")Integer filterType, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                            @ApiParam(value = "居民code")@RequestParam(required = false)String patientCode){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            return specialistScreenResultService.getScreenList(doctor,type,pageNo,pageSize,patientName, isDanger, diseaseType,filterType); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            return specialistScreenResultService.getScreenList(doctor,type,pageNo,pageSize,patientName, isDanger, diseaseType,filterType,patientCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        }catch (Exception e){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            e.printStackTrace(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            tracer.getCurrentSpan().logEvent(e.getMessage()); 
			 |