|
|
@@ -1,5 +1,6 @@
|
|
|
package com.diagbot.process;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.diagbot.biz.push.entity.Item;
|
|
|
import com.diagbot.biz.push.entity.Lis;
|
|
|
import com.diagbot.biz.push.entity.Pacs;
|
|
|
@@ -59,6 +60,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 +140,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);
|
kongwz