|  | @@ -5,8 +5,11 @@ import com.fs.app.controller.AppBaseController;
 | 
	
		
			
				|  |  |  import com.fs.common.annotation.RepeatSubmit;
 | 
	
		
			
				|  |  |  import com.fs.common.core.domain.AjaxResult;
 | 
	
		
			
				|  |  |  import com.fs.common.core.domain.R;
 | 
	
		
			
				|  |  | +import com.fs.medical.domain.MedicalIndicator;
 | 
	
		
			
				|  |  |  import com.fs.medical.domain.ReportIndicatorResult;
 | 
	
		
			
				|  |  |  import com.fs.medical.dto.ReportAllIndicatorCateDTO;
 | 
	
		
			
				|  |  | +import com.fs.medical.mapper.MedicalIndicatorMapper;
 | 
	
		
			
				|  |  | +import com.fs.medical.mapper.ReportIndicatorResultMapper;
 | 
	
		
			
				|  |  |  import com.fs.medical.param.ReportIndicatorResultQueryDto;
 | 
	
		
			
				|  |  |  import com.fs.medical.service.ReportIndicatorResultService;
 | 
	
		
			
				|  |  |  import com.github.pagehelper.PageHelper;
 | 
	
	
		
			
				|  | @@ -34,6 +37,8 @@ public class ReportIndicatorResultController extends AppBaseController {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      @Autowired
 | 
	
		
			
				|  |  |      private ReportIndicatorResultService reportIndicatorResultService;
 | 
	
		
			
				|  |  | +    @Autowired
 | 
	
		
			
				|  |  | +    private MedicalIndicatorMapper medicalIndicatorMapper;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      /**
 | 
	
		
			
				|  |  |       * 根据报告ID查询所有指标结果
 | 
	
	
		
			
				|  | @@ -94,7 +99,11 @@ public class ReportIndicatorResultController extends AppBaseController {
 | 
	
		
			
				|  |  |      public R getById(@PathVariable("resultId") Long resultId) {
 | 
	
		
			
				|  |  |          try {
 | 
	
		
			
				|  |  |              ReportIndicatorResult result = reportIndicatorResultService.getById(resultId);
 | 
	
		
			
				|  |  | -            return R.ok().put("data",result);
 | 
	
		
			
				|  |  | +            MedicalIndicator indicator = null;
 | 
	
		
			
				|  |  | +            if(result != null) {
 | 
	
		
			
				|  |  | +                indicator = medicalIndicatorMapper.getById(result.getIndicatorId());
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  | +            return R.ok().put("data",result).put("indicator",indicator);
 | 
	
		
			
				|  |  |          } catch (Exception e) {
 | 
	
		
			
				|  |  |              logger.error("查询检查结果详情失败", e);
 | 
	
		
			
				|  |  |              return R.error("查询失败");
 |