| 
						
						
							
								
							
						
						
					 | 
					@ -221,13 +221,6 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    private Map<String, IndexInputVO<BigDecimal>> buildIndexInputVO(List<IndexGroupDetailEntity> indexList, Map<String, Object> minAndMaxMap) { | 
					 | 
					 | 
					    private Map<String, IndexInputVO<BigDecimal>> buildIndexInputVO(List<IndexGroupDetailEntity> indexList, Map<String, Object> minAndMaxMap) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        Map<String, IndexInputVO<BigDecimal>> map = new HashMap<>(); | 
					 | 
					 | 
					        Map<String, IndexInputVO<BigDecimal>> map = new HashMap<>(); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        for (IndexGroupDetailEntity index : indexList) { | 
					 | 
					 | 
					        for (IndexGroupDetailEntity index : indexList) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            IndexInputVO indexInputVO = new IndexInputVO(); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            // 指标code
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            indexInputVO.setIndexId(index.getIndexCode()); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            //权重
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            indexInputVO.setWeight(index.getWeight()); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            //阈值
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            indexInputVO.setThreshold(index.getThreshold()); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            BigDecimal minValue = null; | 
					 | 
					 | 
					            BigDecimal minValue = null; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            BigDecimal maxValue = null; | 
					 | 
					 | 
					            BigDecimal maxValue = null; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -247,10 +240,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    ScoreConstants.MAX_SCORE, | 
					 | 
					 | 
					                    ScoreConstants.MAX_SCORE, | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    Correlation.getCorrelation(index.getCorrelation()) | 
					 | 
					 | 
					                    Correlation.getCorrelation(index.getCorrelation()) | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            ); | 
					 | 
					 | 
					            ); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            indexInputVO.setScoreCalculator(scoreCalculator); | 
					 | 
					 | 
					            IndexInputVO indexInputVO = new IndexInputVO(index.getIndexCode(),new ArrayList<SampleValue<BigDecimal>>(),index.getWeight(),index.getThreshold(),scoreCalculator); | 
				
			
			
				
				
			
		
	
		
		
			
				
					 | 
					 | 
					            List<SampleValue<BigDecimal>> sampleValueList = new ArrayList<>(); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            indexInputVO.setIndexValueVOs(sampleValueList); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					            map.put(index.getIndexCode(), indexInputVO); | 
					 | 
					 | 
					            map.put(index.getIndexCode(), indexInputVO); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        return map; | 
					 | 
					 | 
					        return map; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |