| 
					
				 | 
			
			
				@ -73,48 +73,20 @@ public class HealthIndexTransform implements ILogTransform { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        // 睡觉前 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String value7 = log.has("value7") ? log.get("value7").toString() : ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value1) && value1.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MIN_BEFORE) < 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            lower = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value1) && value1.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MAX_BEFORE) > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            higher = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value2) && value2.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MIN_AFTER) < 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            lower = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value2) && value2.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MAX_AFTER) > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            higher = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value3) && value3.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MIN_BEFORE) < 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            lower = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value3) && value3.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MAX_BEFORE) > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            higher = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value4) && value4.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MIN_AFTER) < 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            lower = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value4) && value4.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MAX_AFTER) > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            higher = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value5) && value5.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MIN_BEFORE) < 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            lower = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value5) && value5.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MAX_BEFORE) > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        int v1 = ETLConstantData.xueTangBefore(value1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        int v2 = ETLConstantData.xueTangAfter(value2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        int v3 = ETLConstantData.xueTangBefore(value3); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        int v4 = ETLConstantData.xueTangAfter(value4); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        int v5 = ETLConstantData.xueTangBefore(value5); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        int v6 = ETLConstantData.xueTangAfter(value6); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        int v7 = ETLConstantData.xueTangBefore(value7); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (v1 == 1 || v2 == 1 || v3 == 1 || v4 == 1 || v5 == 1 || v6 == 1 || v7 == 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            higher = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value6) && value6.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MIN_AFTER) < 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (v1 == -1 || v2 == -1 || v3 == -1 || v4 == -1 || v5 == -1 || v6 == -1 || v7 == -1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            lower = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value6) && value6.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MAX_AFTER) > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            higher = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value7) && value7.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MIN_BEFORE) < 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            lower = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(value7) && value7.compareTo(ETLConstantData.HEALTH_STANDARD_ST_MAX_BEFORE) > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            higher = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (higher) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            UserPortrait labelInfo = new UserPortrait(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -151,27 +123,16 @@ public class HealthIndexTransform implements ILogTransform { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public List<UserPortrait> transformXueYa(JSONObject log) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        List<UserPortrait> portraits = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        boolean higher = false, lower = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        // 收缩压 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String value1 = log.has("value1") ? log.get("value1").toString() : ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        // 舒张压 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String value2 = log.has("value2") ? log.get("value2").toString() : ""; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (value1.compareTo(ETLConstantData.HEALTH_STANDARD_SSY_MIN) < 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            lower = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (value1.compareTo(ETLConstantData.HEALTH_STANDARD_SSY_MAX) > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            higher = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (value2.compareTo(ETLConstantData.HEALTH_STANDARD_SSY_MIN) < 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            lower = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (value2.compareTo(ETLConstantData.HEALTH_STANDARD_SSY_MAX) > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            higher = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        int v1 = ETLConstantData.ssy(value1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        int v2 = ETLConstantData.szy(value2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (higher) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (v1 == 1 || v2 == 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            UserPortrait labelInfo = new UserPortrait(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            labelInfo.setUserCode(log.getString("patient")); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -183,7 +144,7 @@ public class HealthIndexTransform implements ILogTransform { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            portraits.add(labelInfo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (lower) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (v1 == -1 || v2 == -1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            UserPortrait labelInfo = new UserPortrait(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            labelInfo.setUserCode(log.getString("patient")); 
			 |