Merge branch 'master' into innerDevelop

src/main/java/com/diagbot/facade/NeoFacade.java

@@ -257,12 +257,21 @@ public class NeoFacade {
         Integer sex = pushVO.getSex();
         List<String> presentDiags = Lists.newArrayList();
         PresentPushVo presentPushVo = pushVO.getPresentPushVo();
+        ChiefPushVo chiefPushVo = pushVO.getChiefPushVo();
         if(presentPushVo != null){
             List<Diag> diags = presentPushVo.getDiags();
             if(ListUtil.isNotEmpty(diags)){
                 presentDiags = diags.stream().map(x -> x.getName()).collect(Collectors.toList());
             }
         }
+        if(chiefPushVo != null){
+            List<Diag> diags = chiefPushVo.getDiags();
+            if(ListUtil.isNotEmpty(diags) ){
+                List<String> collect = diags.stream().map(x -> x.getName()).collect(Collectors.toList());
+                presentDiags.retainAll(collect);
+                presentDiags.addAll(collect);
+            }
+        }
         List<PD> pds = pushVO.getChiefPushVo().getPds();
         PD pd = null;
         if(ListUtil.isNotEmpty(pds)){
@@ -344,6 +353,7 @@ public class NeoFacade {
             }
             lis_dis_new = lis_dis_new.stream().distinct().collect(Collectors.toList());
         }else {
+            lis_dis.addAll(presentDiags);
             lis_dis_new =lis_dis;
         }
         return lis_dis_new;

src/main/java/com/diagbot/repository/LisNameNode.java

@@ -7,11 +7,8 @@ import com.diagbot.dto.LisBillNeoDTO;
 import com.diagbot.dto.LisDetailDTO;
 import com.diagbot.dto.NeoEntityDTO;
 import com.diagbot.dto.NodeNeoDTO;
-import com.diagbot.entity.node.Gender;
-import com.diagbot.entity.node.Group;
 import com.diagbot.entity.node.LisCritical;
 import com.diagbot.entity.node.LisName;
-import com.diagbot.entity.node.LisSet;
 import com.diagbot.entity.relationship.LisNameGender;
 import com.diagbot.entity.relationship.LisNameGroup;
 import com.diagbot.entity.relationship.LisNameLisCritical;
@@ -213,20 +210,27 @@ public class LisNameNode {
 			}
 
 			Set<LisNameLisSet> lisNameSet = lis.getLisNamelissets();
-			for (LisNameLisSet lisset : lisNameSet) {
-				if (NeoUtil.isExist(lisset)) {
-					lisDetailDTO = new LisDetailDTO();
-					nodename = lis.getName();
-					lisDetailDTO.setUniqueName(nodename);
-					lisDetailDTO.setName(lisset.getLisSet().getName());
-					lisDetailDTO.setMaxValue(lis.getMaxval());
-					lisDetailDTO.setMinValue(lis.getMinval());
-					lisDetailDTO.setUnits(lis.getUnit());
-					lislist.add(lisDetailDTO);
-				} else {
-					lisDetailDTO.setName(nodename + "(套餐)");
-					lislist.add(lisDetailDTO);
+			if (lisNameSet != null && lisNameSet.size() > 0) {
+				for (LisNameLisSet lisset : lisNameSet) {
+					if (NeoUtil.isExist(lisset)) {
+						lisDetailDTO = new LisDetailDTO();
+						nodename = lis.getName();
+						lisDetailDTO.setUniqueName(nodename);
+						lisDetailDTO.setName(lisset.getLisSet().getName());
+						lisDetailDTO.setMaxValue(lis.getMaxval());
+						lisDetailDTO.setMinValue(lis.getMinval());
+						lisDetailDTO.setUnits(lis.getUnit());
+						lislist.add(lisDetailDTO);
+					}
 				}
+			} else {
+				lisDetailDTO = new LisDetailDTO();
+				lisDetailDTO.setUniqueName(lis.getName());
+				lisDetailDTO.setName(lis.getName() + "(套餐)");
+				lisDetailDTO.setMaxValue(lis.getMaxval());
+				lisDetailDTO.setMinValue(lis.getMinval());
+				lisDetailDTO.setUnits(lis.getUnit());
+				lislist.add(lisDetailDTO);
 			}
 		}