Merge remote-tracking branch 'origin/master' into innerDevelop

src/main/java/com/diagbot/process/PushProcess.java

@@ -59,6 +59,7 @@ public class PushProcess {
         List<String> pushDiags = Lists.newArrayList();
         PushDTO pushDTO = new PushDTO();
         IcssVo icssVo = pushVo2IcssVo(pushVo);
+//        String s = JSONObject.toJSONString(icssVo);
         Response<ResponseData> annotation = icssPushServiceClient.getAnnotation(icssVo);
         if(annotation != null){
             ResponseData data = annotation.getData();
@@ -138,9 +139,9 @@ public class PushProcess {
         List<PreResult> lis_icss = lis.stream().map(x ->{
             PreResult instantiate = BeanUtils.instantiate(PreResult.class);
             BeanUtils.copyProperties(x,instantiate);
-            instantiate.setValue(x.getValue().toString());
-            instantiate.setMaxValue(x.getMaxValue().toString());
-            instantiate.setMinValue(x.getMinValue().toString());
+            instantiate.setValue(x.getValue()==null?"":x.getValue().toString());
+            instantiate.setMaxValue(x.getMaxValue()==null?"":x.getMaxValue().toString());
+            instantiate.setMinValue(x.getMinValue()==null?"":x.getMinValue().toString());
             return instantiate;
         }).collect(Collectors.toList());
         icssVo.setLis(lis_icss);