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

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

@@ -147,12 +147,15 @@ public class PushProcess {
         icssVo.setLis(lis_icss);
 
         List<Pacs> pacs = pushVo.getPacs();
-        List<PreResult> pacs_icss = pacs.stream().map(x ->{
-            PreResult instantiate = new PreResult();
-            BeanUtils.copyProperties(x,instantiate);
-            return instantiate;
-        }).collect(Collectors.toList());
-        icssVo.setPacs(pacs_icss);
+        if(ListUtil.isNotEmpty(pacs)){
+            List<PreResult> pacs_icss = pacs.stream().map(x ->{
+                PreResult instantiate = new PreResult();
+                BeanUtils.copyProperties(x,instantiate);
+                return instantiate;
+            }).collect(Collectors.toList());
+            icssVo.setPacs(pacs_icss);
+        }
+
         if(ListUtil.isNotEmpty(pushVo.getDiag())){
             List<PreResult> diagOrder =  pushVo.getDiag().stream().map(x ->{
                 String name = x.getName();