化验公表映射

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -117,7 +117,7 @@ public class PushFacade {
                 if (StringUtil.isNotBlank(lisResultVO.getName())) {
                     if (StringUtil.isNotBlank(lisResultVO.getDetailName())) {
                         Map<String, String> detailMap = lisConfigMap.get(lisResultVO.getName());
-                        if (StringUtil.isNotBlank(detailMap.get(lisResultVO.getDetailName()))) {
+                        if (null != detailMap && detailMap.size() > 0 && StringUtil.isNotBlank(detailMap.get(lisResultVO.getDetailName()))) {
                             lisResultVO.setUniqueName(detailMap.get(lisResultVO.getDetailName()));
                         }
                     } else {
@@ -125,9 +125,9 @@ public class PushFacade {
                     }
                 }
             }
+            List<LisResult> lisResultList = BeanUtil.listCopyTo(pushVO.getLis(), LisResult.class);
+            searchData.setLisArr(lisResultList);
         }
-        List<LisResult> lisResultList = BeanUtil.listCopyTo(pushVO.getLis(), LisResult.class);
-        searchData.setLisArr(lisResultList);
 
         return searchData;
     }